commit 0a28130d35bbba47faf47bf9451ba0eb195fcbb7
author Denis Ovsienko <infrastation@yandex.ru> Sun Jul 17 19:33:21 2011 +0400
committer Denis Ovsienko <infrastation@yandex.ru> Thu Sep 29 22:19:08 2011 +0400
tree 94bcda95ba12a50a81aa7ea893d809ba237b2262
parent 42e6d745d105018a9469dabad65bd4cf942dcf3c

bgpd: rename SAFI 3 according to RFC4760

- SAFI value 3 is reserved.  It was assigned by RFC 2858 for a use
  that was never fully implemented, so it is deprecated by this
  document.

* zebra.h: rename macro
* bgp_fsm.c: (bgp_graceful_restart_timer_expire,
  bgp_graceful_stale_timer_expire, bgp_stop, bgp_establish): update
* bgpd.c: (peer_nsf_stop): update
* bgp_open.c: (bgp_capability_vty_out): SAFI 3 isn't a recognized case
  any more

lib/zebra.h

diff --git a/lib/zebra.h b/lib/zebra.h
index 4afb20e..c4c69d3 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -500,7 +500,7 @@
 /* Subsequent Address Family Identifier. */
 #define SAFI_UNICAST              1
 #define SAFI_MULTICAST            2
-#define SAFI_UNICAST_MULTICAST    3
+#define SAFI_RESERVED_3           3
 #define SAFI_MPLS_VPN             4
 #define SAFI_MAX                  5