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

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 487ebddbbec1ab0b5106124c14f2889503ed746b..813e59ef8c83090f5dd71eb7fb4ee4fa7a217336 100644 (file)
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -355,7 +355,7 @@ bgp_graceful_restart_timer_expire (struct thread *thread)
 
   /* NSF delete stale route */
   for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
-    for (safi = SAFI_UNICAST ; safi < SAFI_UNICAST_MULTICAST ; safi++)
+    for (safi = SAFI_UNICAST ; safi < SAFI_RESERVED_3 ; safi++)
       if (peer->nsf[afi][safi])
        bgp_clear_stale_route (peer, afi, safi);
 
@@ -388,7 +388,7 @@ bgp_graceful_stale_timer_expire (struct thread *thread)
 
   /* NSF delete stale route */
   for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
-    for (safi = SAFI_UNICAST ; safi < SAFI_UNICAST_MULTICAST ; safi++)
+    for (safi = SAFI_UNICAST ; safi < SAFI_RESERVED_3 ; safi++)
       if (peer->nsf[afi][safi])
        bgp_clear_stale_route (peer, afi, safi);
 
@@ -481,7 +481,7 @@ bgp_stop (struct peer *peer)
          UNSET_FLAG (peer->sflags, PEER_STATUS_NSF_MODE);
 
          for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
-           for (safi = SAFI_UNICAST ; safi < SAFI_UNICAST_MULTICAST ; safi++)
+           for (safi = SAFI_UNICAST ; safi < SAFI_RESERVED_3 ; safi++)
              peer->nsf[afi][safi] = 0;
        }
 
@@ -799,7 +799,7 @@ bgp_establish (struct peer *peer)
   /* graceful restart */
   UNSET_FLAG (peer->sflags, PEER_STATUS_NSF_WAIT);
   for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
-    for (safi = SAFI_UNICAST ; safi < SAFI_UNICAST_MULTICAST ; safi++)
+    for (safi = SAFI_UNICAST ; safi < SAFI_RESERVED_3 ; safi++)
       {
        if (peer->afc_nego[afi][safi]
            && CHECK_FLAG (peer->cap, PEER_CAP_RESTART_ADV)

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 21c7e36751a36fc17c62f6017c55f0e6d28a48b7..31b7369d698cbe4cd714c18ad3d7ca57a1e49b37 100644 (file)
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -93,9 +93,6 @@ bgp_capability_vty_out (struct vty *vty, struct peer *peer)
            case SAFI_MULTICAST:
              vty_out (vty, "SAFI Multicast");
              break;
-           case SAFI_UNICAST_MULTICAST:
-             vty_out (vty, "SAFI Unicast Multicast");
-             break;
            case SAFI_MPLS_LABELED_VPN:
              vty_out (vty, "SAFI MPLS-labeled VPN");
              break;

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index ee0cc5da65ecb91b057a4d9f5a93d15c45688f6e..e8038553ababffbe894b32ad1bec00c21e804f58 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1147,7 +1147,7 @@ peer_nsf_stop (struct peer *peer)
   UNSET_FLAG (peer->sflags, PEER_STATUS_NSF_MODE);
 
   for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
-    for (safi = SAFI_UNICAST ; safi < SAFI_UNICAST_MULTICAST ; safi++)
+    for (safi = SAFI_UNICAST ; safi < SAFI_RESERVED_3 ; safi++)
       peer->nsf[afi][safi] = 0;
 
   if (peer->t_gr_restart)

diff --git a/lib/zebra.h b/lib/zebra.h
index 4afb20eb090967f1fc85ac867d67a6c6efeacbaf..c4c69d3d83b33ac8a1304ac957de596a837bc9a7 100644 (file)
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -500,7 +500,7 @@ extern const char *zserv_command_string (unsigned int command);
 /* 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