diff options
| author | Christian Pointner <equinox@anytun.org> | 2009-01-31 02:28:52 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2009-01-31 02:28:52 +0000 |
| commit | 71a30642aa9b15d6730d8fcafa461fdeddba55ca (patch) | |
| tree | 8283cf67e150437095e30839e76bf44557671392 | |
| parent | added disable-routing to configure script (diff) | |
started to port bsd tundevice to new ifconfig feature
removed possible null pointer derefernce
| -rw-r--r-- | src/bsd/tunDevice.cpp | 47 | ||||
| -rw-r--r-- | src/linux/tunDevice.cpp | 3 |
2 files changed, 29 insertions, 21 deletions
diff --git a/src/bsd/tunDevice.cpp b/src/bsd/tunDevice.cpp index 3ef62af..f55462f 100644 --- a/src/bsd/tunDevice.cpp +++ b/src/bsd/tunDevice.cpp @@ -49,7 +49,7 @@ #include "log.h" #define DEVICE_FILE_MAX 255 -TunDevice::TunDevice(std::string dev_name, std::string dev_type, std::string ifcfg_lp, std::string ifcfg_rnmp) : conf_(dev_name, dev_type, ifcfg_lp, ifcfg_rnmp, 1400) +TunDevice::TunDevice(std::string dev_name, std::string dev_type, std::string ifcfg_addr, std::string ifcfg_prefix) : conf_(dev_name, dev_type, ifcfg_addr, ifcfg_prefix, 1400) { std::string device_file = "/dev/"; bool dynamic = true; @@ -104,7 +104,7 @@ TunDevice::TunDevice(std::string dev_name, std::string dev_type, std::string ifc init_post(); - if(ifcfg_lp != "" && ifcfg_rnmp != "") + if(ifcfg_addr != "") do_ifconfig(); } @@ -199,6 +199,9 @@ int TunDevice::write(u_int8_t* buf, u_int32_t len) if(fd_ < 0) return -1; + if(!buf) + return 0; + if(with_pi_) { struct iovec iov[2]; u_int32_t type; @@ -223,28 +226,30 @@ int TunDevice::write(u_int8_t* buf, u_int32_t len) void TunDevice::do_ifconfig() { std::ostringstream command; - command << "/sbin/ifconfig " << actual_name_ << " " << conf_.local_.toString(); + command << "/sbin/ifconfig " << actual_name_ << " " << conf_.addr_.toString(); - if(conf_.type_ == TYPE_TAP) - command << " netmask "; - else - command << " "; - command << conf_.remote_netmask_.toString() << " mtu " << conf_.mtu_; + // TODO: figure out how to configure the interface BSD +// if(conf_.type_ == TYPE_TAP) +// command << " netmask "; +// else +// command << " "; - if(conf_.type_ == TYPE_TUN) - command << " netmask 255.255.255.255 up"; - else { -#if defined(__GNUC__) && defined(__OpenBSD__) - command << " link0"; -#elif defined(__GNUC__) && defined(__FreeBSD__) - command << " up"; -#elif defined(__GNUC__) && defined(__NetBSD__) - command << ""; -#else - #error This Device works just for OpenBSD, FreeBSD or NetBSD -#endif - } +// command << conf_.netmask_.toString() << " mtu " << conf_.mtu_; + +// if(conf_.type_ == TYPE_TUN) +// command << " netmask 255.255.255.255 up"; +// else { +// #if defined(__GNUC__) && defined(__OpenBSD__) +// command << " link0"; +// #elif defined(__GNUC__) && defined(__FreeBSD__) +// command << " up"; +// #elif defined(__GNUC__) && defined(__NetBSD__) +// command << ""; +// #else +// #error This Device works just for OpenBSD, FreeBSD or NetBSD +// #endif +// } int result = system(command.str().c_str()); if(result == -1) diff --git a/src/linux/tunDevice.cpp b/src/linux/tunDevice.cpp index 8fde8ae..8ab7ff8 100644 --- a/src/linux/tunDevice.cpp +++ b/src/linux/tunDevice.cpp @@ -127,6 +127,9 @@ int TunDevice::write(u_int8_t* buf, u_int32_t len) if(fd_ < 0) return -1; + if(!buf) + return 0; + if(with_pi_) { struct iovec iov[2]; |