Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes interface names on BSD systems.

Browse source
This commit is contained in:
Ondrej Zajicek 2011-01-08 11:22:38 +01:00
parent e7b4948cbd
commit dad7ee70c1
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sysdep/bsd/krt-sock.c
View file

@ -412,7 +412,6 @@ krt_read_ifinfo(struct ks_msg *msg)
struct sockaddr_dl *dl = NULL; struct sockaddr_dl *dl = NULL;
unsigned int i; unsigned int i;
struct iface *iface = NULL, f; struct iface *iface = NULL, f;
char *ifname = "(none)";
int fl = ifm->ifm_flags; int fl = ifm->ifm_flags;
for(i = 1; i!=0; i <<= 1) for(i = 1; i!=0; i <<= 1)
@ -434,18 +433,17 @@ krt_read_ifinfo(struct ks_msg *msg)
return; return;
} }
if(dl) ifname = dl->sdl_data;
iface = if_find_by_index(ifm->ifm_index); iface = if_find_by_index(ifm->ifm_index);
if(!iface) if(!iface)
{ {
/* New interface */ /* New interface */
if(!dl) return; /* No interface name, ignoring */ if(!dl) return; /* No interface name, ignoring */
DBG("New interface \"%s\" found", ifname);
bzero(&f, sizeof(f)); bzero(&f, sizeof(f));
f.index = ifm->ifm_index; f.index = ifm->ifm_index;
strncpy(f.name, ifname, sizeof(f.name) -1); memcpy(f.name, dl->sdl_data, MIN(sizeof(f.name)-1, dl->sdl_nlen));
DBG("New interface '%s' found", f.name);
} }
else else
{ {