mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-22 17:51:53 +00:00
Fixes interface names on BSD systems.
This commit is contained in:
parent
e7b4948cbd
commit
dad7ee70c1
@ -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
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user