d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r203387: Exclude the interfaces which IPv6 and/or accepting

Browse Source 
RA is disabled from the auto probed interface list.
This commit is contained in:
ume 2010-02-13 16:28:25 +00:00
parent c93877c1bb
commit b1b494074a
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.sbin/rtsold/rtsold.c
View File

@ -32,15 +32,20 @@
*/
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/param.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_var.h>
#include <netinet/in.h>
#include <netinet/icmp6.h>
#include <netinet/in_var.h>
#include <netinet6/nd6.h>
#include <signal.h>
#include <unistd.h>
@ -789,8 +794,9 @@ autoifprobe(void)
static char **argv = NULL;
static int n = 0;
char **a;
int i, found;
int s, i, found;
struct ifaddrs *ifap, *ifa, *target;
struct in6_ndireq nd;
/* initialize */
while (n--)
@ -804,6 +810,11 @@ autoifprobe(void)
if (getifaddrs(&ifap) != 0)
return NULL;
if (!Fflag && (s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
err(1, "socket");
/* NOTREACHED */
}
target = NULL;
/* find an ethernet */
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
@ -829,6 +840,23 @@ autoifprobe(void)
if (found)
continue;
/*
* Skip the interfaces which IPv6 and/or accepting RA
* is disabled.
*/
if (!Fflag) {
memset(&nd, 0, sizeof(nd));
strlcpy(nd.ifname, ifa->ifa_name, sizeof(nd.ifname));
if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
err(1, "ioctl(SIOCGIFINFO_IN6)");
/* NOTREACHED */
}
if ((nd.ndi.flags & ND6_IFF_IFDISABLED))
continue;
if (!(nd.ndi.flags & ND6_IFF_ACCEPT_RTADV))
continue;
}
/* if we find multiple candidates, just warn. */
if (n != 0 && dflag > 1)
warnx("multiple interfaces found");
@ -855,6 +883,8 @@ autoifprobe(void)
warnx("probing %s", argv[i]);
}
}
if (!Fflag)
close(s);
freeifaddrs(ifap);
return argv;
}