diff options
| author | Ondrej Filip <feela@network.cz> | 2004-06-11 11:05:06 +0200 |
|---|---|---|
| committer | Ondrej Filip <feela@network.cz> | 2004-06-11 11:05:06 +0200 |
| commit | 8bf684eca2de6ffd9ba797cad485e36db0b9548f (patch) | |
| tree | d5445be010ec277d1ea54674d3ab4b9f5d696b4f /nest | |
| parent | 7df86c25fc6c871795265faebe02bf4dcecdd190 (diff) | |
| download | bird-8bf684eca2de6ffd9ba797cad485e36db0b9548f.tar bird-8bf684eca2de6ffd9ba797cad485e36db0b9548f.zip | |
RTS_OSPF_BONDARY is nonsense, RTS_OSPF_IA must have smaller id than RTS_OSPF_EXT
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/config.Y | 2 | ||||
| -rw-r--r-- | nest/route.h | 9 | ||||
| -rw-r--r-- | nest/rt-attr.c | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/nest/config.Y b/nest/config.Y index ae673ae..fa8b5e6 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -25,7 +25,7 @@ CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFA CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREIMPORT) CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT, - RIP, OSPF, OSPF_EXT, OSPF_IA, OSPF_BOUNDARY, BGP, PIPE) + RIP, OSPF, OSPF_EXT, OSPF_IA, BGP, PIPE) CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE) CF_ENUM(T_ENUM_RTC, RTC_, UNICAST, BROADCAST, MULTICAST, ANYCAST) CF_ENUM(T_ENUM_RTD, RTD_, ROUTER, DEVICE, BLACKHOLE, UNREACHABLE, PROHIBIT) diff --git a/nest/route.h b/nest/route.h index aa39a47..14ac9e7 100644 --- a/nest/route.h +++ b/nest/route.h @@ -252,11 +252,10 @@ typedef struct rta { #define RTS_REDIRECT 5 /* Learned via redirect */ #define RTS_RIP 6 /* RIP route */ #define RTS_OSPF 7 /* OSPF route */ -#define RTS_OSPF_EXT 8 /* OSPF external route */ -#define RTS_OSPF_IA 9 /* OSPF inter-area route */ -#define RTS_OSPF_BOUNDARY 10 /* OSPF route to boundary router */ -#define RTS_BGP 11 /* BGP route */ -#define RTS_PIPE 12 /* Inter-table wormhole */ +#define RTS_OSPF_IA 8 /* OSPF inter-area route */ +#define RTS_OSPF_EXT 9 /* OSPF external route */ +#define RTS_BGP 10 /* BGP route */ +#define RTS_PIPE 11 /* Inter-table wormhole */ #define RTC_UNICAST 0 #define RTC_BROADCAST 1 diff --git a/nest/rt-attr.c b/nest/rt-attr.c index 6e782f2..14a2480 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -705,8 +705,7 @@ rta_dump(rta *a) { static char *rts[] = { "RTS_DUMMY", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE", "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP", - "RTS_OSPF", "RTS_OSPF_EXT", "RTS_OSPF_IA", - "RTS_OSPF_BOUNDARY", "RTS_BGP" }; + "RTS_OSPF", "RTS_OSPF_EXT", "RTS_OSPF_IA", "RTS_BGP" }; static char *rtc[] = { "", " BC", " MC", " AC" }; static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" }; |