diff options
| -rw-r--r-- | sys/netinet6/nd6_nbr.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 22 |
2 files changed, 2 insertions, 26 deletions
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 0e8590b22a9..7543f6ee3fb 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.14 2001/02/16 08:47:12 itojun Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.15 2001/02/16 16:08:01 itojun Exp $ */ /* $KAME: nd6_nbr.c,v 1.58 2001/02/08 10:57:00 itojun Exp $ */ /* @@ -1075,16 +1075,12 @@ nd6_dad_start(ifa, tick) } else { int ntick; -#ifdef __OpenBSD__ #define random arc4random -#endif if (*tick == 0) ntick = random() % (MAX_RTR_SOLICITATION_DELAY * hz); else ntick = *tick + random() % (hz / 2); -#ifdef __OpenBSD__ #undef random -#endif *tick = ntick; nd6_dad_starttimer(dp, ntick); } diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 486b931ffa1..1b27a00f625 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.2 2001/02/16 16:01:00 itojun Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.3 2001/02/16 16:08:01 itojun Exp $ */ /* $KAME: raw_ip6.c,v 1.65 2001/02/08 18:36:17 itojun Exp $ */ /* @@ -280,10 +280,8 @@ rip6_ctlinput(cmd, sa, d) notify = in6_rtchange, d = NULL; else if (cmd == PRC_HOSTDEAD) d = NULL; -#if defined(__NetBSD__) || defined(__OpenBSD__) else if (cmd == PRC_MSGSIZE) ; /* special code is present, see below */ -#endif else if (inet6ctlerrmap[cmd] == 0) return; @@ -304,7 +302,6 @@ rip6_ctlinput(cmd, sa, d) nxt = -1; } -#if defined(__NetBSD__) || defined(__OpenBSD__) if (ip6 && cmd == PRC_MSGSIZE) { struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa; int valid = 0; @@ -318,14 +315,8 @@ rip6_ctlinput(cmd, sa, d) * from icmp6_notify_error() */ in6p = NULL; -#ifdef __NetBSD__ - in6p = in6_pcblookup_connect(&rawin6pcb, - &sa6->sin6_addr, 0, - (struct in6_addr *)&sa6_src->sin6_addr, 0, 0); -#elif defined(__OpenBSD__) in6p = in6_pcbhashlookup(&rawin6pcbtable, &sa6->sin6_addr, 0, (struct in6_addr *)&sa6_src->sin6_addr, 0); -#endif #if 0 if (!in6p) { /* @@ -335,14 +326,9 @@ rip6_ctlinput(cmd, sa, d) * We should at least check if the local * address (= s) is really ours. */ -#ifdef __NetBSD__ - in6p = in6_pcblookup_bind(&rawin6pcb, - &sa6->sin6_addr, 0, 0)) -#elif defined(__OpenBSD__) in6p = in_pcblookup(&rawin6pcbtable, &sa6->sin6_addr, 0, (struct in6_addr *)&sa6_src->sin6_addr, 0, INPLOOKUP_WILDCARD | INPLOOKUP_IPV6); -#endif } #endif @@ -367,15 +353,9 @@ rip6_ctlinput(cmd, sa, d) * destination and want to know the path MTU. */ } -#endif -#ifdef __OpenBSD__ (void) in6_pcbnotify(&rawin6pcbtable, sa, 0, (struct sockaddr *)sa6_src, 0, cmd, cmdarg, notify); -#else - (void) in6_pcbnotify(&rawin6pcb, sa, 0, - (struct sockaddr *)sa6_src, 0, cmd, cmdarg, notify); -#endif } /* |