Skip to content

Use /sbin/ip from iproute2 instead of ifconfig under Linux. #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ilyaevseev wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −3
Open

Use /sbin/ip from iproute2 instead of ifconfig under Linux. #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bca633
Use /sbin/ip from iproute2 instead of ifconfig under Linux.
ilyaevseev Aug 27, 2023
ea3f51c
tun.cpp: use /usr/sbin/ip instead of /sbin/ip
ilyaevseev Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/tun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,12 @@ Tun::Tun(const string *device, int mtu)
cmdline << "netsh interface ipv4 set subinterface \"" << this->device
<< "\" mtu=" << mtu;
winsystem(cmdline.str().data());
#else
#ifdef LINUX
cmdline << "/usr/sbin/ip link set " << this->device << " mtu " << mtu;
#else
cmdline << "/sbin/ifconfig " << this->device << " mtu " << mtu;
#endif
if (system(cmdline.str().data()) != 0)
syslog(LOG_ERR, "could not set tun device mtu");
#endif
Expand All @@ -101,13 +105,15 @@ void Tun::setIp(uint32_t ip, uint32_t destIp)

if (!tun_set_ip(fd, ip, ip & 0xffffff00, 0xffffff00))
syslog(LOG_ERR, "could not set tun device driver ip address: %s", tun_last_error());
#elif LINUX
#else
#ifdef LINUX
cmdline << "/usr/sbin/ip addr replace " << ips << "/24 dev " << device;
#elif defined(OLD_LINUX)
cmdline << "/sbin/ifconfig " << device << " " << ips << " netmask 255.255.255.0";
if (system(cmdline.str().data()) != 0)
syslog(LOG_ERR, "could not set tun device ip address");
#else
cmdline << "/sbin/ifconfig " << device << " " << ips << " " << destIps
<< " netmask 255.255.255.255";
#endif
if (system(cmdline.str().data()) != 0)
syslog(LOG_ERR, "could not set tun device ip address");
#endif
Expand Down