From cf44e028d076399177619d8bc523fa13521e0b5e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Mon, 19 Jan 2009 23:21:30 +0000
Subject: fixed silly bug at new tundevice

---
 src/tunDevice.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/tunDevice.h')

diff --git a/src/tunDevice.h b/src/tunDevice.h
index c07f813..7fb1355 100644
--- a/src/tunDevice.h
+++ b/src/tunDevice.h
@@ -49,11 +49,15 @@ public:
   int read(u_int8_t* buf, u_int32_t len);
   int write(u_int8_t* buf, u_int32_t len);
 
-  std::string getActualName() { return actual_name_.c_str(); }
+  std::string getActualName() { return actual_name_; }
   device_type_t getType() { return conf_.type_; }
   std::string getTypeString()
   {
+#ifndef _MSC_VER
     if(fd_ < 0)
+#else
+    if(handle_ == INVALID_HANDLE_VALUE)
+#endif
       return "";
     
     switch(conf_.type_)
@@ -74,8 +78,9 @@ private:
   void do_ifconfig();
   int fix_return(int ret, size_t pi_length);
 
+#ifndef _MSC_VER
   int fd_;
-#ifdef _MSC_VER
+#else
   HANDLE handle_;
 #endif
 
-- 
cgit v1.2.3