diff options
author | Ondrej Filip <feela@network.cz> | 2004-06-25 18:39:53 +0200 |
---|---|---|
committer | Ondrej Filip <feela@network.cz> | 2004-06-25 18:39:53 +0200 |
commit | 98ac61766d81d9f20c4a7c7e12859c3b82b24f4c (patch) | |
tree | 214b6571623582884aede8f634b146b330e72bc3 /nest | |
parent | 5ed68e46d781f8a14d3ef3ffd7fe3afc4a62260e (diff) | |
download | bird-98ac61766d81d9f20c4a7c7e12859c3b82b24f4c.tar bird-98ac61766d81d9f20c4a7c7e12859c3b82b24f4c.zip |
A lot of changes:
- metric is 3 byte long now
- summary lsa originating
- more OSPF areas possible
- virtual links
- better E1/E2 routes handling
- some bug fixes..
I have to do:
- md5 auth (last mandatory item from rfc2328)
- !!!!DEBUG!!!!! (mainly virtual link system has probably a lot of bugs)
- 2328 appendig E
Diffstat (limited to 'nest')
-rw-r--r-- | nest/config.Y | 2 | ||||
-rw-r--r-- | nest/route.h | 7 | ||||
-rw-r--r-- | nest/rt-attr.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/nest/config.Y b/nest/config.Y index fa8b5e6..4f9b46b 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, BGP, PIPE) + RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, 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 14ac9e7..0de0e0f 100644 --- a/nest/route.h +++ b/nest/route.h @@ -253,9 +253,10 @@ typedef struct rta { #define RTS_RIP 6 /* RIP route */ #define RTS_OSPF 7 /* OSPF route */ #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 RTS_OSPF_EXT1 9 /* OSPF external route type 1 */ +#define RTS_OSPF_EXT2 10 /* OSPF external route type 2 */ +#define RTS_BGP 11 /* BGP route */ +#define RTS_PIPE 12 /* Inter-table wormhole */ #define RTC_UNICAST 0 #define RTC_BROADCAST 1 diff --git a/nest/rt-attr.c b/nest/rt-attr.c index 14a2480..cbece88 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -705,7 +705,8 @@ 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_BGP" }; + "RTS_OSPF", "RTS_OSPF_IA", "RTS_OSPF_EXT1", + "RTS_OSPF_EXT2", "RTS_BGP" }; static char *rtc[] = { "", " BC", " MC", " AC" }; static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" }; |