diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-05 06:05:39 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-05 06:05:39 +0100 |
| commit | be8c228fad013d8488623dc6db46e28d4dfb72c2 (patch) | |
| tree | 5fe0e8943cafeb3b663a0895e757f33b66c7851e /zebra/rib.h | |
| parent | e473267ee96f48514b879f5dcaba2db64f0de9d1 (diff) | |
| parent | 647e8e064d8e5316fc89587714a056b1240fa298 (diff) | |
| download | quagga-be8c228fad013d8488623dc6db46e28d4dfb72c2.tar.bz2 quagga-be8c228fad013d8488623dc6db46e28d4dfb72c2.tar.xz | |
Merge branch 'current' into dn42
Diffstat (limited to 'zebra/rib.h')
| -rw-r--r-- | zebra/rib.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/zebra/rib.h b/zebra/rib.h index 499d48b2..2abfed19 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -73,6 +73,15 @@ struct rib */ u_char flags; + /* flags internal to zebra, not sent to clients */ + unsigned zflags; + /* blackhole route zflags, for static routes: */ +#define RIB_ZF_REJECT 1 +#define RIB_ZF_PROHIBIT 2 +#define RIB_ZF_BLACKHOLE 3 + +#define RIB_ZF_BLACKHOLE_FLAGS(zflags) ((zflags) & RIB_ZF_BLACKHOLE) + /* RIB internal status */ u_char status; #define RIB_ENTRY_REMOVED (1 << 0) @@ -120,12 +129,8 @@ struct static_ipv4 char *ifname; } gate; - /* bit flags */ - u_char flags; -/* - see ZEBRA_FLAG_REJECT - ZEBRA_FLAG_BLACKHOLE - */ + /* zflags for rib */ + unsigned zflags; }; #ifdef HAVE_IPV6 @@ -144,17 +149,14 @@ struct static_ipv6 #define STATIC_IPV6_GATEWAY 1 #define STATIC_IPV6_GATEWAY_IFNAME 2 #define STATIC_IPV6_IFNAME 3 +#define STATIC_IPV6_BLACKHOLE 4 /* Nexthop value. */ struct in6_addr ipv6; char *ifname; - /* bit flags */ - u_char flags; -/* - see ZEBRA_FLAG_REJECT - ZEBRA_FLAG_BLACKHOLE - */ + /* zflags for rib */ + unsigned zflags; }; #endif /* HAVE_IPV6 */ @@ -270,7 +272,7 @@ extern void rib_init (void); extern int static_add_ipv4 (struct prefix *p, struct in_addr *gate, const char *ifname, - u_char flags, u_char distance, u_int32_t vrf_id); + unsigned zflags, u_char distance, u_int32_t vrf_id); extern int static_delete_ipv4 (struct prefix *p, struct in_addr *gate, const char *ifname, @@ -294,7 +296,7 @@ extern struct route_table *rib_table_ipv6; extern int static_add_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate, - const char *ifname, u_char flags, u_char distance, + const char *ifname, unsigned zflags, u_char distance, u_int32_t vrf_id); extern int |