diff options
| author | Roy Marples <roy@marples.name> | 2010-11-12 16:33:45 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2010-11-12 16:33:45 +0000 |
| commit | 8349d72adfe5e25ca691fdb9ce26263d34fe2753 (patch) | |
| tree | f566c0fc96d06e8f8d8ab1fb7467da6362faf074 /if-bsd.c | |
| parent | 6b5542f1742560983d811c28b68d395c84ea65e0 (diff) | |
| download | dhcpcd-8349d72adfe5e25ca691fdb9ce26263d34fe2753.tar.xz | |
Support RTM_CHGADDR in NetBSD-6 for detecting link layer address changes.
Diffstat (limited to 'if-bsd.c')
| -rw-r--r-- | if-bsd.c | 42 |
1 files changed, 34 insertions, 8 deletions
@@ -65,9 +65,7 @@ /* FIXME: Why do we need to check for sa_family 255 */ #define COPYOUT(sin, sa) \ - sin.s_addr = ((sa) != NULL && ((sa)->sa_family == AF_INET || \ - (sa)->sa_family == 255)) \ - ? \ + sin.s_addr = ((sa) != NULL) ? \ (((struct sockaddr_in *)(void *)sa)->sin_addr).s_addr : 0 static int r_fd = -1; @@ -317,6 +315,10 @@ manage_link(int fd) struct rt rt; struct sockaddr *sa, *rti_info[RTAX_MAX]; int len; +#ifdef RTM_CHGADDR + struct sockaddr_dl sdl; + unsigned char *hwaddr; +#endif for (;;) { if (ioctl(fd, FIONREAD, &len) == -1) @@ -376,17 +378,41 @@ manage_link(int fd) COPYOUT(rt.gate, rti_info[RTAX_GATEWAY]); route_deleted(&rt); break; - case RTM_DELADDR: +#ifdef RTM_CHGADDR + case RTM_CHGADDR: /* FALLTHROUGH */ +#endif + case RTM_DELADDR: /* FALLTHROUGH */ case RTM_NEWADDR: ifam = (struct ifa_msghdr *)(void *)p; + if (!if_indextoname(ifam->ifam_index, ifname)) + break; cp = (char *)(void *)(ifam + 1); get_addrs(ifam->ifam_addrs, cp, rti_info); - COPYOUT(rt.dest, rti_info[RTAX_IFA]); - COPYOUT(rt.net, rti_info[RTAX_NETMASK]); - COPYOUT(rt.gate, rti_info[RTAX_BRD]); - if (if_indextoname(ifam->ifam_index, ifname)) + if (rti_info[RTAX_IFA] == NULL) + break; + switch (rti_info[RTAX_IFA]->sa_family) { +#ifdef RTM_CHGADDR + case AF_LINK: + if (rtm->rtm_type != RTM_CHGADDR) + break; + memcpy(&sdl, rti_info[RTAX_IFA], + rti_info[RTAX_IFA]->sa_len); + hwaddr = xmalloc(sdl.sdl_alen); + memcpy(hwaddr, LLADDR(&sdl), + sdl.sdl_alen); + handle_hwaddr(ifname, hwaddr, + sdl.sdl_alen); + break; +#endif + case AF_INET: + case 255: /* FIXME: Why 255? */ + COPYOUT(rt.dest, rti_info[RTAX_IFA]); + COPYOUT(rt.net, rti_info[RTAX_NETMASK]); + COPYOUT(rt.gate, rti_info[RTAX_BRD]); handle_ifa(rtm->rtm_type, ifname, &rt.dest, &rt.net, &rt.gate); + break; + } break; } } |