diff options
Diffstat (limited to 'usr.sbin/route6d/route6d.c')
-rw-r--r-- | usr.sbin/route6d/route6d.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index 857f5cb..2e8deac 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -60,16 +60,10 @@ static char _rcsid[] = "$Id: route6d.c,v 1.6 1999/09/10 08:20:59 itojun Exp $"; #include <sys/ioctl.h> #include <sys/sysctl.h> #include <sys/errno.h> -#ifdef ADVAPI #include <sys/uio.h> -#endif #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ -#define KERNEL 1 #include <net/route.h> -#undef KERNEL #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/ip6.h> @@ -357,15 +351,8 @@ main(argc, argv) ifrtdump(0); if (dflag == 0) { -#if 1 if (daemon(0, 0) < 0) fatal("daemon"); -#else - if (fork()) - exit(0); - if (setsid() < 0) - fatal("setid"); -#endif } pid = getpid(); if ((pidfile = fopen(ROUTE6D_PID, "w")) != NULL) { @@ -509,9 +496,7 @@ ripalarm(sig) void init() { -#ifdef ADVAPI int i; -#endif int int0, int255, error; struct addrinfo hints, *res; char port[10]; @@ -544,11 +529,9 @@ init() if (setsockopt(ripsock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &int0, sizeof(int0)) < 0) fatal("rip IPV6_MULTICAST_LOOP"); -#ifdef ADVAPI i = 1; if (setsockopt(ripsock, IPPROTO_IPV6, IPV6_PKTINFO, &i, sizeof(i)) < 0) fatal("rip IPV6_PKTINFO"); -#endif /*ADVAPI*/ memset(&hints, 0, sizeof(hints)); hints.ai_family = PF_INET6; @@ -811,7 +794,6 @@ sendpacket(sin, len) * RIP6_REQUEST message. SO_DONTROUTE has been specified to * other sockets. */ -#ifdef ADVAPI struct msghdr m; struct cmsghdr *cm; struct iovec iov[2]; @@ -858,13 +840,6 @@ sendpacket(sin, len) trace(1, "sendmsg: %s\n", strerror(errno)); return errno; } -#else - if (sendto(ripsock, ripbuf, len, 0 /*MSG_DONTROUTE*/, - (struct sockaddr *)sin, sizeof(struct sockaddr_in6)) < 0) { - trace(1, "sendto: %s\n", strerror(errno)); - return errno; - } -#endif return 0; } @@ -882,24 +857,18 @@ riprecv() struct netinfo6 *np, *nq; struct riprt *rrt; int len, nn, need_trigger, index; -#ifndef ADVAPI - int flen; -#endif char buf[4 * RIP6_MAXMTU]; time_t t; -#ifdef ADVAPI struct msghdr m; struct cmsghdr *cm; struct iovec iov[2]; u_char cmsgbuf[256]; struct in6_pktinfo *pi; -#endif /*ADVAPI*/ struct iff *iffp; struct in6_addr ia; int ok; need_trigger = 0; -#ifdef ADVAPI m.msg_name = (caddr_t)&fsock; m.msg_namelen = sizeof(fsock); iov[0].iov_base = (caddr_t)buf; @@ -924,16 +893,6 @@ riprecv() } if (index && IN6_IS_ADDR_LINKLOCAL(&fsock.sin6_addr)) SET_IN6_LINKLOCAL_IFINDEX(fsock.sin6_addr, index); -#else - flen = sizeof(struct sockaddr_in6); - if ((len = recvfrom(ripsock, buf, sizeof(buf), 0, - (struct sockaddr *)&fsock, &flen)) < 0) - fatal("recvfrom"); - if (IN6_IS_ADDR_LINKLOCAL(&fsock.sin6_addr)) - index = IN6_LINKLOCAL_IFINDEX(fsock.sin6_addr); - else - index = 0; -#endif /*ADVAPI*/ nh = fsock.sin6_addr; nn = (len - sizeof(struct rip6) + sizeof(struct netinfo6)) / |