summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2008-05-10 16:00:14 +0000
committerChristian Pointner <equinox@anytun.org>2008-05-10 16:00:14 +0000
commitbdc6cfb60a41111cf65d46f76ee179a9887c2d4c (patch)
tree071e25574e5965bbe7fb393cd31deed1b6841ca5 /src
parentdo_ifconfig works now for new tun/tap device (diff)
adaptions for openbsd 4.3
Diffstat (limited to 'src')
-rw-r--r--src/anytun.cpp2
-rw-r--r--src/ovpn/tunDevice.cpp6
-rw-r--r--src/ovpn/tunDevice.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/anytun.cpp b/src/anytun.cpp
index 004330b..7b03785 100644
--- a/src/anytun.cpp
+++ b/src/anytun.cpp
@@ -183,7 +183,7 @@ void* sender(void* p)
{
param->src.send(encrypted_packet.getBuf(), encrypted_packet.getLength(), conn.remote_host_, conn.remote_port_);
}
- catch (Exception e)
+ catch (std::exception e)
{
}
}
diff --git a/src/ovpn/tunDevice.cpp b/src/ovpn/tunDevice.cpp
index 032af29..822b6a7 100644
--- a/src/ovpn/tunDevice.cpp
+++ b/src/ovpn/tunDevice.cpp
@@ -31,15 +31,15 @@
#include <stdexcept>
#include <poll.h>
+#include "tunDevice.h"
+#include "threadUtils.hpp"
+
extern "C" {
#include "openvpn/config.h"
#include "openvpn/syshead.h"
#include "openvpn/tun.h"
}
-#include "tunDevice.h"
-#include "threadUtils.hpp"
-
TunDevice::TunDevice(const char* dev_name,const char* dev_type, const char* ifcfg_lp, const char* ifcfg_rnmp)
{
diff --git a/src/ovpn/tunDevice.h b/src/ovpn/tunDevice.h
index 5886b7d..b0c5780 100644
--- a/src/ovpn/tunDevice.h
+++ b/src/ovpn/tunDevice.h
@@ -32,8 +32,8 @@
#define _TUNDEVICE_H_
#include "buffer.h"
-#include "deviceConfig.hpp"
#include "threadUtils.hpp"
+#include "deviceConfig.hpp"
class TunDevice
{