summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOthmar Gsenger <otti@anytun.org>2008-12-17 21:53:49 +0000
committerOthmar Gsenger <otti@anytun.org>2008-12-17 21:53:49 +0000
commit3f59ed36092bccfff88cf7579071c1216ea55ed2 (patch)
tree60e5cc427c373bfd274950fcb87a45e5bc01a25e /src
parentfixed bug in routing initialisation (diff)
fixed tundevice for windows
Diffstat (limited to 'src')
-rw-r--r--src/anytun.suobin33280 -> 35840 bytes
-rw-r--r--src/anytun.vcproj2
-rw-r--r--src/tunDevice.h4
-rw-r--r--src/win32/tunDevice.cpp3
4 files changed, 6 insertions, 3 deletions
diff --git a/src/anytun.suo b/src/anytun.suo
index e1b87c1..9d0824a 100644
--- a/src/anytun.suo
+++ b/src/anytun.suo
Binary files differ
diff --git a/src/anytun.vcproj b/src/anytun.vcproj
index ae24351..0c049f0 100644
--- a/src/anytun.vcproj
+++ b/src/anytun.vcproj
@@ -468,7 +468,7 @@
>
</File>
<File
- RelativePath=".\tunDevice.cpp"
+ RelativePath=".\win32\tunDevice.cpp"
>
</File>
</Filter>
diff --git a/src/tunDevice.h b/src/tunDevice.h
index 3768cf9..99f3d4b 100644
--- a/src/tunDevice.h
+++ b/src/tunDevice.h
@@ -50,7 +50,7 @@ public:
std::string getTypeString()
{
if(fd_ < 0)
- return NULL;
+ return "";
switch(conf_.type_)
{
@@ -58,7 +58,7 @@ public:
case TYPE_TUN: return "tun"; break;
case TYPE_TAP: return "tap"; break;
}
- return NULL;
+ return "";
}
diff --git a/src/win32/tunDevice.cpp b/src/win32/tunDevice.cpp
index 9b58a0e..60d8742 100644
--- a/src/win32/tunDevice.cpp
+++ b/src/win32/tunDevice.cpp
@@ -51,14 +51,17 @@ TunDevice::~TunDevice()
int TunDevice::fix_return(int ret, size_t pi_length)
{
// nothing to be done here
+ return 0;
}
int TunDevice::read(u_int8_t* buf, u_int32_t len)
{
+ return 0;
}
int TunDevice::write(u_int8_t* buf, u_int32_t len)
{
+ return 0;
}
void TunDevice::init_post()