diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-07 06:50:40 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-07 06:50:40 -0700 |
| commit | 6fc70f7c16da968a63e69798bbc73ada442cfd2a (patch) | |
| tree | 27c4dfb8c3eeba70e273083bfbb4ea838cdcd768 /osdep | |
| parent | f23a43fb81850837c1d85091abf91cc57ae35ef9 (diff) | |
| download | infinitytier-6fc70f7c16da968a63e69798bbc73ada442cfd2a.tar.gz infinitytier-6fc70f7c16da968a63e69798bbc73ada442cfd2a.zip | |
More cleanup, Linux build fixes.
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/Binder.hpp | 4 | ||||
| -rw-r--r-- | osdep/ManagedRoute.cpp | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp index f956a67e..126dba28 100644 --- a/osdep/Binder.hpp +++ b/osdep/Binder.hpp @@ -176,7 +176,7 @@ public: const unsigned long pid = (unsigned long)getpid(); // Get all device names - Utils::ztsnprintf(fn,sizeof(fn),"/proc/%lu/net/dev",pid); + OSUtils::ztsnprintf(fn,sizeof(fn),"/proc/%lu/net/dev",pid); FILE *procf = fopen(fn,"r"); if (procf) { while (fgets(tmp,sizeof(tmp),procf)) { @@ -192,7 +192,7 @@ public: } // Get IPv6 addresses (and any device names we don't already know) - Utils::ztsnprintf(fn,sizeof(fn),"/proc/%lu/net/if_inet6",pid); + OSUtils::ztsnprintf(fn,sizeof(fn),"/proc/%lu/net/if_inet6",pid); procf = fopen(fn,"r"); if (procf) { while (fgets(tmp,sizeof(tmp),procf)) { diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp index 3a0b8a7e..5b5bf541 100644 --- a/osdep/ManagedRoute.cpp +++ b/osdep/ManagedRoute.cpp @@ -286,12 +286,13 @@ static void _routeCmd(const char *op,const InetAddress &target,const InetAddress } else if (p == 0) { ::close(STDOUT_FILENO); ::close(STDERR_FILENO); + char ipbuf[64],ipbuf2[64]; if (via) { - ::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,(target.ss_family == AF_INET6) ? "-6" : "-4","route",op,target.toString().c_str(),"via",via.toIpString().c_str(),(const char *)0); - ::execl(ZT_LINUX_IP_COMMAND_2,ZT_LINUX_IP_COMMAND_2,(target.ss_family == AF_INET6) ? "-6" : "-4","route",op,target.toString().c_str(),"via",via.toIpString().c_str(),(const char *)0); + ::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,(target.ss_family == AF_INET6) ? "-6" : "-4","route",op,target.toString(ipbuf),"via",via.toIpString(ipbuf2),(const char *)0); + ::execl(ZT_LINUX_IP_COMMAND_2,ZT_LINUX_IP_COMMAND_2,(target.ss_family == AF_INET6) ? "-6" : "-4","route",op,target.toString(ipbuf),"via",via.toIpString(ipbuf2),(const char *)0); } else if ((localInterface)&&(localInterface[0])) { - ::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,(target.ss_family == AF_INET6) ? "-6" : "-4","route",op,target.toString().c_str(),"dev",localInterface,(const char *)0); - ::execl(ZT_LINUX_IP_COMMAND_2,ZT_LINUX_IP_COMMAND_2,(target.ss_family == AF_INET6) ? "-6" : "-4","route",op,target.toString().c_str(),"dev",localInterface,(const char *)0); + ::execl(ZT_LINUX_IP_COMMAND,ZT_LINUX_IP_COMMAND,(target.ss_family == AF_INET6) ? "-6" : "-4","route",op,target.toString(ipbuf),"dev",localInterface,(const char *)0); + ::execl(ZT_LINUX_IP_COMMAND_2,ZT_LINUX_IP_COMMAND_2,(target.ss_family == AF_INET6) ? "-6" : "-4","route",op,target.toString(ipbuf),"dev",localInterface,(const char *)0); } ::_exit(-1); } |