diff options
| author | paul <paul> | 2003-07-15 12:52:22 +0000 |
|---|---|---|
| committer | paul <paul> | 2003-07-15 12:52:22 +0000 |
| commit | 7021c425a9f5bd9f62b934124becbaadd961cac0 (patch) | |
| tree | cf386f6923eac9f1c665400d0557448c4f5a89e0 /zebra/rib.h | |
| parent | 8fc0f64b143ed2155567f5c9f0faad756252146a (diff) | |
2003-07-15 Paul Jakma <paul@dishone.st>
* lib/version.h: add ZEBRA_URL (unused for now)
* lib/vty.c: CMD_ERR_NOTHING_TODO when reading conf file should not
be fatal. slight reformating.
* ospfd/ospf_zebra.c: ignore reject/blackhole routes if zebra sends
these type of routes. probably should be a new type of route to
allow daemons to more easily choose whether to redistribute them
- rathen than just a flag (eg for reject/blackhole).
reorder the is_prefix_default test for ZEBRA_IPV4_ROUTE_DELETE to
avoid the inverted test - slightly more readable.
* redhat/zebra.spec.in: Add ospfapi port to services file, if
with_ospfapi.
* zebra/rib.h: Change nexthop types to an enum.
* zebra/rt_netlink.c: run it through indent -nut.
Add nexthop_types_desc[] descriptive array for nexthop types.
(netlink_route_multipath) debug statements indicate which branch
they are in and print out nexthop type.
* zebra/zebra_rib.c: slight reformatting.
* zebra/zebra_vty.c: Pass ZEBRA_FLAG_BLACKHOLE flag to
static_add_ipv4() if Null0 route is configured. print out Null0 if
STATIC_IPV4_BLACKHOLE route, and ignore flags (shouldnt be
possible to set flags from vty) for config and show route.
Diffstat (limited to 'zebra/rib.h')
| -rw-r--r-- | zebra/rib.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/zebra/rib.h b/zebra/rib.h index 5b0dcfe9..1141db11 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -123,22 +123,26 @@ struct static_ipv6 }; #endif /* HAVE_IPV6 */ +enum nexthop_types_t +{ + NEXTHOP_TYPE_IFINDEX = 1, /* Directly connected. */ + NEXTHOP_TYPE_IFNAME, /* Interface route. */ + NEXTHOP_TYPE_IPV4, /* IPv4 nexthop. */ + NEXTHOP_TYPE_IPV4_IFINDEX, /* IPv4 nexthop with ifindex. */ + NEXTHOP_TYPE_IPV4_IFNAME, /* IPv4 nexthop with ifname. */ + NEXTHOP_TYPE_IPV6, /* IPv6 nexthop. */ + NEXTHOP_TYPE_IPV6_IFINDEX, /* IPv6 nexthop with ifindex. */ + NEXTHOP_TYPE_IPV6_IFNAME, /* IPv6 nexthop with ifname. */ + NEXTHOP_TYPE_BLACKHOLE, /* Null0 nexthop. */ +}; + /* Nexthop structure. */ struct nexthop { struct nexthop *next; struct nexthop *prev; - u_char type; -#define NEXTHOP_TYPE_IFINDEX 1 /* Directly connected. */ -#define NEXTHOP_TYPE_IFNAME 2 /* Interface route. */ -#define NEXTHOP_TYPE_IPV4 3 /* IPv4 nexthop. */ -#define NEXTHOP_TYPE_IPV4_IFINDEX 4 /* IPv4 nexthop with ifindex. */ -#define NEXTHOP_TYPE_IPV4_IFNAME 5 /* IPv4 nexthop with ifname. */ -#define NEXTHOP_TYPE_IPV6 6 /* IPv6 nexthop. */ -#define NEXTHOP_TYPE_IPV6_IFINDEX 7 /* IPv6 nexthop with ifindex. */ -#define NEXTHOP_TYPE_IPV6_IFNAME 8 /* IPv6 nexthop with ifname. */ -#define NEXTHOP_TYPE_BLACKHOLE 9 /* Null0 nexthop. */ + enum nexthop_types_t type; u_char flags; #define NEXTHOP_FLAG_ACTIVE (1 << 0) /* This nexthop is alive. */ |