diff options
| author | Denis Ovsienko <infrastation@yandex.ru> | 2011-07-14 12:36:19 +0400 |
|---|---|---|
| committer | Denis Ovsienko <infrastation@yandex.ru> | 2011-07-14 12:36:19 +0400 |
| commit | e81537d3be9f95d333d658329e5d69e6188b53c0 (patch) | |
| tree | 5f91b0f1d2a0dae1671c788c7d7804b16adcd4cd /bgpd/bgpd.h | |
| parent | 87f011e5297ab9d3c599916800aab1198613071e (diff) | |
bgpd: more SAFI fixes
Two macros resolving to the same integer constant broke a case block and
a more thorough merge of BGP_SAFI_VPNV4 and BGP_SAFI_VPNV6 was
performed.
* bgpd.h: MPLS-labeled VPN SAFI is AFI-independent, switch to single
* macro
* bgp_capability_test.c: update test data
* bgp_mp_attr_test.c: idem
* bgp_route.c: (bgp_maximum_prefix_overflow, bgp_table_stats_vty) update
macro and check conditions (where appropriate)
* bgp_packet.c: (bgp_route_refresh_send, bgp_capability_send,
bgp_update_receive, bgp_route_refresh_receive): idem
* bgp_open.c: (bgp_capability_vty_out, bgp_afi_safi_valid_indices,
bgp_open_capability_orf, bgp_open_capability): idem
* bgp_attr.c: (bgp_mp_reach_parse, bgp_packet_attribute,
bgp_packet_withdraw): idem
Diffstat (limited to 'bgpd/bgpd.h')
| -rw-r--r-- | bgpd/bgpd.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index 73a9ea12..759d2570 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -724,9 +724,8 @@ struct bgp_nlri #define BGP_DEFAULT_RESTART_TIME 120 #define BGP_DEFAULT_STALEPATH_TIME 360 -/* SAFI which used in open capability negotiation. */ -#define BGP_SAFI_VPNV4 128 -#define BGP_SAFI_VPNV6 128 +/* RFC4364 */ +#define SAFI_MPLS_LABELED_VPN 128 /* Max TTL value. */ #define TTL_MAX 255 |