diff options
| author |   jca <jca@openbsd.org> | 2016-02-26 12:34:30 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2016-02-26 12:34:30 +0000 |
| commit | 0337a5534dc817e3ba3c56aa18262e5c508b181b (patch) | |
| tree | 2d7ee2873be629f4b3d39e4c09831bb35aab1406 | |
| parent | Remove #if'0ed code that uses a deprecated ioctl; ok florian@ (diff) | |
| download | wireguard-openbsd-0337a5534dc817e3ba3c56aa18262e5c508b181b.tar.xz wireguard-openbsd-0337a5534dc817e3ba3c56aa18262e5c508b181b.zip | |
GC remnants of the Router Renumbering code; ok florian@
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.c | 26 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.h | 5 |
2 files changed, 2 insertions, 29 deletions
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index f844843b2c6..a9b3cf4d69e 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.c,v 1.68 2016/02/09 00:40:00 jca Exp $ */ +/* $OpenBSD: rtadvd.c,v 1.69 2016/02/26 12:34:30 jca Exp $ */ /* $KAME: rtadvd.c,v 1.66 2002/05/29 14:18:36 itojun Exp $ */ /* @@ -1009,30 +1009,6 @@ find_prefix(struct rainfo *rai, struct in6_addr *prefix, int plen) return(NULL); } -/* check if p0/plen0 matches p1/plen1; return 1 if matches, otherwise 0. */ -int -prefix_match(struct in6_addr *p0, int plen0, - struct in6_addr *p1, int plen1) -{ - int bytelen, bitlen; - u_char bitmask; - - if (plen0 < plen1) - return(0); - bytelen = plen1 / 8; - bitlen = plen1 % 8; - bitmask = 0xff << (8 - bitlen); - if (memcmp((void *)p0, (void *)p1, bytelen)) - return(0); - if (bitlen == 0 || - ((p0->s6_addr[bytelen] & bitmask) == - (p1->s6_addr[bytelen] & bitmask))) { - return(1); - } - - return(0); -} - static int nd6_options(struct nd_opt_hdr *hdr, int limit, union nd_opts *ndopts, u_int32_t optflags) diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h index 6fd91a00974..62f1013e89a 100644 --- a/usr.sbin/rtadvd/rtadvd.h +++ b/usr.sbin/rtadvd/rtadvd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.h,v 1.22 2016/02/26 12:31:48 jca Exp $ */ +/* $OpenBSD: rtadvd.h,v 1.23 2016/02/26 12:34:30 jca Exp $ */ /* $KAME: rtadvd.h,v 1.20 2002/05/29 10:13:10 itojun Exp $ */ /* @@ -168,8 +168,5 @@ SLIST_HEAD(ralist, rainfo); void ra_timeout(void *); void ra_timer_update(void *, struct timeval *); -int prefix_match(struct in6_addr *, int, struct in6_addr *, int); struct rainfo *if_indextorainfo(int); struct prefix *find_prefix(struct rainfo *, struct in6_addr *, int); - -extern struct in6_addr in6a_site_allrouters; |