summaryrefslogtreecommitdiff
path: root/src/linux
diff options
context:
space:
mode:
authorMarkus Grüneis <gimpf@gimpf.org>2010-02-18 09:15:27 +0000
committerMarkus Grüneis <gimpf@gimpf.org>2010-02-18 09:15:27 +0000
commite191eab68d905bfe14e3590a92fa653f0ae2ebce (patch)
treea5837b067ecab92c645008b537087b0d163ef1ab /src/linux
parentwhitespace only change: unified formatting with "astyle --style=k/r --indent=... (diff)
non-functional changes only: use standard writing of stdint.h types; still import from boost (compiler compatibility)
Diffstat (limited to 'src/linux')
-rw-r--r--src/linux/tunDevice.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/linux/tunDevice.cpp b/src/linux/tunDevice.cpp
index 85f90e1..94c2e27 100644
--- a/src/linux/tunDevice.cpp
+++ b/src/linux/tunDevice.cpp
@@ -50,7 +50,7 @@
#include "anytunError.h"
#include "sysExec.h"
-TunDevice::TunDevice(std::string dev_name, std::string dev_type, std::string ifcfg_addr, u_int16_t ifcfg_prefix) : conf_(dev_name, dev_type, ifcfg_addr, ifcfg_prefix, 1400), sys_exec_(NULL)
+TunDevice::TunDevice(std::string dev_name, std::string dev_type, std::string ifcfg_addr, uint16_t ifcfg_prefix) : conf_(dev_name, dev_type, ifcfg_addr, ifcfg_prefix, 1400), sys_exec_(NULL)
{
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
@@ -105,7 +105,7 @@ int TunDevice::fix_return(int ret, size_t pi_length) const
return (static_cast<size_t>(ret) > pi_length ? (ret - pi_length) : 0);
}
-int TunDevice::read(u_int8_t* buf, u_int32_t len)
+int TunDevice::read(uint8_t* buf, uint32_t len)
{
if(fd_ < 0) {
return -1;
@@ -125,7 +125,7 @@ int TunDevice::read(u_int8_t* buf, u_int32_t len)
}
}
-int TunDevice::write(u_int8_t* buf, u_int32_t len)
+int TunDevice::write(uint8_t* buf, uint32_t len)
{
if(fd_ < 0) {
return -1;