Date: Thu, 14 Jul 2011 14:15:22 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r224015 - in user/hrs/ipv6/usr.sbin: rtadvctl rtadvd Message-ID: <201107141415.p6EEFM1X032851@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Jul 14 14:15:21 2011 New Revision: 224015 URL: http://svn.freebsd.org/changeset/base/224015 Log: Remove ROUTEINFO and HAVE_POLL_H ifdefs to make things easy. Modified: user/hrs/ipv6/usr.sbin/rtadvctl/Makefile user/hrs/ipv6/usr.sbin/rtadvctl/rtadvctl.c user/hrs/ipv6/usr.sbin/rtadvd/Makefile user/hrs/ipv6/usr.sbin/rtadvd/config.c user/hrs/ipv6/usr.sbin/rtadvd/control_server.c user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h Modified: user/hrs/ipv6/usr.sbin/rtadvctl/Makefile ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvctl/Makefile Thu Jul 14 14:01:36 2011 (r224014) +++ user/hrs/ipv6/usr.sbin/rtadvctl/Makefile Thu Jul 14 14:15:21 2011 (r224015) @@ -7,7 +7,7 @@ MAN= rtadvctl.8 SRCS= rtadvctl.c control.c control_client.c if.c timer_subr.c -CFLAGS+= -DROUTEINFO -I${.CURDIR} -I${.CURDIR}/../rtadvd +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../rtadvd WARNS?= 3 .include <bsd.prog.mk> Modified: user/hrs/ipv6/usr.sbin/rtadvctl/rtadvctl.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvctl/rtadvctl.c Thu Jul 14 14:01:36 2011 (r224014) +++ user/hrs/ipv6/usr.sbin/rtadvctl/rtadvctl.c Thu Jul 14 14:15:21 2011 (r224015) @@ -84,9 +84,7 @@ static int action_shutdown(int, char **) static int action_show(int, char **); static int action_show_prefix(struct prefix *); -#ifdef ROUTEINFO static int action_show_rtinfo(struct rtinfo *); -#endif static int action_show_rdnss(void *); static int action_show_dnssl(void *); @@ -366,9 +364,7 @@ action_show(int argc, char **argv) char argv_ifilist[sizeof(":ifilist=")] = ":ifilist="; char argv_ifi[IFNAMSIZ + sizeof(":ifi=")]; char argv_rai[IFNAMSIZ + sizeof(":rai=")]; -#ifdef ROUTEINFO char argv_rti[IFNAMSIZ + sizeof(":rti=")]; -#endif char argv_pfx[IFNAMSIZ + sizeof(":pfx=")]; char argv_rdnss[IFNAMSIZ + sizeof(":rdnss=")]; char argv_dnssl[IFNAMSIZ + sizeof(":dnssl=")]; @@ -420,9 +416,7 @@ action_show(int argc, char **argv) TAILQ_FOREACH(ifi, &ifl, ifi_next) { struct ifinfo *ifi_s; struct rainfo *rai; -#ifdef ROUTEINFO struct rtinfo *rti; -#endif struct prefix *pfx; int c; int ra_ifstatus; @@ -540,7 +534,6 @@ action_show(int argc, char **argv) if (vflag < LOG_WARNING) continue; -#ifdef ROUTEINFO /* route information */ sprintf(argv_rti, "%s:rti=", ifi->ifi_ifname); action_argv = argv_rti; @@ -556,7 +549,7 @@ action_show(int argc, char **argv) for (i = 0; i < len; i++) action_show_rtinfo(&rti[i]); } -#endif + /* prefix information */ sprintf(argv_pfx, "%s:pfx=", ifi->ifi_ifname); action_argv = argv_pfx; @@ -631,7 +624,6 @@ action_show(int argc, char **argv) return (0); } -#ifdef ROUTEINFO static int action_show_rtinfo(struct rtinfo *rti) { @@ -648,7 +640,6 @@ action_show_rtinfo(struct rtinfo *rti) return (0); } -#endif static int action_show_prefix(struct prefix *pfx) Modified: user/hrs/ipv6/usr.sbin/rtadvd/Makefile ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/Makefile Thu Jul 14 14:01:36 2011 (r224014) +++ user/hrs/ipv6/usr.sbin/rtadvd/Makefile Thu Jul 14 14:15:21 2011 (r224015) @@ -22,7 +22,7 @@ SRCS= rtadvd.c rrenum.c advcap.c if.c co DPADD= ${LIBUTIL} LDADD= -lutil -CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO +CFLAGS+= -DHAVE_ARC4RANDOM WARNS?= 3 Modified: user/hrs/ipv6/usr.sbin/rtadvd/config.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/config.c Thu Jul 14 14:01:36 2011 (r224014) +++ user/hrs/ipv6/usr.sbin/rtadvd/config.c Thu Jul 14 14:15:21 2011 (r224015) @@ -316,9 +316,7 @@ getconfig(int idx) ELM_MALLOC(rai, exit(1)); TAILQ_INIT(&rai->rai_prefix); -#ifdef ROUTEINFO TAILQ_INIT(&rai->rai_route); -#endif TAILQ_INIT(&rai->rai_rdnss); TAILQ_INIT(&rai->rai_dnssl); TAILQ_INIT(&rai->rai_soliciter); @@ -609,7 +607,6 @@ getconfig_free_pfx: #endif /* route information */ -#ifdef ROUTEINFO rai->rai_routes = 0; for (i = -1; i < MAXROUTE; i++) { struct rtinfo *rti; @@ -750,7 +747,7 @@ getconfig_free_pfx: getconfig_free_rti: free(rti); } -#endif + /* DNS server and DNS search list information */ for (i = -1; i < MAXRDNSSENT ; i++) { struct rdnss *rdn; @@ -1192,10 +1189,8 @@ make_packet(struct rainfo *rai) struct nd_router_advert *ra; struct nd_opt_prefix_info *ndopt_pi; struct nd_opt_mtu *ndopt_mtu; -#ifdef ROUTEINFO struct nd_opt_route_info *ndopt_rti; struct rtinfo *rti; -#endif struct nd_opt_rdnss *ndopt_rdnss; struct rdnss *rdn; struct nd_opt_dnssl *ndopt_dnssl; @@ -1221,11 +1216,11 @@ make_packet(struct rainfo *rai) packlen += sizeof(struct nd_opt_prefix_info) * rai->rai_pfxs; if (rai->rai_linkmtu) packlen += sizeof(struct nd_opt_mtu); -#ifdef ROUTEINFO + TAILQ_FOREACH(rti, &rai->rai_route, rti_next) packlen += sizeof(struct nd_opt_route_info) + ((rti->rti_prefixlen + 0x3f) >> 6) * 8; -#endif + TAILQ_FOREACH(rdn, &rai->rai_rdnss, rd_next) { struct rdnss_addr *rdna; @@ -1348,7 +1343,6 @@ make_packet(struct rainfo *rai) buf += sizeof(struct nd_opt_prefix_info); } -#ifdef ROUTEINFO TAILQ_FOREACH(rti, &rai->rai_route, rti_next) { u_int8_t psize = (rti->rti_prefixlen + 0x3f) >> 6; @@ -1361,7 +1355,7 @@ make_packet(struct rainfo *rai) memcpy(ndopt_rti + 1, &rti->rti_prefix, psize * 8); buf += sizeof(struct nd_opt_route_info) + psize * 8; } -#endif + TAILQ_FOREACH(rdn, &rai->rai_rdnss, rd_next) { struct rdnss_addr *rdna; @@ -1382,6 +1376,7 @@ make_packet(struct rainfo *rai) syslog(LOG_DEBUG, "<%s>: nd_opt_dnss_len = %d", __func__, ndopt_rdnss->nd_opt_rdnss_len); } + TAILQ_FOREACH(dns, &rai->rai_dnssl, dn_next) { struct dnssl_addr *dnsa; Modified: user/hrs/ipv6/usr.sbin/rtadvd/control_server.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/control_server.c Thu Jul 14 14:01:36 2011 (r224014) +++ user/hrs/ipv6/usr.sbin/rtadvd/control_server.c Thu Jul 14 14:15:21 2011 (r224015) @@ -76,9 +76,7 @@ static int cmsg_getprop_rai_timer(struct static int cmsg_getprop_pfx(struct ctrl_msg_pl *); static int cmsg_getprop_rdnss(struct ctrl_msg_pl *); static int cmsg_getprop_dnssl(struct ctrl_msg_pl *); -#ifdef ROUTEINFO static int cmsg_getprop_rti(struct ctrl_msg_pl *); -#endif static struct dispatch_table { const char *dt_comm; @@ -91,9 +89,7 @@ static struct dispatch_table { DEF_PL_HANDLER(ifi), DEF_PL_HANDLER(rai), DEF_PL_HANDLER(rai_timer), -#ifdef ROUTEINFO DEF_PL_HANDLER(rti), -#endif DEF_PL_HANDLER(pfx), DEF_PL_HANDLER(rdnss), DEF_PL_HANDLER(dnssl), @@ -277,7 +273,6 @@ cmsg_getprop_rai_timer(struct ctrl_msg_p return (0); } -#ifdef ROUTEINFO static int cmsg_getprop_rti(struct ctrl_msg_pl *cp) { @@ -326,7 +321,6 @@ cmsg_getprop_rti(struct ctrl_msg_pl *cp) return (0); } -#endif static int cmsg_getprop_pfx(struct ctrl_msg_pl *cp) Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c Thu Jul 14 14:01:36 2011 (r224014) +++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c Thu Jul 14 14:15:21 2011 (r224015) @@ -67,9 +67,7 @@ #include <string.h> #include <stdlib.h> #include <syslog.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #include "pathnames.h" #include "rtadvd.h" @@ -98,12 +96,10 @@ const char *conffile = _PATH_RTADVDCONF; static struct pidfh *pfh; int dflag = 0, sflag = 0; -#ifdef HAVE_POLL_H #define PFD_RAWSOCK 0 #define PFD_RTSOCK 1 #define PFD_CSOCK 2 #define PFD_MAX 3 -#endif struct railist_head_t railist = TAILQ_HEAD_INITIALIZER(railist); @@ -171,13 +167,7 @@ static int check_accept_rtadv(int); int main(int argc, char *argv[]) { -#ifdef HAVE_POLL_H struct pollfd set[PFD_MAX]; -#else - fd_set *fdsetp, *selectfdp; - int fdmasks; - int maxfd = 0; -#endif struct timeval *timeout; int i, ch; int fflag = 0, logopt; @@ -281,7 +271,6 @@ main(int argc, char *argv[]) pid = getpid(); pidfile_write(pfh); -#ifdef HAVE_POLL_H set[PFD_RAWSOCK].fd = sock.si_fd; set[PFD_RAWSOCK].events = POLLIN; if (sflag == 0) { @@ -292,32 +281,6 @@ main(int argc, char *argv[]) set[PFD_RTSOCK].fd = -1; set[PFD_CSOCK].fd = ctrlsock.si_fd; set[PFD_CSOCK].events = POLLIN; -#else - maxfd = sock.si_fd; - if (sflag == 0) { - rtsock_open(); - if (rtsock.si_fd > sock.si_fd) - maxfd = rtsock.si_fd; - } else - rtsock.si_fd = -1; - if (maxfd < ctrlsock.si_fd) - maxfd = ctrlsock.si_fd; - - fdmasks = howmany(maxfd + 1, NFDBITS) * sizeof(fd_mask); - if ((fdsetp = malloc(fdmasks)) == NULL) { - err(1, "malloc"); - /*NOTREACHED*/ - } - if ((selectfdp = malloc(fdmasks)) == NULL) { - err(1, "malloc"); - /*NOTREACHED*/ - } - memset(fdsetp, 0, fdmasks); - FD_SET(sock.si_fd, fdsetp); - if (rtsock.si_fd >= 0) - FD_SET(rtsock.si_fd, fdsetp); - FD_SET(ctrlsock.si_fd, fdsetp); -#endif signal(SIGTERM, set_do_die); signal(SIGINT, set_do_die); signal(SIGHUP, set_do_reload); @@ -332,9 +295,6 @@ main(int argc, char *argv[]) set_do_reload(0); while (1) { -#ifndef HAVE_POLL_H - memcpy(selectfdp, fdsetp, fdmasks); /* reinitialize */ -#endif if (do_die()) die(); @@ -362,15 +322,9 @@ main(int argc, char *argv[]) "<%s> there's no timer. waiting for inputs", __func__); } -#ifdef HAVE_POLL_H if ((i = poll(set, sizeof(set)/sizeof(set[0]), timeout ? (timeout->tv_sec * 1000 + - timeout->tv_usec / 1000) : INFTIM)) < 0) -#else - if ((i = select(maxfd + 1, selectfdp, NULL, NULL, - timeout)) < 0) -#endif - { + timeout->tv_usec / 1000) : INFTIM)) < 0) { /* EINTR would occur upon SIGUSR1 for status dump */ if (errno != EINTR) syslog(LOG_ERR, "<%s> select: %s", @@ -379,24 +333,13 @@ main(int argc, char *argv[]) } if (i == 0) /* timeout */ continue; -#ifdef HAVE_POLL_H if (rtsock.si_fd != -1 && set[PFD_RTSOCK].revents & POLLIN) -#else - if (rtsock.si_fd != -1 && FD_ISSET(rtsock.si_fd, selectfdp)) -#endif rtmsg_input(&rtsock); -#ifdef HAVE_POLL_H + if (set[PFD_RAWSOCK].revents & POLLIN) -#else - if (FD_ISSET(sock.si_fd, selectfdp)) -#endif rtadvd_input(&sock); -#ifdef HAVE_POLL_H - if (set[PFD_CSOCK].revents & POLLIN) -#else - if (FD_ISSET(ctrlsock.si_fd, selectfdp)) -#endif - { + + if (set[PFD_CSOCK].revents & POLLIN) { int fd; fd = csock_accept(&ctrlsock); Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h Thu Jul 14 14:01:36 2011 (r224014) +++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h Thu Jul 14 14:15:21 2011 (r224015) @@ -125,7 +125,6 @@ struct prefix { struct in6_addr pfx_prefix; }; -#ifdef ROUTEINFO struct rtinfo { TAILQ_ENTRY(rtinfo) rti_next; @@ -134,7 +133,6 @@ struct rtinfo { int rti_prefixlen; struct in6_addr rti_prefix; }; -#endif struct rdnss_addr { TAILQ_ENTRY(rdnss_addr) ra_next; @@ -220,10 +218,8 @@ struct rainfo { TAILQ_HEAD(, rdnss) rai_rdnss; /* DNS server list */ TAILQ_HEAD(, dnssl) rai_dnssl; /* search domain list */ -#ifdef ROUTEINFO TAILQ_HEAD(, rtinfo) rai_route; /* route information option (link head) */ int rai_routes; /* number of route information options */ -#endif /* actual RA packet data and its length */ size_t rai_ra_datalen; u_char *rai_ra_data;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107141415.p6EEFM1X032851>