diff options
| -rw-r--r-- | nest/config.Y | 2 | ||||
| -rw-r--r-- | nest/route.h | 16 | ||||
| -rw-r--r-- | nest/rt-attr.c | 2 | ||||
| -rw-r--r-- | proto/bgp/attrs.c | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/nest/config.Y b/nest/config.Y index a9090288..26df2902 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -24,7 +24,7 @@ CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILT CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES) CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT, - RIP, RIP_EXT, OSPF, OSPF_EXT, OSPF_IA, OSPF_BOUNDARY, BGP, PIPE) + RIP, OSPF, OSPF_EXT, OSPF_IA, OSPF_BOUNDARY, BGP, PIPE) %type <i32> idval %type <f> imexport diff --git a/nest/route.h b/nest/route.h index 31dfa5d4..cd9e9ff7 100644 --- a/nest/route.h +++ b/nest/route.h @@ -241,13 +241,12 @@ typedef struct rta { #define RTS_STATIC_DEVICE 4 /* Static device route */ #define RTS_REDIRECT 5 /* Learned via redirect */ #define RTS_RIP 6 /* RIP route */ -#define RTS_RIP_EXT 7 /* RIP external route */ -#define RTS_OSPF 8 /* OSPF route */ -#define RTS_OSPF_EXT 9 /* OSPF external route */ -#define RTS_OSPF_IA 10 /* OSPF inter-area route */ -#define RTS_OSPF_BOUNDARY 11 /* OSPF route to boundary router (???) */ -#define RTS_BGP 12 /* BGP route */ -#define RTS_PIPE 13 /* Inter-table wormhole */ +#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 RTC_UNICAST 0 #define RTC_BROADCAST 1 @@ -350,7 +349,6 @@ extern struct protocol *attr_class_to_protocol[EAP_MAX]; #define DEF_PREF_RIP 120 /* RIP */ #define DEF_PREF_BGP 100 /* BGP */ #define DEF_PREF_OSPF_EXTERNAL 80 /* OSPF external routes */ -#define DEF_PREF_RIP_EXTERNAL 70 /* RIP external routes */ -#define DEF_PREF_PIPE 60 /* Routes piped from other tables */ +#define DEF_PREF_PIPE 70 /* Routes piped from other tables */ #endif diff --git a/nest/rt-attr.c b/nest/rt-attr.c index 17721fb4..fd0da97e 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -510,7 +510,7 @@ void rta_dump(rta *a) { static char *rts[] = { "RTS_DUMMY", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE", - "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP", "RTS_RIP_EXT", + "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP", "RTS_OSPF", "RTS_OSPF_EXT", "RTS_OSPF_IA", "RTS_OSPF_BOUNDARY", "RTS_BGP" }; static char *rtc[] = { "", " BC", " MC", " AC" }; diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index ff434e56..ee9d597e 100644 --- a/proto/bgp/attrs.c +++ b/proto/bgp/attrs.c @@ -561,7 +561,7 @@ bgp_create_attrs(struct bgp_proto *p, rte *e, ea_list **attrs, struct linpool *p ea->count = 4; bgp_set_attr(ea->attrs, pool, BA_ORIGIN, - (rta->source == RTS_RIP_EXT || rta->source == RTS_OSPF_EXT) ? ORIGIN_INCOMPLETE : ORIGIN_IGP); + (rta->source == RTS_OSPF_EXT) ? ORIGIN_INCOMPLETE : ORIGIN_IGP); if (p->is_internal) bgp_set_attr(ea->attrs+1, pool, BA_AS_PATH, 0); |