[cmaster-next] [PATCH 2/3] bgpd: "neighbor swpX interface remote-as XYZ" is ignored

Donald Sharp sharpd at cumulusnetworks.com
Wed Dec 14 16:04:00 EST 2016


From: Daniel Walton <dwalton at cumulusnetworks.com>

Signed-off-by: Daniel Walton <dwalton at cumulusnetworks.com>
Reviewed-by:   Don Slice <dslice at cumulusnetworks.com>

Ticket: CM-13979
(cherry picked from commit 7d308ec5b45bf66d241535b23c6413e9cb2c9435)
---
 bgpd/bgp_vty.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 5dafac1..7def8eb 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -2867,7 +2867,12 @@ peer_conf_interface_get (struct vty *vty, const char *conf_if, afi_t afi,
     }
 
   peer = peer_lookup_by_conf_if (bgp, conf_if);
-  if (!peer)
+  if (peer)
+    {
+      if (as_str)
+        ret = peer_remote_as (bgp, &su, NULL, &as, as_type, afi, safi);
+    }
+  else
     {
       if (bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4)
           && afi == AFI_IP && safi == SAFI_UNICAST)
@@ -2891,8 +2896,9 @@ peer_conf_interface_get (struct vty *vty, const char *conf_if, afi_t afi,
         }
       peer_flag_set (peer, PEER_FLAG_CAPABILITY_ENHE);
     }
-  else if ((v6only && !CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)) ||
-           (!v6only && CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)))
+
+  if ((v6only && !CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)) ||
+      (!v6only && CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)))
     {
       if (v6only)
         SET_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY);
-- 
2.5.5





More information about the dev mailing list