pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ethsock issues

Browse source
This commit is contained in:
Joseph C. Lehner 2016-11-20 20:48:40 +01:00
parent 98fdb9e63c
commit 00e880d1d3
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ethsock.c
View file

@ -683,7 +683,9 @@ static bool set_interface_up(int fd, const char *intf, bool up)
strncpy(ifr.ifr_name, intf, IFNAMSIZ); strncpy(ifr.ifr_name, intf, IFNAMSIZ);
if (ioctl(fd, SIOCGIFFLAGS, &ifr) != 0) { if (ioctl(fd, SIOCGIFFLAGS, &ifr) != 0) {
xperror("ioctl(SIOCGIFFLAGS)"); if (up) {
xperror("ioctl(SIOCGIFFLAGS)");
}
return false; return false;
} }
@ -694,7 +696,9 @@ static bool set_interface_up(int fd, const char *intf, bool up)
} }
if (ioctl(fd, SIOCSIFFLAGS, &ifr) != 0) { if (ioctl(fd, SIOCSIFFLAGS, &ifr) != 0) {
xperror("ioctl(SIOCSIFFLAGS)"); if (up) {
xperror("ioctl(SIOCSIFFLAGS)");
}
return false; return false;
} }
@ -710,13 +714,13 @@ int ethsock_ip_add(struct ethsock *sock, uint32_t ipaddr, uint32_t ipmask, struc
return -1; return -1;
} }
int ret = -1;
int fd = socket(AF_INET, SOCK_DGRAM, 0); int fd = socket(AF_INET, SOCK_DGRAM, 0);
if (!fd) { if (!fd) {
sock_perror("socket"); sock_perror("socket");
return -1; goto out;
} }
int ret = -1;
#ifndef NMRPFLASH_WINDOWS #ifndef NMRPFLASH_WINDOWS
// XXX: undo is non-zero only if we're adding an IP // XXX: undo is non-zero only if we're adding an IP
bool add = undo; bool add = undo;
@ -743,7 +747,7 @@ int ethsock_ip_add(struct ethsock *sock, uint32_t ipaddr, uint32_t ipmask, struc
(*undo)->ip[1] = ipmask; (*undo)->ip[1] = ipmask;
} }
if (!set_interface_up(fd, ifr.ifr_name, add ? true : false)) { if (!set_interface_up(fd, ifr.ifr_name, add)) {
goto out; goto out;
} }
#else // NMRPFLASH_OSX (or any other BSD) #else // NMRPFLASH_OSX (or any other BSD)
@ -756,7 +760,9 @@ int ethsock_ip_add(struct ethsock *sock, uint32_t ipaddr, uint32_t ipmask, struc
//set_addr(&ifra.ifra_broadaddr, (ipaddr & ipmask) | ~ipmask); //set_addr(&ifra.ifra_broadaddr, (ipaddr & ipmask) | ~ipmask);
if (ioctl(fd, add ? SIOCAIFADDR : SIOCDIFADDR, &ifra) != 0) { if (ioctl(fd, add ? SIOCAIFADDR : SIOCDIFADDR, &ifra) != 0) {
xperroradd ? "ioctl(SIOCAIFADDR)" : "ioctl(SIOCDIFADDR)"); if (add) {
xperror("ioctl(SIOCAIFADDR");
}
goto out; goto out;
} }
@ -801,6 +807,11 @@ out:
#else #else
closesocket(fd); closesocket(fd);
#endif #endif
if (ret != 0 && undo) {
free(*undo);
*undo = NULL;
}
return ret; return ret;
} }