summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/anytun.cpp8
-rw-r--r--src/anytun.suobin66048 -> 67072 bytes
-rw-r--r--src/tunDevice.h4
-rw-r--r--src/win32/tunDevice.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/anytun.cpp b/src/anytun.cpp
index b0997d4..da2f7f6 100644
--- a/src/anytun.cpp
+++ b/src/anytun.cpp
@@ -138,10 +138,10 @@ void syncListener()
}
#endif
-void sender(const TunDevice* dev, PacketSource* src)
+void sender(TunDevice* dev, PacketSource* src)
{
if(!dev || !src) {
- cLog.msg(Log::PRIO_ERROR) << "sender thread died becaause either dev or src pointer is null";
+ cLog.msg(Log::PRIO_ERROR) << "sender thread died because either dev or src pointer is null";
return;
}
@@ -227,10 +227,10 @@ void sender(const TunDevice* dev, PacketSource* src)
}
}
-void receiver(const TunDevice* dev, PacketSource* src)
+void receiver(TunDevice* dev, PacketSource* src)
{
if(!dev || !src) {
- cLog.msg(Log::PRIO_ERROR) << "receiver thread died becaause either dev or src pointer is null";
+ cLog.msg(Log::PRIO_ERROR) << "receiver thread died because either dev or src pointer is null";
return;
}
diff --git a/src/anytun.suo b/src/anytun.suo
index 8bdd35e..7c00853 100644
--- a/src/anytun.suo
+++ b/src/anytun.suo
Binary files differ
diff --git a/src/tunDevice.h b/src/tunDevice.h
index 2443663..f37016d 100644
--- a/src/tunDevice.h
+++ b/src/tunDevice.h
@@ -46,8 +46,8 @@ public:
TunDevice(std::string dev,std::string dev_type, std::string ifcfg_addr, u_int16_t ifcfg_prefix);
~TunDevice();
- int read(u_int8_t* buf, u_int32_t len) const;
- int write(u_int8_t* buf, u_int32_t len) const;
+ int read(u_int8_t* buf, u_int32_t len);
+ int write(u_int8_t* buf, u_int32_t len);
const char* getActualName() const { return actual_name_.c_str(); }
const char* getActualNode() const { return actual_node_.c_str(); }
diff --git a/src/win32/tunDevice.cpp b/src/win32/tunDevice.cpp
index 3edee2a..1087092 100644
--- a/src/win32/tunDevice.cpp
+++ b/src/win32/tunDevice.cpp
@@ -189,7 +189,7 @@ TunDevice::~TunDevice()
CloseHandle(woverlapped_.hEvent);
}
-int TunDevice::fix_return(int ret, size_t pi_length)
+int TunDevice::fix_return(int ret, size_t pi_length) const
{
// nothing to be done here
return 0;