From dad7ee70c1711b2cbdfd86c615736fe12c0d126a Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Sat, 8 Jan 2011 11:22:38 +0100 Subject: [PATCH] Fixes interface names on BSD systems. --- sysdep/bsd/krt-sock.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c index 53b30ca4..0e96f410 100644 --- a/sysdep/bsd/krt-sock.c +++ b/sysdep/bsd/krt-sock.c @@ -412,7 +412,6 @@ krt_read_ifinfo(struct ks_msg *msg) struct sockaddr_dl *dl = NULL; unsigned int i; struct iface *iface = NULL, f; - char *ifname = "(none)"; int fl = ifm->ifm_flags; for(i = 1; i!=0; i <<= 1) @@ -434,18 +433,17 @@ krt_read_ifinfo(struct ks_msg *msg) return; } - if(dl) ifname = dl->sdl_data; - iface = if_find_by_index(ifm->ifm_index); if(!iface) { /* New interface */ if(!dl) return; /* No interface name, ignoring */ - DBG("New interface \"%s\" found", ifname); + bzero(&f, sizeof(f)); 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 {