svn commit: r222522 - user/hrs/ipv6/usr.sbin/rtadvd
Hiroki Sato
hrs at FreeBSD.org
Tue May 31 12:54:32 UTC 2011
Author: hrs
Date: Tue May 31 12:54:32 2011
New Revision: 222522
URL: http://svn.freebsd.org/changeset/base/222522
Log:
- Remove #ifdef RDNSS.
- Style(9).
- Define sin6_{linklocal,sitelocal}_all{nodes,routers} vars consistently.
Modified:
user/hrs/ipv6/usr.sbin/rtadvd/Makefile
user/hrs/ipv6/usr.sbin/rtadvd/advcap.c
user/hrs/ipv6/usr.sbin/rtadvd/config.c
user/hrs/ipv6/usr.sbin/rtadvd/config.h
user/hrs/ipv6/usr.sbin/rtadvd/dump.c
user/hrs/ipv6/usr.sbin/rtadvd/dump.h
user/hrs/ipv6/usr.sbin/rtadvd/if.c
user/hrs/ipv6/usr.sbin/rtadvd/if.h
user/hrs/ipv6/usr.sbin/rtadvd/rrenum.c
user/hrs/ipv6/usr.sbin/rtadvd/rrenum.h
user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c
user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h
user/hrs/ipv6/usr.sbin/rtadvd/timer.c
user/hrs/ipv6/usr.sbin/rtadvd/timer.h
Modified: user/hrs/ipv6/usr.sbin/rtadvd/Makefile
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/Makefile Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/Makefile Tue May 31 12:54:32 2011 (r222522)
@@ -21,7 +21,7 @@ SRCS= rtadvd.c rrenum.c advcap.c if.c co
DPADD= ${LIBUTIL}
LDADD= -lutil
-CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO -DRDNSS
+CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
WARNS?= 1
Modified: user/hrs/ipv6/usr.sbin/rtadvd/advcap.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/advcap.c Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/advcap.c Tue May 31 12:54:32 2011 (r222522)
@@ -103,8 +103,7 @@ static char *tdecode(char *, char **);
* we just notice escaped newlines.
*/
int
-tgetent(bp, name)
- char *bp, *name;
+tgetent(char *bp, char *name)
{
char *cp;
@@ -113,8 +112,7 @@ tgetent(bp, name)
}
int
-getent(bp, name, cp)
- char *bp, *name, *cp;
+getent(char *bp, char *name, char *cp)
{
int c;
int i = 0, cnt = 0;
@@ -184,7 +182,7 @@ getent(bp, name, cp)
* Note that this works because of the left to right scan.
*/
int
-tnchktc()
+tnchktc(void)
{
char *p, *q;
char tcname[16]; /* name of similar terminal */
@@ -233,8 +231,7 @@ tnchktc()
* name (before the first field) stops us.
*/
int
-tnamatch(np)
- char *np;
+tnamatch(char *np)
{
char *Np, *Bp;
@@ -260,8 +257,7 @@ tnamatch(np)
* into the termcap file in octal.
*/
static char *
-tskip(bp)
- char *bp;
+tskip(char *bp)
{
int dquote;
@@ -305,8 +301,7 @@ breakbreak:
* Note that we handle octal numbers beginning with 0.
*/
int64_t
-tgetnum(id)
- char *id;
+tgetnum(char *id)
{
int64_t i;
int base;
@@ -341,8 +336,7 @@ tgetnum(id)
* not given.
*/
int
-tgetflag(id)
- char *id;
+tgetflag(char *id)
{
char *bp = tbuf;
@@ -369,8 +363,7 @@ tgetflag(id)
* No checking on area overflow.
*/
char *
-tgetstr(id, area)
- char *id, **area;
+tgetstr(char *id, char **area)
{
char *bp = tbuf;
@@ -395,9 +388,7 @@ tgetstr(id, area)
* string capability escapes.
*/
static char *
-tdecode(str, area)
- char *str;
- char **area;
+tdecode(char *str, char **area)
{
char *cp;
int c;
Modified: user/hrs/ipv6/usr.sbin/rtadvd/config.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/config.c Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/config.c Tue May 31 12:54:32 2011 (r222522)
@@ -4,7 +4,7 @@
/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -155,10 +155,8 @@ getconfig(intface)
#ifdef ROUTEINFO
tmp->route.next = tmp->route.prev = &tmp->route;
#endif
-#ifdef RDNSS
TAILQ_INIT(&tmp->rdnss);
TAILQ_INIT(&tmp->dnssl);
-#endif
/* check if we are allowed to forward packets (if not determined) */
if (forwarding < 0) {
@@ -619,7 +617,6 @@ getconfig(intface)
}
#endif
-#ifdef RDNSS
/* DNS server and DNS search list information */
for (i = -1; i < MAXRDNSSENT ; i++) {
struct rdnss *rdn;
@@ -658,7 +655,7 @@ getconfig(intface)
syslog(LOG_ERR, "<%s> inet_pton failed for %s",
__func__, abuf);
exit(1);
- }
+ }
TAILQ_INSERT_TAIL(&rdn->rd_list, rdna, ra_next);
}
@@ -730,7 +727,6 @@ getconfig(intface)
/* link into chain */
insque(dns, &tmp->dnssl);
}
-#endif
/* okey */
tmp->next = ralist;
ralist = tmp;
@@ -948,7 +944,7 @@ static struct rtadvd_timer *
prefix_timeout(void *arg)
{
struct prefix *prefix = (struct prefix *)arg;
-
+
delete_prefix(prefix);
return(NULL);
@@ -1059,13 +1055,11 @@ make_packet(struct rainfo *rainfo)
struct nd_opt_route_info *ndopt_rti;
struct rtinfo *rti;
#endif
-#ifdef RDNSS
struct nd_opt_rdnss *ndopt_rdnss;
struct rdnss *rdn;
struct nd_opt_dnssl *ndopt_dnssl;
struct dnssl *dns;
size_t len;
-#endif
struct prefix *pfx;
/* calculate total length */
@@ -1086,10 +1080,9 @@ make_packet(struct rainfo *rainfo)
packlen += sizeof(struct nd_opt_mtu);
#ifdef ROUTEINFO
for (rti = rainfo->route.next; rti != &rainfo->route; rti = rti->next)
- packlen += sizeof(struct nd_opt_route_info) +
+ packlen += sizeof(struct nd_opt_route_info) +
((rti->prefixlen + 0x3f) >> 6) * 8;
#endif
-#ifdef RDNSS
TAILQ_FOREACH(rdn, &rainfo->rdnss, rd_next) {
struct rdnss_addr *rdna;
@@ -1111,8 +1104,6 @@ make_packet(struct rainfo *rainfo)
packlen += len;
}
-#endif
-
/* allocate memory for the packet */
if ((buf = malloc(packlen)) == NULL) {
syslog(LOG_ERR,
@@ -1200,7 +1191,7 @@ make_packet(struct rainfo *rainfo)
if (pfx->pltimeexpire == 0)
pltime = pfx->preflifetime;
else
- pltime = (pfx->pltimeexpire > now.tv_sec) ?
+ pltime = (pfx->pltimeexpire > now.tv_sec) ?
pfx->pltimeexpire - now.tv_sec : 0;
}
if (vltime < pltime) {
@@ -1232,8 +1223,6 @@ make_packet(struct rainfo *rainfo)
buf += sizeof(struct nd_opt_route_info) + psize * 8;
}
#endif
-
-#ifdef RDNSS
TAILQ_FOREACH(rdn, &rainfo->rdnss, rd_next) {
struct rdnss_addr *rdna;
@@ -1272,7 +1261,7 @@ make_packet(struct rainfo *rainfo)
/* A zero octet after encoded DNS server list. */
*buf++ = '\0';
-
+
/* Padding to next 8 octets boundary */
len = buf - (char *)ndopt_dnssl;
len += 8 - (len % 8);
@@ -1283,7 +1272,6 @@ make_packet(struct rainfo *rainfo)
syslog(LOG_DEBUG, "<%s>: nd_opt_dnssl_len = %d", __func__,
ndopt_dnssl->nd_opt_dnssl_len);
}
-#endif
return;
}
Modified: user/hrs/ipv6/usr.sbin/rtadvd/config.h
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/config.h Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/config.h Tue May 31 12:54:32 2011 (r222522)
@@ -4,7 +4,7 @@
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Modified: user/hrs/ipv6/usr.sbin/rtadvd/dump.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/dump.c Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/dump.c Tue May 31 12:54:32 2011 (r222522)
@@ -4,7 +4,7 @@
/*
* Copyright (C) 2000 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -74,8 +74,7 @@ static char *rtpref_str[] = {
};
static char *
-ether_str(sdl)
- struct sockaddr_dl *sdl;
+ether_str(struct sockaddr_dl *sdl)
{
static char hbuf[32];
u_char *cp;
@@ -87,21 +86,19 @@ ether_str(sdl)
} else
snprintf(hbuf, sizeof(hbuf), "NONE");
- return(hbuf);
+ return (hbuf);
}
static void
-if_dump()
+if_dump(void)
{
struct rainfo *rai;
struct prefix *pfx;
#ifdef ROUTEINFO
struct rtinfo *rti;
#endif
-#ifdef RDNSS
struct rdnss *rdn;
struct dnssl *dns;
-#endif
char prefixbuf[INET6_ADDRSTRLEN];
int first;
struct timeval now;
@@ -236,7 +233,6 @@ if_dump()
fprintf(fp, ")\n");
}
#endif
-#ifdef RDNSS
TAILQ_FOREACH(rdn, &rai->rdnss, rd_next) {
struct rdnss_addr *rdna;
@@ -248,7 +244,7 @@ if_dump()
TAILQ_FOREACH(rdna, &rdn->rd_list, ra_next) {
inet_ntop(AF_INET6, &rdna->ra_dns,
prefixbuf, sizeof(prefixbuf));
-
+
if (rdna != TAILQ_FIRST(&rdn->rd_list))
fprintf(fp, " \t");
fprintf(fp, "%s\n", prefixbuf);
@@ -273,13 +269,11 @@ if_dump()
}
fprintf(fp, "\n");
}
-#endif
}
}
void
-rtadvd_dump_file(dumpfile)
- char *dumpfile;
+rtadvd_dump_file(char *dumpfile)
{
syslog(LOG_DEBUG, "<%s> dump current status to %s", __func__,
dumpfile);
Modified: user/hrs/ipv6/usr.sbin/rtadvd/dump.h
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/dump.h Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/dump.h Tue May 31 12:54:32 2011 (r222522)
@@ -4,7 +4,7 @@
/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Modified: user/hrs/ipv6/usr.sbin/rtadvd/if.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/if.c Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/if.c Tue May 31 12:54:32 2011 (r222522)
@@ -4,7 +4,7 @@
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -72,7 +72,7 @@ static void
get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
{
int i;
-
+
for (i = 0; i < RTAX_MAX; i++) {
if (addrs & (1 << i)) {
rti_info[i] = sa;
@@ -94,12 +94,12 @@ if_nametosdl(char *name)
struct sockaddr_dl *sdl = NULL, *ret_sdl;
if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0)
- return(NULL);
+ return (NULL);
if ((buf = malloc(len)) == NULL)
- return(NULL);
+ return (NULL);
if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) {
free(buf);
- return(NULL);
+ return (NULL);
}
lim = buf + len;
@@ -125,7 +125,7 @@ if_nametosdl(char *name)
if (next == lim) {
/* search failed */
free(buf);
- return(NULL);
+ return (NULL);
}
if ((ret_sdl = malloc(sdl->sdl_len)) == NULL)
@@ -134,7 +134,7 @@ if_nametosdl(char *name)
end:
free(buf);
- return(ret_sdl);
+ return (ret_sdl);
}
int
@@ -145,7 +145,7 @@ if_getmtu(char *name)
u_long mtu = 0;
if (getifaddrs(&ifap) < 0)
- return(0);
+ return (0);
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (strcmp(ifa->ifa_name, name) == 0) {
ifd = ifa->ifa_data;
@@ -162,14 +162,14 @@ if_getmtu(char *name)
int s;
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
- return(0);
+ return (0);
ifr.ifr_addr.sa_family = AF_INET6;
strncpy(ifr.ifr_name, name,
sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) < 0) {
close(s);
- return(0);
+ return (0);
}
close(s);
@@ -177,7 +177,7 @@ if_getmtu(char *name)
}
#endif
- return(mtu);
+ return (mtu);
}
/* give interface index and its old flags, then new flags returned */
@@ -210,9 +210,9 @@ lladdropt_length(struct sockaddr_dl *sdl
{
switch (sdl->sdl_type) {
case IFT_ETHER:
- return(ROUNDUP8(ETHER_ADDR_LEN + 2));
+ return (ROUNDUP8(ETHER_ADDR_LEN + 2));
default:
- return(0);
+ return (0);
}
}
@@ -246,9 +246,9 @@ rtbuf_len()
int mib[6] = {CTL_NET, AF_ROUTE, 0, AF_INET6, NET_RT_DUMP, 0};
if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0)
- return(-1);
+ return (-1);
- return(len);
+ return (len);
}
#define FILTER_MATCH(type, filter) ((0x1 << type) & filter)
@@ -336,7 +336,7 @@ get_next_msg(char *buf, char *lim, int i
}
}
- return (char *)rtm;
+ return ((char *)rtm);
}
#undef FILTER_MATCH
@@ -349,7 +349,7 @@ get_addr(char *buf)
sa = (struct sockaddr *)(rtm + 1);
get_rtaddrs(rtm->rtm_addrs, sa, rti_info);
- return(&SIN6(rti_info[RTAX_DST])->sin6_addr);
+ return (&SIN6(rti_info[RTAX_DST])->sin6_addr);
}
int
@@ -361,7 +361,7 @@ get_rtm_ifindex(char *buf)
sa = (struct sockaddr *)(rtm + 1);
get_rtaddrs(rtm->rtm_addrs, sa, rti_info);
- return(((struct sockaddr_dl *)rti_info[RTAX_GATEWAY])->sdl_index);
+ return (((struct sockaddr_dl *)rti_info[RTAX_GATEWAY])->sdl_index);
}
int
@@ -394,7 +394,7 @@ get_prefixlen(char *buf)
struct rt_msghdr *rtm = (struct rt_msghdr *)buf;
struct sockaddr *sa, *rti_info[RTAX_MAX];
u_char *p, *lim;
-
+
sa = (struct sockaddr *)(rtm + 1);
get_rtaddrs(rtm->rtm_addrs, sa, rti_info);
sa = rti_info[RTAX_NETMASK];
@@ -438,11 +438,11 @@ prefixlen(u_char *p, u_char *lim)
case 0x00:
break;
default:
- return(-1);
+ return (-1);
}
}
- return(masklen);
+ return (masklen);
}
int
@@ -450,7 +450,7 @@ rtmsg_type(char *buf)
{
struct rt_msghdr *rtm = (struct rt_msghdr *)buf;
- return(rtm->rtm_type);
+ return (rtm->rtm_type);
}
int
@@ -458,7 +458,7 @@ rtmsg_len(char *buf)
{
struct rt_msghdr *rtm = (struct rt_msghdr *)buf;
- return(rtm->rtm_msglen);
+ return (rtm->rtm_msglen);
}
int
@@ -466,7 +466,7 @@ ifmsg_len(char *buf)
{
struct if_msghdr *ifm = (struct if_msghdr *)buf;
- return(ifm->ifm_msglen);
+ return (ifm->ifm_msglen);
}
/*
Modified: user/hrs/ipv6/usr.sbin/rtadvd/if.h
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/if.h Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/if.h Tue May 31 12:54:32 2011 (r222522)
@@ -4,7 +4,7 @@
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Modified: user/hrs/ipv6/usr.sbin/rtadvd/rrenum.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/rrenum.c Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/rrenum.c Tue May 31 12:54:32 2011 (r222522)
@@ -75,7 +75,7 @@ static int s = -1;
/*
* Check validity of a Prefix Control Operation(PCO).
- * Return 0 on success, 1 on failure.
+ * return 0 on success, 1 on failure.
*/
static int
rr_pco_check(int len, struct rr_pco_match *rpm)
@@ -88,7 +88,7 @@ rr_pco_check(int len, struct rr_pco_matc
(rpm->rpm_len - 3) & 0x3) { /* must be multiple of 4 */
syslog(LOG_WARNING, "<%s> rpm_len %d is not 4N * 3",
__func__, rpm->rpm_len);
- return 1;
+ return (1);
}
/* rpm->rpm_code must be valid value */
switch (rpm->rpm_code) {
@@ -99,13 +99,13 @@ rr_pco_check(int len, struct rr_pco_matc
default:
syslog(LOG_WARNING, "<%s> unknown rpm_code %d", __func__,
rpm->rpm_code);
- return 1;
+ return (1);
}
/* rpm->rpm_matchlen must be 0 to 128 inclusive */
if (rpm->rpm_matchlen > 128) {
syslog(LOG_WARNING, "<%s> rpm_matchlen %d is over 128",
__func__, rpm->rpm_matchlen);
- return 1;
+ return (1);
}
/*
@@ -131,10 +131,10 @@ rr_pco_check(int len, struct rr_pco_matc
__func__, rpu->rpu_uselen,
rpu->rpu_keeplen,
rpu->rpu_uselen + rpu->rpu_keeplen);
- return 1;
+ return (1);
}
}
- return 0;
+ return (0);
}
static void
@@ -246,7 +246,7 @@ do_pco(struct icmp6_router_renum *rr, in
struct in6_rrenumreq irr;
if ((rr_pco_check(len, rpm) != 0))
- return 1;
+ return (1);
if (s == -1 && (s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
syslog(LOG_ERR, "<%s> socket: %s", __func__,
@@ -275,13 +275,13 @@ do_pco(struct icmp6_router_renum *rr, in
do_use_prefix(len, rpm, &irr, ifindex);
}
if (errno == ENXIO)
- return 0;
+ return (0);
else if (errno) {
syslog(LOG_ERR, "<%s> if_indextoname: %s", __func__,
strerror(errno));
- return 1;
+ return (1);
}
- return 0;
+ return (0);
}
/*
@@ -310,7 +310,7 @@ do_rr(int len, struct icmp6_router_renum
tooshort:
syslog(LOG_ERR, "<%s> pkt too short. left len = %d. "
"gabage at end of pkt?", __func__, len);
- return 1;
+ return (1);
}
rpmlen = rpm->rpm_len << 3;
if (len < rpmlen)
@@ -326,7 +326,7 @@ do_rr(int len, struct icmp6_router_renum
len -= rpmlen;
}
- return 0;
+ return (0);
}
/*
@@ -345,7 +345,7 @@ rr_command_check(int len, struct icmp6_r
sizeof(struct rr_pco_match))) {
syslog(LOG_ERR, "<%s> rr_command len %d is too short",
__func__, len);
- return 1;
+ return (1);
}
/* destination check. only for multicast. omit unicast check. */
@@ -354,7 +354,7 @@ rr_command_check(int len, struct icmp6_r
syslog(LOG_ERR, "<%s> dst mcast addr %s is illegal",
__func__,
inet_ntop(AF_INET6, dst, ntopbuf, INET6_ADDRSTRLEN));
- return 1;
+ return (1);
}
/* seqnum and segnum check */
@@ -363,7 +363,7 @@ rr_command_check(int len, struct icmp6_r
"<%s> rcvd old seqnum %d from %s",
__func__, (u_int32_t)ntohl(rr->rr_seqnum),
inet_ntop(AF_INET6, from, ntopbuf, INET6_ADDRSTRLEN));
- return 1;
+ return (1);
}
if (rro.rro_seqnum == rr->rr_seqnum &&
(rr->rr_flags & ICMP6_RR_FLAGS_TEST) == 0 &&
@@ -374,7 +374,7 @@ rr_command_check(int len, struct icmp6_r
__func__, rr->rr_segnum,
inet_ntop(AF_INET6, from, ntopbuf,
INET6_ADDRSTRLEN));
- return 0;
+ return (0);
}
/* update seqnum */
@@ -387,7 +387,7 @@ rr_command_check(int len, struct icmp6_r
}
rro.rro_seqnum = rr->rr_seqnum;
- return 0;
+ return (0);
}
static void
@@ -451,7 +451,8 @@ rr_input(int len, struct icmp6_router_re
* check multicast destinations only.
*/
if (IN6_IS_ADDR_MULTICAST(&pi->ipi6_addr) &&
- !IN6_ARE_ADDR_EQUAL(&in6a_site_allrouters, &pi->ipi6_addr)) {
+ !IN6_ARE_ADDR_EQUAL(&sin6_sitelocal_allrouters.sin6_addr,
+ &pi->ipi6_addr)) {
syslog(LOG_NOTICE,
"<%s>: RR message with invalid destination (%s) "
"from %s on %s",
Modified: user/hrs/ipv6/usr.sbin/rtadvd/rrenum.h
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/rrenum.h Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/rrenum.h Tue May 31 12:54:32 2011 (r222522)
@@ -4,7 +4,7 @@
/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c Tue May 31 12:03:34 2011 (r222521)
+++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c Tue May 31 12:54:32 2011 (r222522)
@@ -4,7 +4,7 @@
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -16,7 +16,7 @@
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -80,8 +80,6 @@ struct msghdr sndmhdr;
struct iovec rcviov[2];
struct iovec sndiov[2];
struct sockaddr_in6 rcvfrom;
-struct sockaddr_in6 sin6_allnodes = {sizeof(sin6_allnodes), AF_INET6};
-struct in6_addr in6a_site_allrouters;
static char *dumpfilename = "/var/run/rtadvd.dump";
static char *pidfilename = "/var/run/rtadvd.pid";
static struct pidfh *pfh;
@@ -122,10 +120,8 @@ union nd_opts {
#define NDOPT_FLAG_PREFIXINFO (1 << 2)
#define NDOPT_FLAG_RDHDR (1 << 3)
#define NDOPT_FLAG_MTU (1 << 4)
-#ifdef RDNSS
#define NDOPT_FLAG_RDNSS (1 << 5)
#define NDOPT_FLAG_DNSSL (1 << 6)
-#endif
u_int32_t ndopt_flags[] = {
[ND_OPT_SOURCE_LINKADDR] = NDOPT_FLAG_SRCLINKADDR,
@@ -133,13 +129,25 @@ u_int32_t ndopt_flags[] = {
[ND_OPT_PREFIX_INFORMATION] = NDOPT_FLAG_PREFIXINFO,
[ND_OPT_REDIRECTED_HEADER] = NDOPT_FLAG_RDHDR,
[ND_OPT_MTU] = NDOPT_FLAG_MTU,
-#ifdef RDNSS
[ND_OPT_RDNSS] = NDOPT_FLAG_RDNSS,
[ND_OPT_DNSSL] = NDOPT_FLAG_DNSSL,
-#endif
+};
+const struct sockaddr_in6 sin6_linklocal_allnodes = {
+ .sin6_len = sizeof(sin6_linklocal_allnodes),
+ .sin6_family = AF_INET6,
+ .sin6_addr = IN6ADDR_LINKLOCAL_ALLNODES_INIT,
+};
+const struct sockaddr_in6 sin6_linklocal_allrouters = {
+ .sin6_len = sizeof(sin6_linklocal_allrouters),
+ .sin6_family = AF_INET6,
+ .sin6_addr = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT,
+};
+const struct sockaddr_in6 sin6_sitelocal_allrouters = {
+ .sin6_len = sizeof(sin6_sitelocal_allrouters),
+ .sin6_family = AF_INET6,
+ .sin6_addr = IN6ADDR_SITELOCAL_ALLROUTERS_INIT,
};
-int main(int, char *[]);
static void set_die(int);
static void die(void);
static void sock_open(void);
@@ -160,9 +168,7 @@ static void rtadvd_set_dump_file(int);
static void set_short_delay(struct rainfo *);
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
#ifdef HAVE_POLL_H
struct pollfd set[2];
@@ -249,11 +255,6 @@ main(argc, argv)
while (argc--)
getconfig(*argv++);
- if (inet_pton(AF_INET6, ALLNODES, &sin6_allnodes.sin6_addr) != 1) {
- fprintf(stderr, "fatal: inet_pton failed\n");
- exit(1);
- }
-
pfh = pidfile_open(pidfilename, 0600, &otherpid);
if (pfh == NULL) {
if (errno == EEXIST)
@@ -372,27 +373,24 @@ main(argc, argv)
}
static void
-rtadvd_set_dump_file(sig)
- int sig;
+rtadvd_set_dump_file(int sig)
{
do_dump = 1;
}
static void
-set_die(sig)
- int sig;
+set_die(int sig)
{
do_die = 1;
}
static void
-die()
+die(void)
{
struct rainfo *ra;
-#ifdef RDNSS
struct rdnss *rdn;
struct dnssl *dns;
-#endif
+
int i;
const int retrans = MAX_FINAL_RTR_ADVERTISEMENTS;
@@ -403,12 +401,10 @@ die()
for (ra = ralist; ra; ra = ra->next) {
ra->lifetime = 0;
-#ifdef RDNSS
TAILQ_FOREACH(rdn, &ra->rdnss, rd_next)
rdn->rd_ltime = 0;
TAILQ_FOREACH(dns, &ra->dnssl, dn_next)
dns->dn_ltime = 0;
-#endif
make_packet(ra);
}
for (i = 0; i < retrans; i++) {
@@ -417,12 +413,12 @@ die()
sleep(MIN_DELAY_BETWEEN_RAS);
}
pidfile_remove(pfh);
+
exit(0);
- /*NOTREACHED*/
}
static void
-rtmsg_input()
+rtmsg_input(void)
{
int n, type, ifindex = 0, plen;
size_t len;
@@ -441,7 +437,7 @@ rtmsg_input()
}
if (n > rtmsg_len(msg)) {
/*
- * This usually won't happen for messages received on
+ * This usually won't happen for messages received on
* a routing socket.
*/
if (dflag > 1)
@@ -637,13 +633,13 @@ rtmsg_input()
}
void
-rtadvd_input()
+rtadvd_input(void)
{
int i;
int *hlimp = NULL;
#ifdef OLDRAWSOCKET
struct ip6_hdr *ip;
-#endif
+#endif
struct icmp6_hdr *icp;
int ifindex = 0;
struct cmsghdr *cm;
@@ -766,7 +762,7 @@ rtadvd_input()
case ND_ROUTER_ADVERT:
/*
* Message verification - RFC-2461 6.1.2
- * XXX: there's a same dilemma as above...
+ * XXX: there's a same dilemma as above...
*/
if (*hlimp != 255) {
syslog(LOG_NOTICE,
@@ -916,8 +912,7 @@ rs_input(int len, struct nd_router_solic
}
static void
-set_short_delay(rai)
- struct rainfo *rai;
+set_short_delay(struct rainfo *rai)
{
long delay; /* must not be greater than 1000000 */
struct timeval interval, now, min_delay, tm_tmp, *rest;
@@ -978,17 +973,14 @@ ra_input(int len, struct nd_router_adver
inet_ntop(AF_INET6, &from->sin6_addr,
ntopbuf, INET6_ADDRSTRLEN),
if_indextoname(pi->ipi6_ifindex, ifnamebuf));
-
+
/* ND option check */
memset(&ndopts, 0, sizeof(ndopts));
if (nd6_options((struct nd_opt_hdr *)(ra + 1),
len - sizeof(struct nd_router_advert),
&ndopts, NDOPT_FLAG_SRCLINKADDR |
- NDOPT_FLAG_PREFIXINFO | NDOPT_FLAG_MTU
-#ifdef RDNSS
- | NDOPT_FLAG_RDNSS | NDOPT_FLAG_DNSSL
-#endif
- )) {
+ NDOPT_FLAG_PREFIXINFO | NDOPT_FLAG_MTU |
+ NDOPT_FLAG_RDNSS | NDOPT_FLAG_DNSSL)) {
syslog(LOG_INFO,
"<%s> ND option check failed for an RA from %s on %s",
__func__,
@@ -1012,7 +1004,7 @@ ra_input(int len, struct nd_router_adver
goto done;
}
rai->rainput++; /* increment statistics */
-
+
/* Cur Hop Limit value */
if (ra->nd_ra_curhoplimit && rai->hoplimit &&
ra->nd_ra_curhoplimit != rai->hoplimit) {
@@ -1118,7 +1110,7 @@ ra_input(int len, struct nd_router_adver
if (inconsistent)
rai->rainconsistent++;
-
+
done:
free_ndopts(&ndopts);
return;
@@ -1137,7 +1129,7 @@ prefix_check(struct nd_opt_prefix_info *
#if 0 /* impossible */
if (pinfo->nd_opt_pi_type != ND_OPT_PREFIX_INFORMATION)
- return(0);
+ return (0);
#endif
/*
@@ -1167,7 +1159,7 @@ prefix_check(struct nd_opt_prefix_info *
inet_ntop(AF_INET6, &from->sin6_addr,
ntopbuf, INET6_ADDRSTRLEN),
rai->ifname);
- return(0);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list