diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-11-10 18:15:48 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-11-10 18:15:48 +0000 |
| commit | 38a9424b2fc187e798fe3a91366490408b112921 (patch) | |
| tree | 6b236c80ebfe65b16c0ca85cb43cc64e835e8274 | |
| parent | bcb1bc6369b44ba6f4ed0b3e16785c7f7adf4bab (diff) | |
do not advertise dynamic/cloned routes
| -rw-r--r-- | usr.sbin/route6d/route6d.c | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index c906ccb95d6..cca61095054 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,5 +1,5 @@ -/* $OpenBSD: route6d.c,v 1.11 2000/10/10 13:06:29 itojun Exp $ */ -/* $KAME: route6d.c,v 1.37 2000/10/10 13:02:30 itojun Exp $ */ +/* $OpenBSD: route6d.c,v 1.12 2000/11/10 18:15:47 itojun Exp $ */ +/* $KAME: route6d.c,v 1.39 2000/11/07 16:39:34 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -31,7 +31,7 @@ */ #if 0 -static char _rcsid[] = "$OpenBSD: route6d.c,v 1.11 2000/10/10 13:06:29 itojun Exp $"; +static char _rcsid[] = "$OpenBSD: route6d.c,v 1.12 2000/11/10 18:15:47 itojun Exp $"; #endif #include <stdio.h> @@ -2135,10 +2135,22 @@ do { \ RTFLAG("m", RTF_MASK); #endif RTFLAG("C", RTF_CLONING); +#ifdef RTF_CLONED + RTFLAG("c", RTF_CLONED); +#endif +#ifdef RTF_PRCLONING + RTFLAG("c", RTF_PRCLONING); +#endif +#ifdef RTF_WASCLONED + RTFLAG("W", RTF_WASCLONED); +#endif RTFLAG("X", RTF_XRESOLVE); RTFLAG("L", RTF_LLINFO); RTFLAG("S", RTF_STATIC); RTFLAG("B", RTF_BLACKHOLE); +#ifdef RTF_PROTO3 + RTFLAG("3", RTF_PROTO3); +#endif RTFLAG("2", RTF_PROTO2); RTFLAG("1", RTF_PROTO1); #undef RTFLAG @@ -2250,6 +2262,21 @@ rt_entry(rtm, again) (RTF_CLONING|RTF_XRESOLVE|RTF_LLINFO|RTF_BLACKHOLE)) { return; /* not interested in the link route */ } + /* do not look at cloned routes */ +#ifdef RTF_WASCLONED + if (rtm->rtm_flags & RTF_WASCLONED) + return; +#endif +#ifdef RTF_CLONED + if (rtm->rtm_flags & RTF_CLONED) + return; +#endif + /* + * do not look at dynamic routes. + * netbsd/openbsd cloned routes have UGHD. + */ + if (rtm->rtm_flags & RTF_DYNAMIC) + return; rtmp = (char *)(rtm + 1); /* Destination */ if ((rtm->rtm_addrs & RTA_DST) == 0) |