RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix logic error for skipping failed interfaces in if_nameindex

This commit is contained in:
Rich Felker 2012-07-21 17:56:48 -04:00
parent f07222739b
commit 68c5822367
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/if_nameindex.c
View File

@ -10,7 +10,7 @@
static void *do_nameindex(int s, size_t n) static void *do_nameindex(int s, size_t n)
{ {
size_t i, len; size_t i, len, k;
struct ifconf conf; struct ifconf conf;
struct if_nameindex *idx; struct if_nameindex *idx;
@ -29,17 +29,16 @@ static void *do_nameindex(int s, size_t n)
} }
n = conf.ifc_len / sizeof(struct ifreq); n = conf.ifc_len / sizeof(struct ifreq);
for (i=0; i<n; i++) { for (i=k=0; i<n; i++) {
if (ioctl(s, SIOCGIFINDEX, &conf.ifc_req[i]) < 0) { if (ioctl(s, SIOCGIFINDEX, &conf.ifc_req[i]) < 0) {
i--; k++;
n--;
continue; continue;
} }
idx[i].if_index = conf.ifc_req[i].ifr_ifindex; idx[i-k].if_index = conf.ifc_req[i].ifr_ifindex;
idx[i].if_name = conf.ifc_req[i].ifr_name; idx[i-k].if_name = conf.ifc_req[i].ifr_name;
} }
idx[i].if_name = 0; idx[i-k].if_name = 0;
idx[i].if_index = 0; idx[i-k].if_index = 0;
return idx; return idx;
} }