Imported Upstream version 0.3.5

[anytun.git] / src / deviceConfig.hpp

diff --git a/src/deviceConfig.hpp b/src/deviceConfig.hpp
index 6353cd1..31a3144 100644 (file)
--- a/src/deviceConfig.hpp
+++ b/src/deviceConfig.hpp
@@ -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_deviceConfig_hpp_INCLUDED
@@ -41,44 +54,48 @@ class TunDevice;
 
 enum device_type_t { TYPE_UNDEF, TYPE_TUN, TYPE_TAP };
 
-class DeviceConfig 
+class DeviceConfig
 {
 public:
-  DeviceConfig(std::string dev_name ,std::string dev_type, std::string ifcfg_addr, u_int16_t ifcfg_prefix, u_int16_t mtu)
-  {
+  DeviceConfig(std::string dev_name ,std::string dev_type, std::string ifcfg_addr, uint16_t ifcfg_prefix, uint16_t mtu) {
     mtu_ = mtu;
     type_ = TYPE_UNDEF;
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(MINGW)
     if(dev_type != "") {
-      if(!dev_type.compare(0,3,"tun"))
+      if(!dev_type.compare(0,3,"tun")) {
         type_ = TYPE_TUN;
-      else if (!dev_type.compare(0,3,"tap"))
+      } else if(!dev_type.compare(0,3,"tap")) {
         type_ = TYPE_TAP;
-    }
-    else if(dev_name != "") {
-      if(!dev_name.compare(0,3,"tun"))
+      }
+    } else if(dev_name != "") {
+      if(!dev_name.compare(0,3,"tun")) {
         type_ = TYPE_TUN;
-      else if(!dev_name.compare(0,3,"tap"))
+      } else if(!dev_name.compare(0,3,"tap")) {
         type_ = TYPE_TAP;
+      }
     }
 #else
-    if(dev_type == "")
+    if(dev_type == "") {
       AnytunError::throwErr() << "Device type must be specified on Windows";
-    
-    if(dev_type == "tun")
+    }
+
+    if(dev_type == "tun") {
       type_ = TYPE_TUN;
-    else if(dev_type == "tap")
+    } else if(dev_type == "tap") {
       type_ = TYPE_TAP;
+    }
 
-    if(type_ == TYPE_TUN && ifcfg_addr == "")
+    if(type_ == TYPE_TUN && ifcfg_addr == "") {
       AnytunError::throwErr() << "Device type tun requires ifconfig parameter (--ifconfig)";
+    }
 #endif
 
-    if(ifcfg_addr != "")
+    if(ifcfg_addr != "") {
       addr_.setNetworkAddress(ipv4, ifcfg_addr.c_str());
+    }
     prefix_ = ifcfg_prefix;
-    u_int32_t mask = 0;
-    for(u_int16_t i = 0; i < prefix_; ++i) {
+    uint32_t mask = 0;
+    for(uint16_t i = 0; i < prefix_; ++i) {
       mask = mask >> 1;
       mask |= 0x80000000L;
     }
@@ -89,8 +106,8 @@ private:
   device_type_t type_;
   NetworkAddress addr_;
   NetworkAddress netmask_;
-  u_int16_t prefix_;
-  u_int16_t mtu_;
+  uint16_t prefix_;
+  uint16_t mtu_;
 
   friend class TunDevice;
 };