askiiart/tunsafe-clang15
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix route adding on FreeBSD

Browse source
This commit is contained in:
Ludvig Strigeus 2018-08-08 23:17:02 +02:00
parent 64bb3cd6b3
commit f5c69d4eee
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
network_bsd.cpp
View file

@ -523,9 +523,9 @@ static bool GetDefaultRoute(char *iface, size_t iface_size, uint32 *gw_addr) {
if (len > rep.buf + 512 - pos) if (len > rep.buf + 512 - pos)
break; // invalid break; // invalid
// RINFO("rtm %d %d", i, ((struct sockaddr*)pos)->sa_len); // RINFO("rtm %d %d", i, ((struct sockaddr*)pos)->sa_len);
if (i == RTA_IFP && ((struct sockaddr*)pos)->sa_len == sizeof(struct sockaddr_dl)) { if (i == RTA_IFP && ((struct sockaddr*)pos)->sa_len >= sizeof(struct sockaddr_dl)) {
ifp = (struct sockaddr_dl *)pos; ifp = (struct sockaddr_dl *)pos;
} else if (i == RTA_GATEWAY && ((struct sockaddr*)pos)->sa_len == sizeof(struct sockaddr_in)) { } else if (i == RTA_GATEWAY && ((struct sockaddr*)pos)->sa_len >= sizeof(struct sockaddr_in)) {
gw = (struct sockaddr_in *)pos; gw = (struct sockaddr_in *)pos;
} }
@ -596,7 +596,7 @@ static void AddOrRemoveRoute(const RouteInfo &cd, bool remove) {
} else { } else {
RunCommand("/sbin/route %s -net inet6 %s gw %s", cmd, buf1, buf2); RunCommand("/sbin/route %s -net inet6 %s gw %s", cmd, buf1, buf2);
} }
#elif defined(OS_MACOSX) #elif defined(OS_MACOSX) || defined(OS_FREEBSD)
const char *cmd = remove ? "delete" : "add"; const char *cmd = remove ? "delete" : "add";
if (cd.family == AF_INET) { if (cd.family == AF_INET) {
RunCommand("/sbin/route -q %s %s %s", cmd, buf1, buf2); RunCommand("/sbin/route -q %s %s %s", cmd, buf1, buf2);