Imported Upstream version 0.3.5

[anytun.git] / src / tunDevice.h

diff --git a/src/tunDevice.h b/src/tunDevice.h
index 8b2d613..f64dccf 100644 (file)
--- a/src/tunDevice.h
+++ b/src/tunDevice.h
@@ -6,12 +6,12 @@
  *  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
  *  mode and allows tunneling of every ETHER TYPE protocol (e.g.
  *  ethernet, ip, arp ...). satp directly includes cryptography and
- *  message authentication based on the methodes used by SRTP.  It is
+ *  message authentication based on the methods used by SRTP.  It is
  *  intended to deliver a generic, scaleable and secure solution for
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,7 +27,20 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL.  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so.  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version.  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
  */
 
 #ifndef ANYTUN_tunDevice_h_INCLUDED
@@ -36,10 +49,10 @@
 #include "buffer.h"
 #include "deviceConfig.hpp"
 #include "threadUtils.hpp"
-#ifdef _MSC_VER
-#include <windows.h>
-#else
+#if !defined(_MSC_VER) && !defined(MINGW)
 #include "sysExec.h"
+#else
+#include <windows.h>
 #endif
 
 class TunDevice
@@ -56,7 +69,7 @@ public:
   device_type_t getType() const { return conf_.type_; }
   void waitUntilReady();
   const char* getTypeString() const {
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(MINGW)
     if(fd_ < 0)
 #else
     if(handle_ == INVALID_HANDLE_VALUE)
@@ -85,7 +98,7 @@ private:
   void do_ifconfig();
   int fix_return(int ret, size_t pi_length) const;
 
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(MINGW)
   int fd_;
 #else
   bool getAdapter(std::string const& dev_name);
@@ -96,7 +109,7 @@ private:
 #endif
 
   DeviceConfig conf_;
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(MINGW)
   SysExec* sys_exec_;
 #endif
   bool with_pi_;