projects
/
anytun.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.3.4
[anytun.git]
/
src
/
deviceConfig.hpp
diff --git
a/src/deviceConfig.hpp
b/src/deviceConfig.hpp
index
6353cd1
..
ede6f34
100644
(file)
--- a/
src/deviceConfig.hpp
+++ b/
src/deviceConfig.hpp
@@
-11,7
+11,7
@@
* tunneling and relaying of packets of any protocol.
*
*
* tunneling and relaying of packets of any protocol.
*
*
- * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
+ * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
* Christian Pointner <satp@wirdorange.org>
*
* This file is part of Anytun.
* Christian Pointner <satp@wirdorange.org>
*
* This file is part of Anytun.
@@
-41,44
+41,48
@@
class TunDevice;
enum device_type_t { TYPE_UNDEF, TYPE_TUN, TYPE_TAP };
enum device_type_t { TYPE_UNDEF, TYPE_TUN, TYPE_TAP };
-class DeviceConfig
+class DeviceConfig
{
public:
{
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(dev_type != "") {
mtu_ = mtu;
type_ = TYPE_UNDEF;
#ifndef _MSC_VER
if(dev_type != "") {
- if(!dev_type.compare(0,3,"tun"))
+ if(!dev_type.compare(0,3,"tun"))
{
type_ = TYPE_TUN;
type_ = TYPE_TUN;
- else if (!dev_type.compare(0,3,"tap"))
+ } else if(!dev_type.compare(0,3,"tap")) {
type_ = TYPE_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;
type_ = TYPE_TUN;
- else if(!dev_name.compare(0,3,"tap"))
+ } else if(!dev_name.compare(0,3,"tap")) {
type_ = TYPE_TAP;
type_ = TYPE_TAP;
+ }
}
#else
}
#else
- if(dev_type == "")
+ if(dev_type == "")
{
AnytunError::throwErr() << "Device type must be specified on Windows";
AnytunError::throwErr() << "Device type must be specified on Windows";
-
- if(dev_type == "tun")
+ }
+
+ if(dev_type == "tun") {
type_ = TYPE_TUN;
type_ = TYPE_TUN;
- else if(dev_type == "tap")
+ } else if(dev_type == "tap") {
type_ = 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)";
AnytunError::throwErr() << "Device type tun requires ifconfig parameter (--ifconfig)";
+ }
#endif
#endif
- if(ifcfg_addr != "")
+ if(ifcfg_addr != "")
{
addr_.setNetworkAddress(ipv4, ifcfg_addr.c_str());
addr_.setNetworkAddress(ipv4, ifcfg_addr.c_str());
+ }
prefix_ = ifcfg_prefix;
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;
}
mask = mask >> 1;
mask |= 0x80000000L;
}
@@
-89,8
+93,8
@@
private:
device_type_t type_;
NetworkAddress addr_;
NetworkAddress netmask_;
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;
};
friend class TunDevice;
};