From: Vipin Kumar <[email protected]>
Signed-off-by: Vipin Kumar <[email protected]>
Reviewed-by: Pradosh Mohapatra <[email protected]>
Dinesh Dutt <[email protected]>
Signed-off-by: Donald Sharp <[email protected]>
---
bgpd/bgp_fsm.c | 6 +
bgpd/bgp_network.c | 23 ++-
bgpd/bgp_route.c | 322 +++++++++++++++++++++--------------
bgpd/bgp_vty.c | 388
++++++++++++++++++++++++++++++-------------
bgpd/bgp_zebra.c | 119 ++++++++++++-
bgpd/bgpd.c | 146 +++++++++++++---
bgpd/bgpd.h | 22 ++-
lib/command.h | 3 +-
lib/if.c | 61 +++++++
lib/if.h | 16 ++
lib/log.c | 2 +
lib/memtypes.c | 2 +
lib/zclient.c | 83 +++++++++
lib/zclient.h | 3 +
lib/zebra.h | 4 +-
tests/aspath_test.c | 1 +
tests/bgp_capability_test.c | 1 +
tests/bgp_mp_attr_test.c | 1 +
tests/ecommunity_test.c | 1 +
zebra/interface.c | 20 +++
zebra/rtadv.c | 79 ++++++++-
zebra/zserv.c | 145 ++++++++++++++++
zebra/zserv.h | 3 +
23 files changed, 1164 insertions(+), 287 deletions(-)
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 4b52495..84f7dc3 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -986,6 +986,10 @@ bgp_stop (struct peer *peer)
peer_delete(peer);
ret = -1;
}
+ else
+ {
+ bgp_peer_conf_if_to_su_update(peer);
+ }
return ret;
}
@@ -1072,6 +1076,8 @@ bgp_start (struct peer *peer)
{
int status;
+ bgp_peer_conf_if_to_su_update(peer);
+
if (BGP_PEER_START_SUPPRESSED (peer))
{
if (BGP_DEBUG (fsm, FSM))
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index 12c87d5..efe1467 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -274,7 +274,7 @@ bgp_accept (struct thread *thread)
bgp_set_socket_ttl (peer1, bgp_sock);
- peer = peer_create (&su, peer1->bgp, peer1->local_as,
+ peer = peer_create (&su, peer1->conf_if, peer1->bgp,
peer1->local_as,
peer1->as, 0, 0);
peer_xfer_config(peer, peer1);
@@ -317,11 +317,14 @@ bgp_bind (struct peer *peer)
int ret;
struct ifreq ifreq;
int myerrno;
+ char *name;
- if (! peer->ifname)
+ if (! peer->ifname && !peer->conf_if)
return 0;
- strncpy ((char *)&ifreq.ifr_name, peer->ifname, sizeof
(ifreq.ifr_name));
+ name = (peer->conf_if ? peer->conf_if : peer->ifname);
+
+ strncpy ((char *)&ifreq.ifr_name, name, sizeof (ifreq.ifr_name));
if ( bgpd_privs.change (ZPRIVS_RAISE) )
zlog_err ("bgp_bind: could not raise privs");
@@ -336,7 +339,8 @@ bgp_bind (struct peer *peer)
if (ret < 0)
{
zlog (peer->log, LOG_INFO, "bind to interface %s failed,
errno=%d",
- peer->ifname, myerrno);
+ name, myerrno);
+
return ret;
}
#endif /* SO_BINDTODEVICE */
@@ -406,6 +410,11 @@ bgp_connect (struct peer *peer)
{
unsigned int ifindex = 0;
+ if (peer->conf_if && BGP_PEER_SU_UNSPEC(peer))
+ {
+ zlog_debug("Peer address not learnt: Returning from connect");
+ return 0;
+ }
/* Make socket for the peer. */
peer->fd = sockunion_socket (&peer->su);
if (peer->fd < 0)
@@ -443,10 +452,8 @@ bgp_connect (struct peer *peer)
/* Update source bind. */
bgp_update_source (peer);
-#ifdef HAVE_IPV6
- if (peer->ifname)
- ifindex = ifname2ifindex (peer->ifname);
-#endif /* HAVE_IPV6 */
+ if (peer->conf_if || peer->ifname)
+ ifindex = if_nametoindex (peer->conf_if ? peer->conf_if :
peer->ifname);
if (BGP_DEBUG (events, EVENTS))
plog_debug (peer->log, "%s [Event] Connect start to %s fd %d",
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 5cc9809..92f2450 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1467,7 +1467,6 @@ bgp_best_selection (struct bgp *bgp, struct
bgp_node *rn,
if (do_mpath && paths_eq)
bgp_mp_list_add (&mp_list, ri);
}
-
if (!bgp_flag_check (bgp, BGP_FLAG_DETERMINISTIC_MED))
bgp_info_mpath_update (rn, new_select, old_select, &mp_list,
mpath_cfg);
@@ -9464,8 +9463,13 @@ peer_lookup_in_view (struct vty *vty, const
char *view_name,
ret = str2sockunion (ip_str, &su);
if (ret < 0)
{
- vty_out (vty, "Malformed address: %s%s", ip_str, VTY_NEWLINE);
- return NULL;
+ peer = peer_lookup_by_conf_if (bgp, ip_str);
+ if (!peer)
+ {
+ vty_out (vty, "%% Malformed address or name: %s%s", ip_str,
VTY_NEWLINE);
+ return NULL;
+ }
+ return peer;
}
/* Peer structure lookup. */
@@ -9974,13 +9978,14 @@ bgp_peer_counts (struct vty *vty, struct peer
*peer, afi_t afi, safi_t safi)
DEFUN (show_ip_bgp_neighbor_prefix_counts,
show_ip_bgp_neighbor_prefix_counts_cmd,
- "show ip bgp neighbors (A.B.C.D|X:X::X:X) prefix-counts",
+ "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) prefix-counts",
SHOW_STR
IP_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display detailed prefix count information\n")
{
struct peer *peer;
@@ -9994,13 +9999,14 @@ DEFUN (show_ip_bgp_neighbor_prefix_counts,
DEFUN (show_bgp_ipv6_neighbor_prefix_counts,
show_bgp_ipv6_neighbor_prefix_counts_cmd,
- "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) prefix-counts",
+ "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
prefix-counts",
SHOW_STR
BGP_STR
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display detailed prefix count information\n")
{
struct peer *peer;
@@ -10014,7 +10020,7 @@ DEFUN (show_bgp_ipv6_neighbor_prefix_counts,
DEFUN (show_ip_bgp_ipv4_neighbor_prefix_counts,
show_ip_bgp_ipv4_neighbor_prefix_counts_cmd,
- "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X) prefix-counts",
+ "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X|WORD) prefix-counts",
SHOW_STR
IP_STR
BGP_STR
@@ -10024,6 +10030,7 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_prefix_counts,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display detailed prefix count information\n")
{
struct peer *peer;
@@ -10040,7 +10047,7 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_prefix_counts,
DEFUN (show_ip_bgp_vpnv4_neighbor_prefix_counts,
show_ip_bgp_vpnv4_neighbor_prefix_counts_cmd,
- "show ip bgp vpnv4 all neighbors (A.B.C.D|X:X::X:X)
prefix-counts",
+ "show ip bgp vpnv4 all neighbors (A.B.C.D|X:X::X:X|WORD)
prefix-counts",
SHOW_STR
IP_STR
BGP_STR
@@ -10050,6 +10057,7 @@ DEFUN
(show_ip_bgp_vpnv4_neighbor_prefix_counts,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display detailed prefix count information\n")
{
struct peer *peer;
@@ -10174,7 +10182,7 @@ peer_adj_routes (struct vty *vty, struct peer
*peer, afi_t afi, safi_t safi, int
DEFUN (show_ip_bgp_view_neighbor_advertised_route,
show_ip_bgp_view_neighbor_advertised_route_cmd,
- "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X)
advertised-routes",
+ "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD)
advertised-routes",
SHOW_STR
IP_STR
BGP_STR
@@ -10200,18 +10208,20 @@ DEFUN
(show_ip_bgp_view_neighbor_advertised_route,
ALIAS (show_ip_bgp_view_neighbor_advertised_route,
show_ip_bgp_neighbor_advertised_route_cmd,
- "show ip bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes",
+ "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD)
advertised-routes",
SHOW_STR
IP_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the routes advertised to a BGP neighbor\n")
+
DEFUN (show_ip_bgp_ipv4_neighbor_advertised_route,
show_ip_bgp_ipv4_neighbor_advertised_route_cmd,
- "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X) advertised-routes",
+ "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X|WORD) advertised-routes",
SHOW_STR
IP_STR
BGP_STR
@@ -10221,6 +10231,7 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_advertised_route,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the routes advertised to a BGP neighbor\n")
{
struct peer *peer;
@@ -10238,7 +10249,7 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_advertised_route,
#ifdef HAVE_IPV6
DEFUN (show_bgp_view_neighbor_advertised_route,
show_bgp_view_neighbor_advertised_route_cmd,
- "show bgp view WORD neighbors (A.B.C.D|X:X::X:X)
advertised-routes",
+ "show bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD)
advertised-routes",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -10246,6 +10257,7 @@ DEFUN
(show_bgp_view_neighbor_advertised_route,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the routes advertised to a BGP neighbor\n")
{
struct peer *peer;
@@ -10263,7 +10275,7 @@ DEFUN
(show_bgp_view_neighbor_advertised_route,
ALIAS (show_bgp_view_neighbor_advertised_route,
show_bgp_view_ipv6_neighbor_advertised_route_cmd,
- "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X)
advertised-routes",
+ "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
advertised-routes",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -10272,11 +10284,12 @@ ALIAS
(show_bgp_view_neighbor_advertised_route,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the routes advertised to a BGP neighbor\n")
DEFUN (show_bgp_view_neighbor_received_routes,
show_bgp_view_neighbor_received_routes_cmd,
- "show bgp view WORD neighbors (A.B.C.D|X:X::X:X)
received-routes",
+ "show bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD)
received-routes",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -10284,6 +10297,7 @@ DEFUN (show_bgp_view_neighbor_received_routes,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
{
struct peer *peer;
@@ -10301,7 +10315,7 @@ DEFUN (show_bgp_view_neighbor_received_routes,
ALIAS (show_bgp_view_neighbor_received_routes,
show_bgp_view_ipv6_neighbor_received_routes_cmd,
- "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X)
received-routes",
+ "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
received-routes",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -10310,51 +10324,57 @@ ALIAS
(show_bgp_view_neighbor_received_routes,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
ALIAS (show_bgp_view_neighbor_advertised_route,
show_bgp_neighbor_advertised_route_cmd,
- "show bgp neighbors (A.B.C.D|X:X::X:X) advertised-routes",
+ "show bgp neighbors (A.B.C.D|X:X::X:X|WORD)
advertised-routes",
SHOW_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the routes advertised to a BGP neighbor\n")
ALIAS (show_bgp_view_neighbor_advertised_route,
show_bgp_ipv6_neighbor_advertised_route_cmd,
- "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X)
advertised-routes",
+ "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
advertised-routes",
SHOW_STR
BGP_STR
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the routes advertised to a BGP neighbor\n")
/* old command */
ALIAS (show_bgp_view_neighbor_advertised_route,
ipv6_bgp_neighbor_advertised_route_cmd,
- "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X)
advertised-routes",
+ "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD)
advertised-routes",
SHOW_STR
IPV6_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the routes advertised to a BGP neighbor\n")
/* old command */
DEFUN (ipv6_mbgp_neighbor_advertised_route,
ipv6_mbgp_neighbor_advertised_route_cmd,
- "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X)
advertised-routes",
+ "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD)
advertised-routes",
SHOW_STR
IPV6_STR
MBGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
+ "Neighbor on bgp configured interface\n"
"Display the routes advertised to a BGP neighbor\n")
{
struct peer *peer;
@@ -10369,7 +10389,7 @@ DEFUN (ipv6_mbgp_neighbor_advertised_route,
DEFUN (show_ip_bgp_view_neighbor_received_routes,
show_ip_bgp_view_neighbor_received_routes_cmd,
- "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X)
received-routes",
+ "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD)
received-routes",
SHOW_STR
IP_STR
BGP_STR
@@ -10378,6 +10398,7 @@ DEFUN
(show_ip_bgp_view_neighbor_received_routes,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
{
struct peer *peer;
@@ -10395,18 +10416,19 @@ DEFUN
(show_ip_bgp_view_neighbor_received_routes,
ALIAS (show_ip_bgp_view_neighbor_received_routes,
show_ip_bgp_neighbor_received_routes_cmd,
- "show ip bgp neighbors (A.B.C.D|X:X::X:X) received-routes",
+ "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD)
received-routes",
SHOW_STR
IP_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
DEFUN (show_ip_bgp_ipv4_neighbor_received_routes,
show_ip_bgp_ipv4_neighbor_received_routes_cmd,
- "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X) received-routes",
+ "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X|WORD) received-routes",
SHOW_STR
IP_STR
BGP_STR
@@ -10416,6 +10438,7 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_received_routes,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
{
struct peer *peer;
@@ -10432,7 +10455,7 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_received_routes,
DEFUN (show_bgp_view_afi_safi_neighbor_adv_recd_routes,
show_bgp_view_afi_safi_neighbor_adv_recd_routes_cmd,
- "show bgp view WORD (ipv4|ipv6) (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X) (advertised-routes|received-routes)",
+ "show bgp view WORD (ipv4|ipv6) (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X|WORD) (advertised-routes|received-routes)",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -10444,6 +10467,7 @@ DEFUN
(show_bgp_view_afi_safi_neighbor_adv_recd_routes,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the advertised routes to neighbor\n"
"Display the received routes from neighbor\n")
{
@@ -10466,13 +10490,14 @@ DEFUN
(show_bgp_view_afi_safi_neighbor_adv_recd_routes,
DEFUN (show_ip_bgp_neighbor_received_prefix_filter,
show_ip_bgp_neighbor_received_prefix_filter_cmd,
- "show ip bgp neighbors (A.B.C.D|X:X::X:X) received
prefix-filter",
+ "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) received
prefix-filter",
SHOW_STR
IP_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display information received from a BGP neighbor\n"
"Display the prefixlist filter\n")
{
@@ -10484,13 +10509,19 @@ DEFUN
(show_ip_bgp_neighbor_received_prefix_filter,
ret = str2sockunion (argv[0], &su);
if (ret < 0)
{
- vty_out (vty, "Malformed address: %s%s", argv[0], VTY_NEWLINE);
- return CMD_WARNING;
+ peer = peer_lookup_by_conf_if (NULL, argv[0]);
+ if (!peer)
+ {
+ vty_out (vty, "Malformed address or name: %s%s", argv[0],
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
+ else
+ {
+ peer = peer_lookup (NULL, &su);
+ if (! peer)
+ return CMD_WARNING;
}
-
- peer = peer_lookup (NULL, &su);
- if (! peer)
- return CMD_WARNING;
sprintf (name, "%s.%d.%d", peer->host, AFI_IP, SAFI_UNICAST);
count = prefix_bgp_show_prefix_list (NULL, AFI_IP, name);
@@ -10505,7 +10536,7 @@ DEFUN
(show_ip_bgp_neighbor_received_prefix_filter,
DEFUN (show_ip_bgp_ipv4_neighbor_received_prefix_filter,
show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd,
- "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X) received prefix-filter",
+ "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X|WORD) received prefix-filter",
SHOW_STR
IP_STR
BGP_STR
@@ -10515,6 +10546,7 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_received_prefix_filter,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display information received from a BGP neighbor\n"
"Display the prefixlist filter\n")
{
@@ -10526,13 +10558,19 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_received_prefix_filter,
ret = str2sockunion (argv[1], &su);
if (ret < 0)
{
- vty_out (vty, "Malformed address: %s%s", argv[1], VTY_NEWLINE);
- return CMD_WARNING;
+ peer = peer_lookup_by_conf_if (NULL, argv[1]);
+ if (!peer)
+ {
+ vty_out (vty, "Malformed address or name: %s%s", argv[1],
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
+ else
+ {
+ peer = peer_lookup (NULL, &su);
+ if (! peer)
+ return CMD_WARNING;
}
-
- peer = peer_lookup (NULL, &su);
- if (! peer)
- return CMD_WARNING;
if (strncmp (argv[0], "m", 1) == 0)
{
@@ -10562,33 +10600,36 @@ DEFUN
(show_ip_bgp_ipv4_neighbor_received_prefix_filter,
#ifdef HAVE_IPV6
ALIAS (show_bgp_view_neighbor_received_routes,
show_bgp_neighbor_received_routes_cmd,
- "show bgp neighbors (A.B.C.D|X:X::X:X) received-routes",
+ "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received-routes",
SHOW_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
ALIAS (show_bgp_view_neighbor_received_routes,
show_bgp_ipv6_neighbor_received_routes_cmd,
- "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) received-routes",
+ "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
received-routes",
SHOW_STR
BGP_STR
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
DEFUN (show_bgp_neighbor_received_prefix_filter,
show_bgp_neighbor_received_prefix_filter_cmd,
- "show bgp neighbors (A.B.C.D|X:X::X:X) received
prefix-filter",
+ "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) received
prefix-filter",
SHOW_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display information received from a BGP neighbor\n"
"Display the prefixlist filter\n")
{
@@ -10600,13 +10641,19 @@ DEFUN
(show_bgp_neighbor_received_prefix_filter,
ret = str2sockunion (argv[0], &su);
if (ret < 0)
{
- vty_out (vty, "Malformed address: %s%s", argv[0], VTY_NEWLINE);
- return CMD_WARNING;
+ peer = peer_lookup_by_conf_if (NULL, argv[0]);
+ if (!peer)
+ {
+ vty_out (vty, "Malformed address or name: %s%s", argv[0],
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
+ else
+ {
+ peer = peer_lookup (NULL, &su);
+ if (! peer)
+ return CMD_WARNING;
}
-
- peer = peer_lookup (NULL, &su);
- if (! peer)
- return CMD_WARNING;
sprintf (name, "%s.%d.%d", peer->host, AFI_IP6, SAFI_UNICAST);
count = prefix_bgp_show_prefix_list (NULL, AFI_IP6, name);
@@ -10621,38 +10668,41 @@ DEFUN
(show_bgp_neighbor_received_prefix_filter,
ALIAS (show_bgp_neighbor_received_prefix_filter,
show_bgp_ipv6_neighbor_received_prefix_filter_cmd,
- "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) received
prefix-filter",
+ "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) received
prefix-filter",
SHOW_STR
BGP_STR
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display information received from a BGP neighbor\n"
"Display the prefixlist filter\n")
/* old command */
ALIAS (show_bgp_view_neighbor_received_routes,
ipv6_bgp_neighbor_received_routes_cmd,
- "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X) received-routes",
+ "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD)
received-routes",
SHOW_STR
IPV6_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
/* old command */
DEFUN (ipv6_mbgp_neighbor_received_routes,
ipv6_mbgp_neighbor_received_routes_cmd,
- "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X) received-routes",
+ "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD)
received-routes",
SHOW_STR
IPV6_STR
MBGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the received routes from neighbor\n")
{
struct peer *peer;
@@ -10666,7 +10716,7 @@ DEFUN (ipv6_mbgp_neighbor_received_routes,
DEFUN (show_bgp_view_neighbor_received_prefix_filter,
show_bgp_view_neighbor_received_prefix_filter_cmd,
- "show bgp view WORD neighbors (A.B.C.D|X:X::X:X) received
prefix-filter",
+ "show bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD) received
prefix-filter",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -10674,6 +10724,7 @@ DEFUN
(show_bgp_view_neighbor_received_prefix_filter,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display information received from a BGP neighbor\n"
"Display the prefixlist filter\n")
{
@@ -10694,13 +10745,19 @@ DEFUN
(show_bgp_view_neighbor_received_prefix_filter,
ret = str2sockunion (argv[1], &su);
if (ret < 0)
{
- vty_out (vty, "Malformed address: %s%s", argv[1], VTY_NEWLINE);
- return CMD_WARNING;
+ peer = peer_lookup_by_conf_if (bgp, argv[1]);
+ if (!peer)
+ {
+ vty_out (vty, "%% Malformed address or name: %s%s",
argv[1], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
+ else
+ {
+ peer = peer_lookup (bgp, &su);
+ if (! peer)
+ return CMD_WARNING;
}
-
- peer = peer_lookup (bgp, &su);
- if (! peer)
- return CMD_WARNING;
sprintf (name, "%s.%d.%d", peer->host, AFI_IP6, SAFI_UNICAST);
count = prefix_bgp_show_prefix_list (NULL, AFI_IP6, name);
@@ -10715,7 +10772,7 @@ DEFUN
(show_bgp_view_neighbor_received_prefix_filter,
ALIAS (show_bgp_view_neighbor_received_prefix_filter,
show_bgp_view_ipv6_neighbor_received_prefix_filter_cmd,
- "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X) received
prefix-filter",
+ "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
received prefix-filter",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -10724,6 +10781,7 @@ ALIAS
(show_bgp_view_neighbor_received_prefix_filter,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display information received from a BGP neighbor\n"
"Display the prefixlist filter\n")
#endif /* HAVE_IPV6 */
@@ -10743,13 +10801,14 @@ bgp_show_neighbor_route (struct vty *vty,
struct peer *peer, afi_t afi,
DEFUN (show_ip_bgp_neighbor_routes,
show_ip_bgp_neighbor_routes_cmd,
- "show ip bgp neighbors (A.B.C.D|X:X::X:X) routes",
+ "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes",
SHOW_STR
IP_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display routes learned from neighbor\n")
{
struct peer *peer;
@@ -10762,15 +10821,17 @@ DEFUN (show_ip_bgp_neighbor_routes,
bgp_show_type_neighbor);
}
+
DEFUN (show_ip_bgp_neighbor_flap,
show_ip_bgp_neighbor_flap_cmd,
- "show ip bgp neighbors (A.B.C.D|X:X::X:X) flap-statistics",
+ "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD)
flap-statistics",
SHOW_STR
IP_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display flap statistics of the routes learned from neighbor\n")
{
struct peer *peer;
@@ -10785,13 +10846,14 @@ DEFUN (show_ip_bgp_neighbor_flap,
DEFUN (show_ip_bgp_neighbor_damp,
show_ip_bgp_neighbor_damp_cmd,
- "show ip bgp neighbors (A.B.C.D|X:X::X:X) dampened-routes",
+ "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD)
dampened-routes",
SHOW_STR
IP_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the dampened routes received from neighbor\n")
{
struct peer *peer;
@@ -10806,7 +10868,7 @@ DEFUN (show_ip_bgp_neighbor_damp,
DEFUN (show_ip_bgp_ipv4_neighbor_routes,
show_ip_bgp_ipv4_neighbor_routes_cmd,
- "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X) routes",
+ "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X|WORD) routes",
SHOW_STR
IP_STR
BGP_STR
@@ -10816,6 +10878,7 @@ DEFUN (show_ip_bgp_ipv4_neighbor_routes,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display routes learned from neighbor\n")
{
struct peer *peer;
@@ -10834,14 +10897,14 @@ DEFUN (show_ip_bgp_ipv4_neighbor_routes,
DEFUN (show_ip_bgp_view_rsclient,
show_ip_bgp_view_rsclient_cmd,
- "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X)",
+ "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
IP_STR
BGP_STR
"BGP view\n"
"View name\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR)
+ NEIGHBOR_ADDR_STR3)
{
struct bgp_table *table;
struct peer *peer;
@@ -10876,16 +10939,16 @@ DEFUN (show_ip_bgp_view_rsclient,
ALIAS (show_ip_bgp_view_rsclient,
show_ip_bgp_rsclient_cmd,
- "show ip bgp rsclient (A.B.C.D|X:X::X:X)",
+ "show ip bgp rsclient (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
IP_STR
BGP_STR
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR)
+ NEIGHBOR_ADDR_STR3)
DEFUN (show_bgp_view_ipv4_safi_rsclient,
show_bgp_view_ipv4_safi_rsclient_cmd,
- "show bgp view WORD ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X)",
+ "show bgp view WORD ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -10894,7 +10957,7 @@ DEFUN (show_bgp_view_ipv4_safi_rsclient,
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR)
+ NEIGHBOR_ADDR_STR3)
{
struct bgp_table *table;
struct peer *peer;
@@ -10933,25 +10996,25 @@ DEFUN (show_bgp_view_ipv4_safi_rsclient,
ALIAS (show_bgp_view_ipv4_safi_rsclient,
show_bgp_ipv4_safi_rsclient_cmd,
- "show bgp ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X)",
+ "show bgp ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"Address family\n"
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR)
+ NEIGHBOR_ADDR_STR3)
DEFUN (show_ip_bgp_view_rsclient_route,
show_ip_bgp_view_rsclient_route_cmd,
- "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X) A.B.C.D",
+ "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X|WORD)
A.B.C.D",
SHOW_STR
IP_STR
BGP_STR
"BGP view\n"
"View name\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"Network in the BGP routing table to display\n")
{
struct bgp *bgp;
@@ -11007,17 +11070,17 @@ DEFUN (show_ip_bgp_view_rsclient_route,
ALIAS (show_ip_bgp_view_rsclient_route,
show_ip_bgp_rsclient_route_cmd,
- "show ip bgp rsclient (A.B.C.D|X:X::X:X) A.B.C.D",
+ "show ip bgp rsclient (A.B.C.D|X:X::X:X|WORD) A.B.C.D",
SHOW_STR
IP_STR
BGP_STR
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"Network in the BGP routing table to display\n")
DEFUN (show_bgp_view_ipv4_safi_rsclient_route,
show_bgp_view_ipv4_safi_rsclient_route_cmd,
- "show bgp view WORD ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X) A.B.C.D",
+ "show bgp view WORD ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD) A.B.C.D",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11026,7 +11089,7 @@ DEFUN (show_bgp_view_ipv4_safi_rsclient_route,
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"Network in the BGP routing table to display\n")
{
struct bgp *bgp;
@@ -11086,26 +11149,26 @@ DEFUN
(show_bgp_view_ipv4_safi_rsclient_route,
ALIAS (show_bgp_view_ipv4_safi_rsclient_route,
show_bgp_ipv4_safi_rsclient_route_cmd,
- "show bgp ipv4 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X)
A.B.C.D",
+ "show bgp ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD) A.B.C.D",
SHOW_STR
BGP_STR
"Address family\n"
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"Network in the BGP routing table to display\n")
DEFUN (show_ip_bgp_view_rsclient_prefix,
show_ip_bgp_view_rsclient_prefix_cmd,
- "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X) A.B.C.D/M",
+ "show ip bgp view WORD rsclient (A.B.C.D|X:X::X:X|WORD)
A.B.C.D/M",
SHOW_STR
IP_STR
BGP_STR
"BGP view\n"
"View name\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
{
struct bgp *bgp;
@@ -11161,17 +11224,17 @@ DEFUN (show_ip_bgp_view_rsclient_prefix,
ALIAS (show_ip_bgp_view_rsclient_prefix,
show_ip_bgp_rsclient_prefix_cmd,
- "show ip bgp rsclient (A.B.C.D|X:X::X:X) A.B.C.D/M",
+ "show ip bgp rsclient (A.B.C.D|X:X::X:X|WORD) A.B.C.D/M",
SHOW_STR
IP_STR
BGP_STR
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
DEFUN (show_bgp_view_ipv4_safi_rsclient_prefix,
show_bgp_view_ipv4_safi_rsclient_prefix_cmd,
- "show bgp view WORD ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X) A.B.C.D/M",
+ "show bgp view WORD ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD) A.B.C.D/M",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11180,7 +11243,7 @@ DEFUN
(show_bgp_view_ipv4_safi_rsclient_prefix,
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
{
struct bgp *bgp;
@@ -11240,20 +11303,20 @@ DEFUN
(show_bgp_view_ipv4_safi_rsclient_prefix,
ALIAS (show_bgp_view_ipv4_safi_rsclient_prefix,
show_bgp_ipv4_safi_rsclient_prefix_cmd,
- "show bgp ipv4 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X)
A.B.C.D/M",
+ "show bgp ipv4 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD) A.B.C.D/M",
SHOW_STR
BGP_STR
"Address family\n"
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"IP prefix <network>/<length>, e.g., 35.0.0.0/8\n")
#ifdef HAVE_IPV6
DEFUN (show_bgp_view_neighbor_routes,
show_bgp_view_neighbor_routes_cmd,
- "show bgp view WORD neighbors (A.B.C.D|X:X::X:X) routes",
+ "show bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD) routes",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11261,6 +11324,7 @@ DEFUN (show_bgp_view_neighbor_routes,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display routes learned from neighbor\n")
{
struct peer *peer;
@@ -11277,9 +11341,10 @@ DEFUN (show_bgp_view_neighbor_routes,
bgp_show_type_neighbor);
}
+
ALIAS (show_bgp_view_neighbor_routes,
show_bgp_view_ipv6_neighbor_routes_cmd,
- "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X) routes",
+ "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
routes",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11288,11 +11353,12 @@ ALIAS (show_bgp_view_neighbor_routes,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display routes learned from neighbor\n")
DEFUN (show_bgp_view_neighbor_damp,
show_bgp_view_neighbor_damp_cmd,
- "show bgp view WORD neighbors (A.B.C.D|X:X::X:X)
dampened-routes",
+ "show bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD)
dampened-routes",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11300,6 +11366,7 @@ DEFUN (show_bgp_view_neighbor_damp,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the dampened routes received from neighbor\n")
{
struct peer *peer;
@@ -11318,7 +11385,7 @@ DEFUN (show_bgp_view_neighbor_damp,
ALIAS (show_bgp_view_neighbor_damp,
show_bgp_view_ipv6_neighbor_damp_cmd,
- "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X)
dampened-routes",
+ "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
dampened-routes",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11327,11 +11394,12 @@ ALIAS (show_bgp_view_neighbor_damp,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the dampened routes received from neighbor\n")
DEFUN (show_bgp_view_neighbor_flap,
show_bgp_view_neighbor_flap_cmd,
- "show bgp view WORD neighbors (A.B.C.D|X:X::X:X)
flap-statistics",
+ "show bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD)
flap-statistics",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11339,6 +11407,7 @@ DEFUN (show_bgp_view_neighbor_flap,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display flap statistics of the routes learned from neighbor\n")
{
struct peer *peer;
@@ -11357,7 +11426,7 @@ DEFUN (show_bgp_view_neighbor_flap,
ALIAS (show_bgp_view_neighbor_flap,
show_bgp_view_ipv6_neighbor_flap_cmd,
- "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X)
flap-statistics",
+ "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
flap-statistics",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11366,52 +11435,57 @@ ALIAS (show_bgp_view_neighbor_flap,
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display flap statistics of the routes learned from neighbor\n")
ALIAS (show_bgp_view_neighbor_routes,
show_bgp_neighbor_routes_cmd,
- "show bgp neighbors (A.B.C.D|X:X::X:X) routes",
+ "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes",
SHOW_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display routes learned from neighbor\n")
ALIAS (show_bgp_view_neighbor_routes,
show_bgp_ipv6_neighbor_routes_cmd,
- "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) routes",
+ "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD) routes",
SHOW_STR
BGP_STR
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display routes learned from neighbor\n")
/* old command */
ALIAS (show_bgp_view_neighbor_routes,
ipv6_bgp_neighbor_routes_cmd,
- "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X) routes",
+ "show ipv6 bgp neighbors (A.B.C.D|X:X::X:X|WORD) routes",
SHOW_STR
IPV6_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display routes learned from neighbor\n")
/* old command */
DEFUN (ipv6_mbgp_neighbor_routes,
ipv6_mbgp_neighbor_routes_cmd,
- "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X) routes",
+ "show ipv6 mbgp neighbors (A.B.C.D|X:X::X:X|WORD) routes",
SHOW_STR
IPV6_STR
MBGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display routes learned from neighbor\n")
{
struct peer *peer;
@@ -11426,55 +11500,59 @@ DEFUN (ipv6_mbgp_neighbor_routes,
ALIAS (show_bgp_view_neighbor_flap,
show_bgp_neighbor_flap_cmd,
- "show bgp neighbors (A.B.C.D|X:X::X:X) flap-statistics",
+ "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) flap-statistics",
SHOW_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display flap statistics of the routes learned from neighbor\n")
ALIAS (show_bgp_view_neighbor_flap,
show_bgp_ipv6_neighbor_flap_cmd,
- "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) flap-statistics",
+ "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
flap-statistics",
SHOW_STR
BGP_STR
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display flap statistics of the routes learned from neighbor\n")
ALIAS (show_bgp_view_neighbor_damp,
show_bgp_neighbor_damp_cmd,
- "show bgp neighbors (A.B.C.D|X:X::X:X) dampened-routes",
+ "show bgp neighbors (A.B.C.D|X:X::X:X|WORD) dampened-routes",
SHOW_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the dampened routes received from neighbor\n")
ALIAS (show_bgp_view_neighbor_damp,
show_bgp_ipv6_neighbor_damp_cmd,
- "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X) dampened-routes",
+ "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)
dampened-routes",
SHOW_STR
BGP_STR
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n"
"Display the dampened routes received from neighbor\n")
DEFUN (show_bgp_view_rsclient,
show_bgp_view_rsclient_cmd,
- "show bgp view WORD rsclient (A.B.C.D|X:X::X:X)",
+ "show bgp view WORD rsclient (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"BGP view\n"
"View name\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR)
+ NEIGHBOR_ADDR_STR3)
{
struct bgp_table *table;
struct peer *peer;
@@ -11509,15 +11587,15 @@ DEFUN (show_bgp_view_rsclient,
ALIAS (show_bgp_view_rsclient,
show_bgp_rsclient_cmd,
- "show bgp rsclient (A.B.C.D|X:X::X:X)",
+ "show bgp rsclient (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR)
+ NEIGHBOR_ADDR_STR3)
DEFUN (show_bgp_view_ipv6_safi_rsclient,
show_bgp_view_ipv6_safi_rsclient_cmd,
- "show bgp view WORD ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X)",
+ "show bgp view WORD ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11526,7 +11604,7 @@ DEFUN (show_bgp_view_ipv6_safi_rsclient,
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR)
+ NEIGHBOR_ADDR_STR3)
{
struct bgp_table *table;
struct peer *peer;
@@ -11565,24 +11643,24 @@ DEFUN (show_bgp_view_ipv6_safi_rsclient,
ALIAS (show_bgp_view_ipv6_safi_rsclient,
show_bgp_ipv6_safi_rsclient_cmd,
- "show bgp ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X)",
+ "show bgp ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"Address family\n"
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR)
+ NEIGHBOR_ADDR_STR3)
DEFUN (show_bgp_view_rsclient_route,
show_bgp_view_rsclient_route_cmd,
- "show bgp view WORD rsclient (A.B.C.D|X:X::X:X) X:X::X:X",
+ "show bgp view WORD rsclient (A.B.C.D|X:X::X:X|WORD)
X:X::X:X",
SHOW_STR
BGP_STR
"BGP view\n"
"View name\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"Network in the BGP routing table to display\n")
{
struct bgp *bgp;
@@ -11638,16 +11716,16 @@ DEFUN (show_bgp_view_rsclient_route,
ALIAS (show_bgp_view_rsclient_route,
show_bgp_rsclient_route_cmd,
- "show bgp rsclient (A.B.C.D|X:X::X:X) X:X::X:X",
+ "show bgp rsclient (A.B.C.D|X:X::X:X|WORD) X:X::X:X",
SHOW_STR
BGP_STR
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"Network in the BGP routing table to display\n")
DEFUN (show_bgp_view_ipv6_safi_rsclient_route,
show_bgp_view_ipv6_safi_rsclient_route_cmd,
- "show bgp view WORD ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X) X:X::X:X",
+ "show bgp view WORD ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD) X:X::X:X",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11656,7 +11734,7 @@ DEFUN (show_bgp_view_ipv6_safi_rsclient_route,
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"Network in the BGP routing table to display\n")
{
struct bgp *bgp;
@@ -11716,25 +11794,25 @@ DEFUN
(show_bgp_view_ipv6_safi_rsclient_route,
ALIAS (show_bgp_view_ipv6_safi_rsclient_route,
show_bgp_ipv6_safi_rsclient_route_cmd,
- "show bgp ipv6 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X)
X:X::X:X",
+ "show bgp ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD) X:X::X:X",
SHOW_STR
BGP_STR
"Address family\n"
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"Network in the BGP routing table to display\n")
DEFUN (show_bgp_view_rsclient_prefix,
show_bgp_view_rsclient_prefix_cmd,
- "show bgp view WORD rsclient (A.B.C.D|X:X::X:X) X:X::X:X/M",
+ "show bgp view WORD rsclient (A.B.C.D|X:X::X:X|WORD)
X:X::X:X/M",
SHOW_STR
BGP_STR
"BGP view\n"
"View name\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n")
{
struct bgp *bgp;
@@ -11790,16 +11868,16 @@ DEFUN (show_bgp_view_rsclient_prefix,
ALIAS (show_bgp_view_rsclient_prefix,
show_bgp_rsclient_prefix_cmd,
- "show bgp rsclient (A.B.C.D|X:X::X:X) X:X::X:X/M",
+ "show bgp rsclient (A.B.C.D|X:X::X:X|WORD) X:X::X:X/M",
SHOW_STR
BGP_STR
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"IPv6 prefix <network>/<length>, e.g., 3ffe::/16\n")
DEFUN (show_bgp_view_ipv6_safi_rsclient_prefix,
show_bgp_view_ipv6_safi_rsclient_prefix_cmd,
- "show bgp view WORD ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X) X:X::X:X/M",
+ "show bgp view WORD ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD) X:X::X:X/M",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -11808,7 +11886,7 @@ DEFUN
(show_bgp_view_ipv6_safi_rsclient_prefix,
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"IP prefix <network>/<length>, e.g., 3ffe::/16\n")
{
struct bgp *bgp;
@@ -11868,14 +11946,14 @@ DEFUN
(show_bgp_view_ipv6_safi_rsclient_prefix,
ALIAS (show_bgp_view_ipv6_safi_rsclient_prefix,
show_bgp_ipv6_safi_rsclient_prefix_cmd,
- "show bgp ipv6 (unicast|multicast) rsclient (A.B.C.D|X:X::X:X)
X:X::X:X/M",
+ "show bgp ipv6 (unicast|multicast) rsclient
(A.B.C.D|X:X::X:X|WORD) X:X::X:X/M",
SHOW_STR
BGP_STR
"Address family\n"
"Address Family modifier\n"
"Address Family modifier\n"
"Information about Route Server Client\n"
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR3
"IP prefix <network>/<length>, e.g., 3ffe::/16\n")
#endif /* HAVE_IPV6 */
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 92887e3..b4270de 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -106,15 +106,22 @@ peer_lookup_vty (struct vty *vty, const char
*ip_str)
ret = str2sockunion (ip_str, &su);
if (ret < 0)
{
- vty_out (vty, "%% Malformed address: %s%s", ip_str,
VTY_NEWLINE);
- return NULL;
+ peer = peer_lookup_by_conf_if (bgp, ip_str);
+ if (!peer)
+ {
+ vty_out (vty, "%% Malformed address or name: %s%s", ip_str,
VTY_NEWLINE);
+ return NULL;
+ }
}
-
- peer = peer_lookup (bgp, &su);
- if (! peer)
+ else
{
- vty_out (vty, "%% Specify remote-as or peer-group commands
first%s", VTY_NEWLINE);
- return NULL;
+ peer = peer_lookup (bgp, &su);
+ if (! peer)
+ {
+ vty_out (vty, "%% Specify remote-as or peer-group commands
first%s",
+ VTY_NEWLINE);
+ return NULL;
+ }
}
return peer;
}
@@ -140,6 +147,10 @@ peer_and_group_lookup_vty (struct vty *vty, const
char *peer_str)
}
else
{
+ peer = peer_lookup_by_conf_if (bgp, peer_str);
+ if (peer)
+ return peer;
+
group = peer_group_lookup (bgp, peer_str);
if (group)
return group->conf;
@@ -1597,24 +1608,31 @@ peer_remote_as_vty (struct vty *vty, const
char *peer_str,
ret = str2sockunion (peer_str, &su);
if (ret < 0)
{
- ret = peer_group_remote_as (bgp, peer_str, &as);
+ /* Check for peer by interface */
+ ret = peer_remote_as (bgp, NULL, peer_str, &as, afi, safi);
if (ret < 0)
- {
- vty_out (vty, "%% Create the peer-group first%s", VTY_NEWLINE);
- return CMD_WARNING;
- }
- return CMD_SUCCESS;
+ {
+ ret = peer_group_remote_as (bgp, peer_str, &as);
+ if (ret < 0)
+ {
+ vty_out (vty, "%% Create the peer-group or interface
first%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ return CMD_SUCCESS;
+ }
}
-
- if (peer_address_self_check (&su))
+ else
{
- vty_out (vty, "%% Can not configure the local system as
neighbor%s",
- VTY_NEWLINE);
- return CMD_WARNING;
+ if (peer_address_self_check (&su))
+ {
+ vty_out (vty, "%% Can not configure the local system as
neighbor%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ ret = peer_remote_as (bgp, &su, NULL, &as, afi, safi);
}
- ret = peer_remote_as (bgp, &su, &as, afi, safi);
-
/* This peer belongs to peer group. */
switch (ret)
{
@@ -1639,17 +1657,51 @@ DEFUN (neighbor_remote_as,
return peer_remote_as_vty (vty, argv[0], argv[1], AFI_IP,
SAFI_UNICAST);
}
+DEFUN (neighbor_interface_config,
+ neighbor_interface_config_cmd,
+ "neighbor WORD interface",
+ NEIGHBOR_STR
+ "Interface name or neighbor tag\n"
+ "Enable BGP on interface\n")
+{
+ struct bgp *bgp;
+ struct peer *peer;
+ struct peer_group *group;
+
+ bgp = vty->index;
+ group = peer_group_lookup (bgp, argv[0]);
+ if (group)
+ {
+ vty_out (vty, "%% Name conflict with peer-group %s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ peer = peer_conf_interface_get (bgp, argv[0], AFI_IP,
SAFI_UNICAST);
+ if (!peer)
+ return CMD_WARNING;
+
+ return CMD_SUCCESS;
+}
+
+
DEFUN (neighbor_peer_group,
neighbor_peer_group_cmd,
"neighbor WORD peer-group",
NEIGHBOR_STR
- "Neighbor tag\n"
+ "Interface name or neighbor tag\n"
"Configure peer-group\n")
{
struct bgp *bgp;
+ struct peer *peer;
struct peer_group *group;
bgp = vty->index;
+ peer = peer_lookup_by_conf_if (bgp, argv[0]);
+ if (peer)
+ {
+ vty_out (vty, "%% Name conflict with interface: %s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
group = peer_group_get (bgp, argv[0]);
if (! group)
@@ -1674,6 +1726,14 @@ DEFUN (no_neighbor,
ret = str2sockunion (argv[0], &su);
if (ret < 0)
{
+ /* look up for neighbor by interface name config. */
+ peer = peer_lookup_by_conf_if (vty->index, argv[0]);
+ if (peer)
+ {
+ peer_delete (peer);
+ return CMD_SUCCESS;
+ }
+
group = peer_group_lookup (vty->index, argv[0]);
if (group)
peer_group_delete (group);
@@ -1707,6 +1767,30 @@ ALIAS (no_neighbor,
"Specify a BGP neighbor\n"
AS_STR)
+DEFUN (no_neighbor_interface_config,
+ no_neighbor_interface_config_cmd,
+ "no neighbor WORD interface",
+ NO_STR
+ NEIGHBOR_STR
+ "Interface name\n"
+ "Configure BGP on interface\n")
+{
+ struct peer *peer;
+
+ /* look up for neighbor by interface name config. */
+ peer = peer_lookup_by_conf_if (vty->index, argv[0]);
+ if (peer)
+ {
+ peer_delete (peer);
+ }
+ else
+ {
+ vty_out (vty, "%% Create the bgp interface first%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ return CMD_SUCCESS;
+}
+
DEFUN (no_neighbor_peer_group,
no_neighbor_peer_group_cmd,
"no neighbor WORD peer-group",
@@ -1728,23 +1812,32 @@ DEFUN (no_neighbor_peer_group,
return CMD_SUCCESS;
}
-DEFUN (no_neighbor_peer_group_remote_as,
- no_neighbor_peer_group_remote_as_cmd,
+DEFUN (no_neighbor_interface_peer_group_remote_as,
+ no_neighbor_interface_peer_group_remote_as_cmd,
"no neighbor WORD remote-as " CMD_AS_RANGE,
NO_STR
NEIGHBOR_STR
- "Neighbor tag\n"
+ "Interface name or neighbor tag\n"
"Specify a BGP neighbor\n"
AS_STR)
{
struct peer_group *group;
+ struct peer *peer;
+
+ /* look up for neighbor by interface name config. */
+ peer = peer_lookup_by_conf_if (vty->index, argv[0]);
+ if (peer)
+ {
+ peer_as_change (peer, 0);
+ return CMD_SUCCESS;
+ }
group = peer_group_lookup (vty->index, argv[0]);
if (group)
peer_group_remote_as_delete (group);
else
{
- vty_out (vty, "%% Create the peer-group first%s", VTY_NEWLINE);
+ vty_out (vty, "%% Create the peer-group or interface first%s",
VTY_NEWLINE);
return CMD_WARNING;
}
return CMD_SUCCESS;
@@ -1939,9 +2032,9 @@ DEFUN (no_neighbor_activate,
DEFUN (neighbor_set_peer_group,
neighbor_set_peer_group_cmd,
- NEIGHBOR_CMD "peer-group WORD",
+ NEIGHBOR_CMD2 "peer-group WORD",
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"Member of the peer-group\n"
"peer-group name\n")
{
@@ -1949,15 +2042,30 @@ DEFUN (neighbor_set_peer_group,
as_t as;
union sockunion su;
struct bgp *bgp;
+ struct peer *peer;
struct peer_group *group;
bgp = vty->index;
+ peer = NULL;
ret = str2sockunion (argv[0], &su);
if (ret < 0)
{
- vty_out (vty, "%% Malformed address: %s%s", argv[0],
VTY_NEWLINE);
- return CMD_WARNING;
+ peer = peer_lookup_by_conf_if (bgp, argv[0]);
+ if (!peer)
+ {
+ vty_out (vty, "%% Malformed address or name: %s%s",
argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
+ else
+ {
+ if (peer_address_self_check (&su))
+ {
+ vty_out (vty, "%% Can not configure the local system as
neighbor%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+ }
}
group = peer_group_lookup (bgp, argv[1]);
@@ -1967,14 +2075,7 @@ DEFUN (neighbor_set_peer_group,
return CMD_WARNING;
}
- if (peer_address_self_check (&su))
- {
- vty_out (vty, "%% Can not configure the local system as
neighbor%s",
- VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- ret = peer_group_bind (bgp, &su, group, bgp_node_afi (vty),
+ ret = peer_group_bind (bgp, &su, peer, group, bgp_node_afi (vty),
bgp_node_safi (vty), &as);
if (ret == BGP_ERR_PEER_GROUP_PEER_TYPE_DIFFERENT)
@@ -1988,10 +2089,10 @@ DEFUN (neighbor_set_peer_group,
DEFUN (no_neighbor_set_peer_group,
no_neighbor_set_peer_group_cmd,
- NO_NEIGHBOR_CMD "peer-group WORD",
+ NO_NEIGHBOR_CMD2 "peer-group WORD",
NO_STR
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"Member of the peer-group\n"
"peer-group name\n")
{
@@ -3192,6 +3293,9 @@ peer_update_source_vty (struct vty *vty, const
char *peer_str,
if (! peer)
return CMD_WARNING;
+ if (peer->conf_if)
+ return CMD_WARNING;
+
if (source_str)
{
union sockunion su;
@@ -3649,7 +3753,7 @@ peer_interface_vty (struct vty *vty, const char
*ip_str, const char *str)
struct peer *peer;
peer = peer_lookup_vty (vty, ip_str);
- if (! peer)
+ if (! peer || peer->conf_if)
return CMD_WARNING;
if (str)
@@ -4525,16 +4629,23 @@ bgp_clear (struct vty *vty, struct bgp *bgp,
afi_t afi, safi_t safi,
/* Make sockunion for lookup. */
ret = str2sockunion (arg, &su);
if (ret < 0)
- {
- vty_out (vty, "Malformed address: %s%s", arg, VTY_NEWLINE);
- return CMD_WARNING;
- }
- peer = peer_lookup (bgp, &su);
- if (! peer)
- {
- vty_out (vty, "%%BGP: Unknown neighbor - \"%s\"%s", arg,
VTY_NEWLINE);
- return CMD_WARNING;
- }
+ {
+ peer = peer_lookup_by_conf_if (bgp, arg);
+ if (!peer)
+ {
+ vty_out (vty, "Malformed address or name: %s%s", arg,
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
+ else
+ {
+ peer = peer_lookup (bgp, &su);
+ if (! peer)
+ {
+ vty_out (vty, "%%BGP: Unknown neighbor - \"%s\"%s",
arg, VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
if (stype == BGP_CLEAR_SOFT_NONE)
ret = peer_clear (peer, NULL);
@@ -4706,32 +4817,35 @@ ALIAS (clear_ip_bgp_all,
DEFUN (clear_ip_bgp_peer,
clear_ip_bgp_peer_cmd,
- "clear ip bgp (A.B.C.D|X:X::X:X)",
+ "clear ip bgp (A.B.C.D|X:X::X:X|WORD)",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor IP address to clear\n"
- "BGP IPv6 neighbor to clear\n")
+ "BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n")
{
return bgp_clear_vty (vty, NULL, 0, 0, clear_peer,
BGP_CLEAR_SOFT_NONE, argv[0]);
}
ALIAS (clear_ip_bgp_peer,
clear_bgp_peer_cmd,
- "clear bgp (A.B.C.D|X:X::X:X)",
+ "clear bgp (A.B.C.D|X:X::X:X|WORD)",
CLEAR_STR
BGP_STR
"BGP neighbor address to clear\n"
- "BGP IPv6 neighbor to clear\n")
+ "BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n")
ALIAS (clear_ip_bgp_peer,
clear_bgp_ipv6_peer_cmd,
- "clear bgp ipv6 (A.B.C.D|X:X::X:X)",
+ "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD)",
CLEAR_STR
BGP_STR
"Address family\n"
"BGP neighbor address to clear\n"
- "BGP IPv6 neighbor to clear\n")
+ "BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n")
DEFUN (clear_ip_bgp_peer_group,
clear_ip_bgp_peer_group_cmd,
@@ -5076,11 +5190,12 @@ ALIAS (clear_ip_bgp_peer_vpnv4_soft_out,
DEFUN (clear_bgp_peer_soft_out,
clear_bgp_peer_soft_out_cmd,
- "clear bgp (A.B.C.D|X:X::X:X) soft out",
+ "clear bgp (A.B.C.D|X:X::X:X|WORD) soft out",
CLEAR_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig\n"
"Soft reconfig outbound update\n")
{
@@ -5090,32 +5205,35 @@ DEFUN (clear_bgp_peer_soft_out,
ALIAS (clear_bgp_peer_soft_out,
clear_bgp_ipv6_peer_soft_out_cmd,
- "clear bgp ipv6 (A.B.C.D|X:X::X:X) soft out",
+ "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft out",
CLEAR_STR
BGP_STR
"Address family\n"
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig\n"
"Soft reconfig outbound update\n")
ALIAS (clear_bgp_peer_soft_out,
clear_bgp_peer_out_cmd,
- "clear bgp (A.B.C.D|X:X::X:X) out",
+ "clear bgp (A.B.C.D|X:X::X:X|WORD) out",
CLEAR_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig outbound update\n")
ALIAS (clear_bgp_peer_soft_out,
clear_bgp_ipv6_peer_out_cmd,
- "clear bgp ipv6 (A.B.C.D|X:X::X:X) out",
+ "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) out",
CLEAR_STR
BGP_STR
"Address family\n"
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig outbound update\n")
DEFUN (clear_ip_bgp_peer_group_soft_out,
@@ -5835,11 +5953,12 @@ ALIAS (clear_ip_bgp_peer_vpnv4_soft_in,
DEFUN (clear_bgp_peer_soft_in,
clear_bgp_peer_soft_in_cmd,
- "clear bgp (A.B.C.D|X:X::X:X) soft in",
+ "clear bgp (A.B.C.D|X:X::X:X|WORD) soft in",
CLEAR_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig\n"
"Soft reconfig inbound update\n")
{
@@ -5849,41 +5968,45 @@ DEFUN (clear_bgp_peer_soft_in,
ALIAS (clear_bgp_peer_soft_in,
clear_bgp_ipv6_peer_soft_in_cmd,
- "clear bgp ipv6 (A.B.C.D|X:X::X:X) soft in",
+ "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft in",
CLEAR_STR
BGP_STR
"Address family\n"
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig\n"
"Soft reconfig inbound update\n")
ALIAS (clear_bgp_peer_soft_in,
clear_bgp_peer_in_cmd,
- "clear bgp (A.B.C.D|X:X::X:X) in",
+ "clear bgp (A.B.C.D|X:X::X:X|WORD) in",
CLEAR_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig inbound update\n")
ALIAS (clear_bgp_peer_soft_in,
clear_bgp_ipv6_peer_in_cmd,
- "clear bgp ipv6 (A.B.C.D|X:X::X:X) in",
+ "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) in",
CLEAR_STR
BGP_STR
"Address family\n"
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig inbound update\n")
DEFUN (clear_bgp_peer_in_prefix_filter,
clear_bgp_peer_in_prefix_filter_cmd,
- "clear bgp (A.B.C.D|X:X::X:X) in prefix-filter",
+ "clear bgp (A.B.C.D|X:X::X:X|WORD) in prefix-filter",
CLEAR_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig inbound update\n"
"Push out the existing ORF prefix-list\n")
{
@@ -5893,12 +6016,13 @@ DEFUN (clear_bgp_peer_in_prefix_filter,
ALIAS (clear_bgp_peer_in_prefix_filter,
clear_bgp_ipv6_peer_in_prefix_filter_cmd,
- "clear bgp ipv6 (A.B.C.D|X:X::X:X) in prefix-filter",
+ "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) in prefix-filter",
CLEAR_STR
BGP_STR
"Address family\n"
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig inbound update\n"
"Push out the existing ORF prefix-list\n")
@@ -6575,11 +6699,12 @@ DEFUN (clear_ip_bgp_peer_vpnv4_soft,
DEFUN (clear_bgp_peer_soft,
clear_bgp_peer_soft_cmd,
- "clear bgp (A.B.C.D|X:X::X:X) soft",
+ "clear bgp (A.B.C.D|X:X::X:X|WORD) soft",
CLEAR_STR
BGP_STR
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig\n")
{
return bgp_clear_vty (vty, NULL, AFI_IP6, SAFI_UNICAST, clear_peer,
@@ -6588,12 +6713,13 @@ DEFUN (clear_bgp_peer_soft,
ALIAS (clear_bgp_peer_soft,
clear_bgp_ipv6_peer_soft_cmd,
- "clear bgp ipv6 (A.B.C.D|X:X::X:X) soft",
+ "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) soft",
CLEAR_STR
BGP_STR
"Address family\n"
"BGP neighbor address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig\n")
DEFUN (clear_ip_bgp_peer_group_soft,
@@ -6857,11 +6983,12 @@ ALIAS (clear_ip_bgp_all_rsclient,
#ifdef HAVE_IPV6
DEFUN (clear_bgp_peer_rsclient,
clear_bgp_peer_rsclient_cmd,
- "clear bgp (A.B.C.D|X:X::X:X) rsclient",
+ "clear bgp (A.B.C.D|X:X::X:X|WORD) rsclient",
CLEAR_STR
BGP_STR
"BGP neighbor IP address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig for rsclient RIB\n")
{
if (argc == 2)
@@ -6874,28 +7001,30 @@ DEFUN (clear_bgp_peer_rsclient,
ALIAS (clear_bgp_peer_rsclient,
clear_bgp_ipv6_peer_rsclient_cmd,
- "clear bgp ipv6 (A.B.C.D|X:X::X:X) rsclient",
+ "clear bgp ipv6 (A.B.C.D|X:X::X:X|WORD) rsclient",
CLEAR_STR
BGP_STR
"Address family\n"
"BGP neighbor IP address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig for rsclient RIB\n")
ALIAS (clear_bgp_peer_rsclient,
clear_bgp_instance_peer_rsclient_cmd,
- "clear bgp view WORD (A.B.C.D|X:X::X:X) rsclient",
+ "clear bgp view WORD (A.B.C.D|X:X::X:X|WORD) rsclient",
CLEAR_STR
BGP_STR
"BGP view\n"
"view name\n"
"BGP neighbor IP address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig for rsclient RIB\n")
ALIAS (clear_bgp_peer_rsclient,
clear_bgp_ipv6_instance_peer_rsclient_cmd,
- "clear bgp ipv6 view WORD (A.B.C.D|X:X::X:X) rsclient",
+ "clear bgp ipv6 view WORD (A.B.C.D|X:X::X:X|WORD) rsclient",
CLEAR_STR
BGP_STR
"Address family\n"
@@ -6903,17 +7032,19 @@ ALIAS (clear_bgp_peer_rsclient,
"view name\n"
"BGP neighbor IP address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig for rsclient RIB\n")
#endif /* HAVE_IPV6 */
DEFUN (clear_ip_bgp_peer_rsclient,
clear_ip_bgp_peer_rsclient_cmd,
- "clear ip bgp (A.B.C.D|X:X::X:X) rsclient",
+ "clear ip bgp (A.B.C.D|X:X::X:X|WORD) rsclient",
CLEAR_STR
IP_STR
BGP_STR
"BGP neighbor IP address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig for rsclient RIB\n")
{
if (argc == 2)
@@ -6926,7 +7057,7 @@ DEFUN (clear_ip_bgp_peer_rsclient,
ALIAS (clear_ip_bgp_peer_rsclient,
clear_ip_bgp_instance_peer_rsclient_cmd,
- "clear ip bgp view WORD (A.B.C.D|X:X::X:X) rsclient",
+ "clear ip bgp view WORD (A.B.C.D|X:X::X:X|WORD) rsclient",
CLEAR_STR
IP_STR
BGP_STR
@@ -6934,6 +7065,7 @@ ALIAS (clear_ip_bgp_peer_rsclient,
"view name\n"
"BGP neighbor IP address to clear\n"
"BGP IPv6 neighbor to clear\n"
+ "BGP neighbor on interface to clear\n"
"Soft reconfig for rsclient RIB\n")
DEFUN (show_bgp_views,
@@ -7756,7 +7888,7 @@ static void
bgp_show_peer (struct vty *vty, struct peer *p)
{
struct bgp *bgp;
- char buf1[BUFSIZ];
+ char buf1[BUFSIZ], buf[SU_ADDRSTRLEN];
char timebuf[BGP_UPTIME_LEN];
afi_t afi;
safi_t safi;
@@ -7765,8 +7897,12 @@ bgp_show_peer (struct vty *vty, struct peer *p)
bgp = p->bgp;
- /* Configured IP address. */
- vty_out (vty, "BGP neighbor is %s, ", p->host);
+ if (p->conf_if) /* Configured interface name. */
+ vty_out (vty, "BGP neighbor on %s: %s, ", p->conf_if,
+ BGP_PEER_SU_UNSPEC(p) ? "None" :
+ sockunion2str (&p->su, buf, SU_ADDRSTRLEN));
+ else /* Configured IP address. */
+ vty_out (vty, "BGP neighbor is %s, ", p->host);
vty_out (vty, "remote AS %u, ", p->as);
vty_out (vty, "local AS %u%s%s, ",
p->change_local_as ? p->change_local_as : p->local_as,
@@ -8164,7 +8300,7 @@ bgp_show_peer (struct vty *vty, struct peer *p)
static int
bgp_show_neighbor (struct vty *vty, struct bgp *bgp,
- enum show_type type, union sockunion *su)
+ enum show_type type, union sockunion *su, const char
*conf_if)
{
struct listnode *node, *nnode;
struct peer *peer;
@@ -8181,11 +8317,22 @@ bgp_show_neighbor (struct vty *vty, struct bgp
*bgp,
bgp_show_peer (vty, peer);
break;
case show_peer:
- if (sockunion_same (&peer->su, su))
- {
- find = 1;
- bgp_show_peer (vty, peer);
- }
+ if (conf_if)
+ {
+ if (peer->conf_if && !strcmp(peer->conf_if, conf_if))
+ {
+ find = 1;
+ bgp_show_peer (vty, peer);
+ }
+ }
+ else
+ {
+ if (sockunion_same (&peer->su, su))
+ {
+ find = 1;
+ bgp_show_peer (vty, peer);
+ }
+ }
break;
}
}
@@ -8204,35 +8351,35 @@ bgp_show_neighbor_vty (struct vty *vty, const
char *name,
struct bgp *bgp;
union sockunion su;
- if (ip_str)
- {
- ret = str2sockunion (ip_str, &su);
- if (ret < 0)
- {
- vty_out (vty, "%% Malformed address: %s%s", ip_str,
VTY_NEWLINE);
- return CMD_WARNING;
- }
- }
-
if (name)
{
bgp = bgp_lookup_by_name (name);
-
if (! bgp)
{
vty_out (vty, "%% No such BGP instance exist%s", VTY_NEWLINE);
return CMD_WARNING;
}
-
- bgp_show_neighbor (vty, bgp, type, &su);
-
- return CMD_SUCCESS;
}
-
- bgp = bgp_get_default ();
+ else
+ {
+ bgp = bgp_get_default ();
+ }
if (bgp)
- bgp_show_neighbor (vty, bgp, type, &su);
+ {
+ if (ip_str)
+ {
+ ret = str2sockunion (ip_str, &su);
+ if (ret < 0)
+ bgp_show_neighbor (vty, bgp, type, NULL, ip_str);
+ else
+ bgp_show_neighbor (vty, bgp, type, &su, NULL);
+ }
+ else
+ {
+ bgp_show_neighbor (vty, bgp, type, NULL, NULL);
+ }
+ }
return CMD_SUCCESS;
}
@@ -8298,20 +8445,21 @@ ALIAS (show_ip_bgp_neighbors,
DEFUN (show_ip_bgp_neighbors_peer,
show_ip_bgp_neighbors_peer_cmd,
- "show ip bgp neighbors (A.B.C.D|X:X::X:X)",
+ "show ip bgp neighbors (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
IP_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
- "Neighbor to display information about\n")
+ "Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n")
{
return bgp_show_neighbor_vty (vty, NULL, show_peer, argv[argc - 1]);
}
ALIAS (show_ip_bgp_neighbors_peer,
show_ip_bgp_ipv4_neighbors_peer_cmd,
- "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X)",
+ "show ip bgp ipv4 (unicast|multicast) neighbors
(A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
IP_STR
BGP_STR
@@ -8320,7 +8468,8 @@ ALIAS (show_ip_bgp_neighbors_peer,
"Address Family modifier\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
- "Neighbor to display information about\n")
+ "Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n")
ALIAS (show_ip_bgp_neighbors_peer,
show_ip_bgp_vpnv4_all_neighbors_peer_cmd,
@@ -8346,22 +8495,24 @@ ALIAS (show_ip_bgp_neighbors_peer,
ALIAS (show_ip_bgp_neighbors_peer,
show_bgp_neighbors_peer_cmd,
- "show bgp neighbors (A.B.C.D|X:X::X:X)",
+ "show bgp neighbors (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
- "Neighbor to display information about\n")
+ "Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n")
ALIAS (show_ip_bgp_neighbors_peer,
show_bgp_ipv6_neighbors_peer_cmd,
- "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X)",
+ "show bgp ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
- "Neighbor to display information about\n")
+ "Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n")
DEFUN (show_ip_bgp_instance_neighbors,
show_ip_bgp_instance_neighbors_cmd,
@@ -8397,7 +8548,7 @@ ALIAS (show_ip_bgp_instance_neighbors,
DEFUN (show_ip_bgp_instance_neighbors_peer,
show_ip_bgp_instance_neighbors_peer_cmd,
- "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X)",
+ "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
IP_STR
BGP_STR
@@ -8405,25 +8556,27 @@ DEFUN (show_ip_bgp_instance_neighbors_peer,
"View name\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
- "Neighbor to display information about\n")
+ "Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n")
{
return bgp_show_neighbor_vty (vty, argv[0], show_peer, argv[1]);
}
ALIAS (show_ip_bgp_instance_neighbors_peer,
show_bgp_instance_neighbors_peer_cmd,
- "show bgp view WORD neighbors (A.B.C.D|X:X::X:X)",
+ "show bgp view WORD neighbors (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"BGP view\n"
"View name\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
- "Neighbor to display information about\n")
+ "Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n")
ALIAS (show_ip_bgp_instance_neighbors_peer,
show_bgp_instance_ipv6_neighbors_peer_cmd,
- "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X)",
+ "show bgp view WORD ipv6 neighbors (A.B.C.D|X:X::X:X|WORD)",
SHOW_STR
BGP_STR
"BGP view\n"
@@ -8431,7 +8584,8 @@ ALIAS (show_ip_bgp_instance_neighbors_peer,
"Address family\n"
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
- "Neighbor to display information about\n")
+ "Neighbor to display information about\n"
+ "Neighbor on bgp configured interface\n")
/* Show BGP's AS paths internal data. There are both `show ip bgp
paths' and `show ip mbgp paths'. Those functions results are the
@@ -9506,13 +9660,15 @@ bgp_vty_init (void)
/* "neighbor remote-as" commands. */
install_element (BGP_NODE, &neighbor_remote_as_cmd);
+ install_element (BGP_NODE, &neighbor_interface_config_cmd);
install_element (BGP_NODE, &no_neighbor_cmd);
install_element (BGP_NODE, &no_neighbor_remote_as_cmd);
+ install_element (BGP_NODE, &no_neighbor_interface_config_cmd);
/* "neighbor peer-group" commands. */
install_element (BGP_NODE, &neighbor_peer_group_cmd);
install_element (BGP_NODE, &no_neighbor_peer_group_cmd);
- install_element (BGP_NODE, &no_neighbor_peer_group_remote_as_cmd);
+ install_element (BGP_NODE,
&no_neighbor_interface_peer_group_remote_as_cmd);
/* "neighbor local-as" commands. */
install_element (BGP_NODE, &neighbor_local_as_cmd);
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 717b5f5..07f4177 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -124,6 +124,46 @@ bgp_read_nexthop_update (int command, struct
zclient *zclient,
return 0;
}
+static void
+bgp_nbr_connected_add (struct nbr_connected *ifc)
+{
+ struct listnode *node, *nnode, *mnode;
+ struct bgp *bgp;
+ struct peer *peer;
+
+ for (ALL_LIST_ELEMENTS_RO (bm->bgp, mnode, bgp))
+ {
+ for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
+ {
+ if (peer->conf_if && (strcmp (peer->conf_if,
ifc->ifp->name) == 0))
+ {
+ if (peer_active(peer))
+ BGP_EVENT_ADD (peer, BGP_Stop);
+ BGP_EVENT_ADD (peer, BGP_Start);
+ }
+ }
+ }
+}
+
+static void
+bgp_nbr_connected_delete (struct nbr_connected *ifc)
+{
+ struct listnode *node, *nnode, *mnode;
+ struct bgp *bgp;
+ struct peer *peer;
+
+ for (ALL_LIST_ELEMENTS_RO (bm->bgp, mnode, bgp))
+ {
+ for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
+ {
+ if (peer->conf_if && (strcmp (peer->conf_if,
ifc->ifp->name) == 0))
+ {
+ BGP_EVENT_ADD (peer, BGP_Stop);
+ }
+ }
+ }
+}
+
/* Inteface addition message from zebra. */
static int
bgp_interface_add (int command, struct zclient *zclient, zebra_size_t
length,
@@ -163,6 +203,7 @@ bgp_interface_up (int command, struct zclient
*zclient, zebra_size_t length,
struct stream *s;
struct interface *ifp;
struct connected *c;
+ struct nbr_connected *nc;
struct listnode *node, *nnode;
s = zclient->ibuf;
@@ -177,6 +218,9 @@ bgp_interface_up (int command, struct zclient
*zclient, zebra_size_t length,
for (ALL_LIST_ELEMENTS (ifp->connected, node, nnode, c))
bgp_connected_add (c);
+ for (ALL_LIST_ELEMENTS (ifp->nbr_connected, node, nnode, nc))
+ bgp_nbr_connected_add (nc);
+
return 0;
}
@@ -187,6 +231,7 @@ bgp_interface_down (int command, struct zclient
*zclient, zebra_size_t length,
struct stream *s;
struct interface *ifp;
struct connected *c;
+ struct nbr_connected *nc;
struct listnode *node, *nnode;
s = zclient->ibuf;
@@ -200,6 +245,9 @@ bgp_interface_down (int command, struct zclient
*zclient, zebra_size_t length,
for (ALL_LIST_ELEMENTS (ifp->connected, node, nnode, c))
bgp_connected_delete (c);
+ for (ALL_LIST_ELEMENTS (ifp->nbr_connected, node, nnode, nc))
+ bgp_nbr_connected_delete (nc);
+
/* Fast external-failover */
{
struct listnode *mnode;
@@ -277,6 +325,58 @@ bgp_interface_address_delete (int command, struct
zclient *zclient,
return 0;
}
+static int
+bgp_interface_nbr_address_add (int command, struct zclient *zclient,
+ zebra_size_t length, vrf_id_t vrf_id)
+{
+ struct nbr_connected *ifc = NULL;
+
+ ifc = zebra_interface_nbr_address_read (command, zclient->ibuf);
+
+ if (ifc == NULL)
+ return 0;
+
+ if (BGP_DEBUG(zebra, ZEBRA))
+ {
+ char buf[128];
+ prefix2str(ifc->address, buf, sizeof(buf));
+ zlog_debug("Zebra rcvd: interface %s nbr address add %s",
+ ifc->ifp->name, buf);
+ }
+
+ if (if_is_operative (ifc->ifp))
+ bgp_nbr_connected_add (ifc);
+
+ return 0;
+}
+
+static int
+bgp_interface_nbr_address_delete (int command, struct zclient
*zclient,
+ zebra_size_t length, vrf_id_t vrf_id)
+{
+ struct nbr_connected *ifc = NULL;
+
+ ifc = zebra_interface_nbr_address_read (command, zclient->ibuf);
+
+ if (ifc == NULL)
+ return 0;
+
+ if (BGP_DEBUG(zebra, ZEBRA))
+ {
+ char buf[128];
+ prefix2str(ifc->address, buf, sizeof(buf));
+ zlog_debug("Zebra rcvd: interface %s nbr address delete %s",
+ ifc->ifp->name, buf);
+ }
+
+ if (if_is_operative (ifc->ifp))
+ bgp_nbr_connected_delete (ifc);
+
+ nbr_connected_free (ifc);
+
+ return 0;
+}
+
/* Zebra route add and delete treatment. */
static int
zebra_read_ipv4 (int command, struct zclient *zclient, zebra_size_t
length,
@@ -626,8 +726,8 @@ bgp_nexthop_set (union sockunion *local, union
sockunion *remote,
{
if (IN6_IS_ADDR_LINKLOCAL (&local->sin6.sin6_addr))
{
- if (peer->ifname)
- ifp = if_lookup_by_name (peer->ifname);
+ if (peer->conf_if || peer->ifname)
+ ifp = if_lookup_by_index (if_nametoindex (peer->conf_if ?
peer->conf_if : peer->ifname));
}
else
ifp = if_lookup_by_ipv6 (&local->sin6.sin6_addr);
@@ -992,11 +1092,12 @@ bgp_zebra_announce (struct prefix *p, struct
bgp_info *info, struct bgp *bgp,
if (!ifindex)
{
- if (info->peer->ifname)
- ifindex = if_nametoindex (info->peer->ifname);
+ if (info->peer->conf_if || info->peer->ifname)
+ ifindex = if_nametoindex (info->peer->conf_if ? info->peer->conf_if
: info->peer->ifname);
else if (info->peer->nexthop.ifp)
ifindex = info->peer->nexthop.ifp->ifindex;
}
+
stream_put (bgp_nexthop_buf, &nexthop, sizeof (struct in6_addr
*));
stream_put (bgp_ifindices_buf, &ifindex, sizeof (unsigned
int));
valid_nh_count++;
@@ -1031,8 +1132,8 @@ bgp_zebra_announce (struct prefix *p, struct
bgp_info *info, struct bgp *bgp,
if (!ifindex)
{
- if (mpinfo->peer->ifname)
- ifindex = if_nametoindex (mpinfo->peer->ifname);
+ if (mpinfo->peer->conf_if || mpinfo->peer->ifname)
+ ifindex = if_nametoindex (mpinfo->peer->conf_if ?
mpinfo->peer->conf_if : mpinfo->peer->ifname);
else if (mpinfo->peer->nexthop.ifp)
ifindex = mpinfo->peer->nexthop.ifp->ifindex;
}
@@ -1182,8 +1283,8 @@ bgp_zebra_withdraw (struct prefix *p, struct
bgp_info *info, safi_t safi)
return;
if (IN6_IS_ADDR_LINKLOCAL (nexthop) && ! ifindex)
- if (info->peer->ifname)
- ifindex = ifname2ifindex (info->peer->ifname);
+ if (info->peer->conf_if || info->peer->ifname)
+ ifindex = if_nametoindex (info->peer->conf_if ?
info->peer->conf_if : info->peer->ifname);
api.vrf_id = VRF_DEFAULT;
api.flags = flags;
@@ -1366,6 +1467,8 @@ bgp_zebra_init (struct thread_master *master)
zclient->interface_delete = bgp_interface_delete;
zclient->interface_address_add = bgp_interface_address_add;
zclient->interface_address_delete = bgp_interface_address_delete;
+ zclient->interface_nbr_address_add = bgp_interface_nbr_address_add;
+ zclient->interface_nbr_address_delete =
bgp_interface_nbr_address_delete;
zclient->ipv4_route_add = zebra_read_ipv4;
zclient->ipv4_route_delete = zebra_read_ipv4;
zclient->interface_up = bgp_interface_up;
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index de7cd53..6f97ef3 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -778,6 +778,10 @@ peer_free (struct peer *peer)
XFREE(MTYPE_TMP, peer->notify.data);
bgp_sync_delete (peer);
+
+ if (peer->conf_if)
+ XFREE (MTYPE_PEER_CONF_IF, peer->conf_if);
+
memset (peer, 0, sizeof (struct peer));
XFREE (MTYPE_BGP_PEER, peer);
@@ -968,17 +972,62 @@ peer_xfer_config (struct peer *peer_dst, struct
peer *peer_src)
}
}
+/*
+ * Set or reset the peer address socketunion structure based on the
+ * learnt peer address. Currently via the source address of the
+ * ipv6 ND router-advertisement.
+ */
+void
+bgp_peer_conf_if_to_su_update (struct peer *peer)
+{
+ struct interface *ifp;
+ struct nbr_connected *ifc;
+
+ if (!peer->conf_if)
+ return;
+
+ if ((ifp = if_lookup_by_name(peer->conf_if)) &&
+ ifp->nbr_connected &&
+ (ifc = listnode_head(ifp->nbr_connected)))
+ {
+ peer->su.sa.sa_family = AF_INET6;
+ memcpy(&peer->su.sin6.sin6_addr, &ifc->address->u.prefix,
+ sizeof (struct in6_addr));
+#ifdef SIN6_LEN
+ peer->su.sin6.sin6_len = sizeof (struct sockaddr_in6);
+#endif
+ }
+ else
+ {
+ /* This works as an indication of unresolved peer address
+ on a BGP interface*/
+ peer->su.sa.sa_family = AF_UNSPEC;
+ memset(&peer->su.sin6.sin6_addr, 0, sizeof (struct in6_addr));
+ }
+}
+
/* Create new BGP peer. */
struct peer *
-peer_create (union sockunion *su, struct bgp *bgp, as_t local_as,
- as_t remote_as, afi_t afi, safi_t safi)
+peer_create (union sockunion *su, const char *conf_if, struct bgp
*bgp,
+ as_t local_as, as_t remote_as, afi_t afi, safi_t safi)
{
int active;
struct peer *peer;
char buf[SU_ADDRSTRLEN];
peer = peer_new (bgp);
- peer->su = *su;
+ if (conf_if)
+ {
+ peer->conf_if = XSTRDUP (MTYPE_PEER_CONF_IF, conf_if);
+ bgp_peer_conf_if_to_su_update(peer);
+ peer->host = XSTRDUP (MTYPE_BGP_PEER_HOST, conf_if);
+ }
+ else if (su)
+ {
+ peer->su = *su;
+ sockunion2str (su, buf, SU_ADDRSTRLEN);
+ peer->host = XSTRDUP (MTYPE_BGP_PEER_HOST, buf);
+ }
peer->local_as = local_as;
peer->as = remote_as;
peer->local_id = bgp->router_id;
@@ -1005,10 +1054,6 @@ peer_create (union sockunion *su, struct bgp
*bgp, as_t local_as,
SET_FLAG (peer->flags, PEER_FLAG_CONFIG_NODE);
- /* Make peer's address string. */
- sockunion2str (su, buf, SU_ADDRSTRLEN);
- peer->host = XSTRDUP (MTYPE_BGP_PEER_HOST, buf);
-
/* Set up peer's events and timers. */
if (! active && peer_active (peer))
bgp_timer_set (peer);
@@ -1016,6 +1061,26 @@ peer_create (union sockunion *su, struct bgp
*bgp, as_t local_as,
return peer;
}
+struct peer *
+peer_conf_interface_get(struct bgp *bgp, const char *conf_if, afi_t
afi,
+ safi_t safi)
+{
+ struct peer *peer;
+
+ peer = peer_lookup_by_conf_if (bgp, conf_if);
+ if (!peer)
+ {
+ if (bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4)
+ && afi == AFI_IP && safi == SAFI_UNICAST)
+ peer = peer_create (NULL, conf_if, bgp, bgp->as, 0, 0, 0);
+ else
+ peer = peer_create (NULL, conf_if, bgp, bgp->as, 0, afi,
safi);
+
+ }
+
+ return peer;
+}
+
/* Make accept BGP peer. Called from bgp_accept (). */
struct peer *
peer_create_accept (struct bgp *bgp)
@@ -1031,7 +1096,7 @@ peer_create_accept (struct bgp *bgp)
}
/* Change peer's AS number. */
-static void
+void
peer_as_change (struct peer *peer, as_t as)
{
bgp_peer_sort_t type;
@@ -1105,13 +1170,16 @@ peer_as_change (struct peer *peer, as_t as)
/* If peer does not exist, create new one. If peer already exists,
set AS number to the peer. */
int
-peer_remote_as (struct bgp *bgp, union sockunion *su, as_t *as,
- afi_t afi, safi_t safi)
+peer_remote_as (struct bgp *bgp, union sockunion *su, const char
*conf_if, as_t *as,
+ afi_t afi, safi_t safi)
{
struct peer *peer;
as_t local_as;
- peer = peer_lookup (bgp, su);
+ if (conf_if)
+ peer = peer_lookup_by_conf_if (bgp, conf_if);
+ else
+ peer = peer_lookup (bgp, su);
if (peer)
{
@@ -1148,6 +1216,8 @@ peer_remote_as (struct bgp *bgp, union sockunion
*su, as_t *as,
}
else
{
+ if (conf_if)
+ return BGP_ERR_NO_INTERFACE_CONFIG;
/* If the peer is not part of our confederation, and its not an
iBGP peer then spoof the source AS */
@@ -1163,9 +1233,9 @@ peer_remote_as (struct bgp *bgp, union sockunion
*su, as_t *as,
if (bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4)
&& afi == AFI_IP && safi == SAFI_UNICAST)
- peer_create (su, bgp, local_as, *as, 0, 0);
+ peer = peer_create (su, conf_if, bgp, local_as, *as, 0, 0);
else
- peer = peer_create (su, bgp, local_as, *as, afi, safi);
+ peer = peer_create (su, conf_if, bgp, local_as, *as, afi, safi);
}
return 0;
@@ -1907,10 +1977,9 @@ peer_group_remote_as_delete (struct peer_group
*group)
/* Bind specified peer to peer group. */
int
-peer_group_bind (struct bgp *bgp, union sockunion *su,
+peer_group_bind (struct bgp *bgp, union sockunion *su, struct peer
*peer,
struct peer_group *group, afi_t afi, safi_t safi, as_t *as)
{
- struct peer *peer;
int first_member = 0;
/* Check peer group's address family. */
@@ -1918,7 +1987,8 @@ peer_group_bind (struct bgp *bgp, union
sockunion *su,
return BGP_ERR_PEER_GROUP_AF_UNCONFIGURED;
/* Lookup the peer. */
- peer = peer_lookup (bgp, su);
+ if (!peer)
+ peer = peer_lookup (bgp, su);
/* Create a new peer. */
if (! peer)
@@ -1926,7 +1996,7 @@ peer_group_bind (struct bgp *bgp, union
sockunion *su,
if (! group->conf->as)
return BGP_ERR_PEER_GROUP_NO_REMOTE_AS;
- peer = peer_create (su, bgp, bgp->as, group->conf->as, afi,
safi);
+ peer = peer_create (su, NULL, bgp, bgp->as, group->conf->as,
afi, safi);
peer->group = group;
peer->af_group[afi][safi] = 1;
@@ -2386,6 +2456,35 @@ bgp_free (struct bgp *bgp)
}
struct peer *
+peer_lookup_by_conf_if (struct bgp *bgp, const char *conf_if)
+{
+ struct peer *peer;
+ struct listnode *node, *nnode;
+
+ if (!conf_if)
+ return NULL;
+
+ if (bgp != NULL)
+ {
+ for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
+ if (peer->conf_if && !strcmp(peer->conf_if, conf_if)
+ && ! CHECK_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER))
+ return peer;
+ }
+ else if (bm->bgp != NULL)
+ {
+ struct listnode *bgpnode, *nbgpnode;
+
+ for (ALL_LIST_ELEMENTS (bm->bgp, bgpnode, nbgpnode, bgp))
+ for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
+ if (peer->conf_if && !strcmp(peer->conf_if, conf_if)
+ && ! CHECK_FLAG (peer->sflags,
PEER_STATUS_ACCEPT_PEER))
+ return peer;
+ }
+ return NULL;
+}
+
+struct peer *
peer_lookup (struct bgp *bgp, union sockunion *su)
{
struct peer *peer;
@@ -2415,6 +2514,8 @@ peer_lookup (struct bgp *bgp, union sockunion
*su)
int
peer_active (struct peer *peer)
{
+ if (BGP_PEER_SU_UNSPEC(peer))
+ return 0;
if (peer->afc[AFI_IP][SAFI_UNICAST]
|| peer->afc[AFI_IP][SAFI_MULTICAST]
|| peer->afc[AFI_IP][SAFI_MPLS_VPN]
@@ -2880,7 +2981,7 @@ peer_ebgp_multihop_set (struct peer *peer, int
ttl)
struct listnode *node, *nnode;
struct peer *peer1;
- if (peer->sort == BGP_PEER_IBGP)
+ if (peer->sort == BGP_PEER_IBGP || peer->conf_if)
return 0;
/* see comment in peer_ttl_security_hops_set() */
@@ -5037,7 +5138,11 @@ bgp_config_write_peer (struct vty *vty, struct
bgp *bgp,
char buf[SU_ADDRSTRLEN];
char *addr;
- addr = peer->host;
+ if (peer->conf_if)
+ addr = peer->conf_if;
+ else
+ addr = peer->host;
+
if (peer_group_active (peer))
g_peer = peer->group->conf;
@@ -5046,6 +5151,9 @@ bgp_config_write_peer (struct vty *vty, struct
bgp *bgp,
************************************/
if (afi == AFI_IP && safi == SAFI_UNICAST)
{
+ if (peer->conf_if)
+ vty_out (vty, " neighbor %s interface%s", addr, VTY_NEWLINE);
+
/* remote-as. */
if (! peer_group_active (peer))
{
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index cf959c2..85347a3 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -371,11 +371,13 @@ struct peer
unsigned short port; /* Destination port for peer */
char *host; /* Printable address of the peer. */
union sockunion su; /* Sockunion address of the peer. */
+#define BGP_PEER_SU_UNSPEC(peer) (peer->su.sa.sa_family == AF_UNSPEC)
time_t uptime; /* Last Up/Down time */
time_t readtime; /* Last read time */
time_t resettime; /* Last reset time */
unsigned int ifindex; /* ifindex of the BGP connection. */
+ char *conf_if; /* neighbor interface config name. */
char *ifname; /* bind interface name. */
char *update_if;
union sockunion *update_source;
@@ -866,8 +868,9 @@ enum bgp_clear_type
#define BGP_ERR_TCPSIG_FAILED -29
#define BGP_ERR_NO_EBGP_MULTIHOP_WITH_TTLHACK -30
#define BGP_ERR_NO_IBGP_WITH_TTLHACK -31
-#define BGP_ERR_MAX -32
+#define BGP_ERR_NO_INTERFACE_CONFIG -32
#define BGP_ERR_CANNOT_HAVE_LOCAL_AS_SAME_AS_REMOTE_AS -33
+#define BGP_ERR_MAX -34
extern struct bgp_master *bm;
@@ -882,6 +885,10 @@ extern struct bgp *bgp_get_default (void);
extern struct bgp *bgp_lookup (as_t, const char *);
extern struct bgp *bgp_lookup_by_name (const char *);
extern struct peer *peer_lookup (struct bgp *, union sockunion *);
+extern struct peer *peer_lookup_by_conf_if (struct bgp *, const char
*);
+extern struct peer *peer_conf_interface_get(struct bgp *, const char
*, afi_t,
+ safi_t);
+extern void bgp_peer_conf_if_to_su_update (struct peer *);
extern struct peer_group *peer_group_lookup (struct bgp *, const char
*);
extern struct peer_group *peer_group_get (struct bgp *, const char *);
extern struct peer *peer_lookup_with_open (union sockunion *, as_t,
struct in_addr *,
@@ -900,8 +907,8 @@ extern struct peer *peer_unlock_with_caller(const
char *, struct peer *);
extern bgp_peer_sort_t peer_sort (struct peer *peer);
extern int peer_active (struct peer *);
extern int peer_active_nego (struct peer *);
-extern struct peer *peer_create(union sockunion *su, struct bgp *bgp,
as_t local_as,
- as_t remote_as, afi_t afi, safi_t safi);
+extern struct peer *peer_create(union sockunion *, const char *,
struct bgp *,
+ as_t, as_t, afi_t, safi_t);
extern struct peer *peer_create_accept (struct bgp *);
extern void peer_xfer_config (struct peer *dst, struct peer *src);
extern char *peer_uptime (time_t, char *, size_t);
@@ -948,8 +955,9 @@ extern int bgp_default_local_preference_unset
(struct bgp *);
extern int bgp_update_delay_active (struct bgp *);
extern int bgp_update_delay_configured (struct bgp *);
extern int peer_rsclient_active (struct peer *);
-
-extern int peer_remote_as (struct bgp *, union sockunion *, as_t *,
afi_t, safi_t);
+extern void peer_as_change (struct peer *, as_t);
+extern int peer_remote_as (struct bgp *, union sockunion *,const char
*, as_t *,
+ afi_t, safi_t);
extern int peer_group_remote_as (struct bgp *, const char *, as_t *);
extern int peer_delete (struct peer *peer);
extern int peer_group_delete (struct peer_group *);
@@ -958,8 +966,8 @@ extern int peer_group_remote_as_delete (struct
peer_group *);
extern int peer_activate (struct peer *, afi_t, safi_t);
extern int peer_deactivate (struct peer *, afi_t, safi_t);
-extern int peer_group_bind (struct bgp *, union sockunion *, struct
peer_group *,
- afi_t, safi_t, as_t *);
+extern int peer_group_bind (struct bgp *, union sockunion *, struct
peer *,
+ struct peer_group *, afi_t, safi_t, as_t
*);
extern int peer_group_unbind (struct bgp *, struct peer *, struct
peer_group *,
afi_t, safi_t);
diff --git a/lib/command.h b/lib/command.h
index 6030069..f98a609 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -502,7 +502,8 @@ struct cmd_token
#define NEIGHBOR_ADDR_STR "Neighbor address\nIPv6 address\n"
#define NEIGHBOR_CMD2 "neighbor (A.B.C.D|X:X::X:X|WORD) "
#define NO_NEIGHBOR_CMD2 "no neighbor (A.B.C.D|X:X::X:X|WORD) "
-#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor IPv6
address\nNeighbor tag\n"
+#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor IPv6
address\nInterface name or neighbor tag\n"
+#define NEIGHBOR_ADDR_STR3 "Neighbor address\nIPv6 address\nInterface
name\n"
#else
#define NEIGHBOR_CMD "neighbor A.B.C.D "
#define NO_NEIGHBOR_CMD "no neighbor A.B.C.D "
diff --git a/lib/if.c b/lib/if.c
index 4d4b656..71dd2b1 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -135,6 +135,12 @@ if_create_vrf (const char *name, int namelen,
vrf_id_t vrf_id)
ifp->connected = list_new ();
ifp->connected->del = (void (*) (void *)) connected_free;
+ ifp->nbr_connected = list_new ();
+ ifp->nbr_connected->del = (void (*) (void *)) nbr_connected_free;
+
+ /* Enable Link-detection by default */
+ SET_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION);
+
if (if_master.if_new_hook)
(*if_master.if_new_hook) (ifp);
@@ -156,6 +162,9 @@ if_delete_retain (struct interface *ifp)
/* Free connected address list */
list_delete_all_node (ifp->connected);
+
+ /* Free connected nbr address list */
+ list_delete_all_node (ifp->nbr_connected);
}
/* Delete and free interface structure. */
@@ -167,6 +176,7 @@ if_delete (struct interface *ifp)
if_delete_retain(ifp);
list_free (ifp->connected);
+ list_free (ifp->nbr_connected);
XFREE (MTYPE_IF, ifp);
}
@@ -793,6 +803,13 @@ connected_new (void)
return XCALLOC (MTYPE_CONNECTED, sizeof (struct connected));
}
+/* Allocate nbr connected structure. */
+struct nbr_connected *
+nbr_connected_new (void)
+{
+ return XCALLOC (MTYPE_NBR_CONNECTED, sizeof (struct
nbr_connected));
+}
+
/* Free connected structure. */
void
connected_free (struct connected *connected)
@@ -809,6 +826,30 @@ connected_free (struct connected *connected)
XFREE (MTYPE_CONNECTED, connected);
}
+/* Free nbr connected structure. */
+void
+nbr_connected_free (struct nbr_connected *connected)
+{
+ if (connected->address)
+ prefix_free (connected->address);
+
+ XFREE (MTYPE_NBR_CONNECTED, connected);
+}
+
+/* If same interface nbr address already exists... */
+struct nbr_connected *
+nbr_connected_check (struct interface *ifp, struct prefix *p)
+{
+ struct nbr_connected *ifc;
+ struct listnode *node;
+
+ for (ALL_LIST_ELEMENTS_RO (ifp->nbr_connected, node, ifc))
+ if (prefix_same (ifc->address, p))
+ return ifc;
+
+ return NULL;
+}
+
/* Print if_addr structure. */
static void __attribute__ ((unused))
connected_log (struct connected *connected, char *str)
@@ -835,6 +876,26 @@ connected_log (struct connected *connected, char
*str)
zlog (NULL, LOG_INFO, "%s", logbuf);
}
+/* Print if_addr structure. */
+static void __attribute__ ((unused))
+nbr_connected_log (struct nbr_connected *connected, char *str)
+{
+ struct prefix *p;
+ struct interface *ifp;
+ char logbuf[BUFSIZ];
+ char buf[BUFSIZ];
+
+ ifp = connected->ifp;
+ p = connected->address;
+
+ snprintf (logbuf, BUFSIZ, "%s interface %s %s %s/%d ",
+ str, ifp->name, prefix_family_str (p),
+ inet_ntop (p->family, &p->u.prefix, buf, BUFSIZ),
+ p->prefixlen);
+
+ zlog (NULL, LOG_INFO, "%s", logbuf);
+}
+
/* If two connected address has same prefix return 1. */
static int
connected_same_prefix (struct prefix *p1, struct prefix *p2)
diff --git a/lib/if.h b/lib/if.h
index ad85dca..ee25519 100644
--- a/lib/if.h
+++ b/lib/if.h
@@ -129,6 +129,9 @@ struct interface
/* Connected address list. */
struct list *connected;
+ /* Neighbor connected address list. */
+ struct list *nbr_connected;
+
/* Daemon specific interface data pointer. */
void *info;
@@ -187,6 +190,16 @@ struct connected
char *label;
};
+/* Nbr Connected address structure. */
+struct nbr_connected
+{
+ /* Attached interface. */
+ struct interface *ifp;
+
+ /* Address of connected network. */
+ struct prefix *address;
+};
+
/* Does the destination field contain a peer address? */
#define CONNECTED_PEER(C) CHECK_FLAG((C)->flags, ZEBRA_IFA_PEER)
@@ -328,6 +341,9 @@ extern struct connected
*connected_delete_by_prefix (struct interface *,
struct prefix *);
extern struct connected *connected_lookup_address (struct interface
*,
struct in_addr);
+extern struct nbr_connected *nbr_connected_new (void);
+extern void nbr_connected_free (struct nbr_connected *);
+struct nbr_connected *nbr_connected_check (struct interface *, struct
prefix *);
#ifndef HAVE_IF_NAMETOINDEX
extern unsigned int if_nametoindex (const char *);
diff --git a/lib/log.c b/lib/log.c
index cf9d87b..804881c 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -894,6 +894,8 @@ static const struct zebra_desc_table
command_types[] = {
DESC_ENTRY (ZEBRA_NEXTHOP_REGISTER),
DESC_ENTRY (ZEBRA_NEXTHOP_UNREGISTER),
DESC_ENTRY (ZEBRA_NEXTHOP_UPDATE),
+ DESC_ENTRY (ZEBRA_INTERFACE_NBR_ADDRESS_ADD),
+ DESC_ENTRY (ZEBRA_INTERFACE_NBR_ADDRESS_DELETE),
};
#undef DESC_ENTRY
diff --git a/lib/memtypes.c b/lib/memtypes.c
index c3e2545..fc0bcff 100644
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -26,6 +26,7 @@ struct memory_list memory_list_lib[] =
{ MTYPE_VTY_HIST, "VTY history" },
{ MTYPE_IF, "Interface" },
{ MTYPE_CONNECTED, "Connected" },
+ { MTYPE_NBR_CONNECTED, "Neighbor Connected" },
{ MTYPE_CONNECTED_LABEL, "Connected interface label" },
{ MTYPE_BUFFER, "Buffer" },
{ MTYPE_BUFFER_DATA, "Buffer data" },
@@ -151,6 +152,7 @@ struct memory_list memory_list_bgp[] =
{ MTYPE_BGP_NEXTHOP_CACHE, "BGP nexthop" },
{ MTYPE_BGP_CONFED_LIST, "BGP confed list" },
{ MTYPE_PEER_UPDATE_SOURCE, "BGP peer update interface" },
+ { MTYPE_PEER_CONF_IF, "BGP peer config interface" },
{ MTYPE_BGP_DAMP_INFO, "Dampening info" },
{ MTYPE_BGP_DAMP_ARRAY, "BGP Dampening array" },
{ MTYPE_BGP_REGEXP, "BGP regexp" },
diff --git a/lib/zclient.c b/lib/zclient.c
index 7596560..e37b009 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -880,6 +880,81 @@ zebra_interface_address_read (int type, struct
stream *s, vrf_id_t vrf_id)
return ifc;
}
+/*
+ * format of message for neighbor connected address is:
+ * 0
+ * 0 1 2 3 4 5 6 7
+ * +-+-+-+-+-+-+-+-+
+ * | type | ZEBRA_INTERFACE_NBR_ADDRESS_ADD or
+ * +-+-+-+-+-+-+-+-+ ZEBRA_INTERFACE_NBR_ADDRES_DELETE
+ * | |
+ * + +
+ * | ifindex |
+ * + +
+ * | |
+ * + +
+ * | |
+ * +-+-+-+-+-+-+-+-+
+ * | addr_family |
+ * +-+-+-+-+-+-+-+-+
+ * | addr... |
+ * : :
+ * | |
+ * +-+-+-+-+-+-+-+-+
+ * | addr_len | len of addr.
+ * +-+-+-+-+-+-+-+-+
+ */
+struct nbr_connected *
+zebra_interface_nbr_address_read (int type, struct stream *s)
+{
+ unsigned int ifindex;
+ struct interface *ifp;
+ struct prefix p;
+ struct nbr_connected *ifc;
+
+ /* Get interface index. */
+ ifindex = stream_getl (s);
+
+ /* Lookup index. */
+ ifp = if_lookup_by_index (ifindex);
+ if (ifp == NULL)
+ {
+ zlog_warn ("zebra_nbr_interface_address_read(%s): "
+ "Can't find interface by ifindex: %d ",
+ (type == ZEBRA_INTERFACE_NBR_ADDRESS_ADD? "ADD" :
"DELETE"),
+ ifindex);
+ return NULL;
+ }
+
+ p.family = stream_getc (s);
+ stream_get (&p.u.prefix, s, prefix_blen (&p));
+ p.prefixlen = stream_getc (s);
+
+ if (type == ZEBRA_INTERFACE_NBR_ADDRESS_ADD)
+ {
+ /* Currently only supporting P2P links, so any new RA source
address is
+ considered as the replacement of the previously learnt
Link-Local address. */
+ if (!(ifc = listnode_head(ifp->nbr_connected)))
+ {
+ ifc = nbr_connected_new ();
+ ifc->address = prefix_new ();
+ ifc->ifp = ifp;
+ listnode_add (ifp->nbr_connected, ifc);
+ }
+
+ prefix_copy(ifc->address, &p);
+ }
+ else
+ {
+ assert (type == ZEBRA_INTERFACE_NBR_ADDRESS_DELETE);
+
+ ifc = nbr_connected_check(ifp, &p);
+ if (ifc)
+ listnode_delete (ifp->nbr_connected, ifc);
+ }
+
+ return ifc;
+}
/* Zebra client message read function. */
static int
@@ -999,6 +1074,14 @@ zclient_read (struct thread *thread)
if (zclient->interface_address_delete)
(*zclient->interface_address_delete) (command, zclient, length,
vrf_id);
break;
+ case ZEBRA_INTERFACE_NBR_ADDRESS_ADD:
+ if (zclient->interface_nbr_address_add)
+ (*zclient->interface_nbr_address_add) (command, zclient, length,
vrf_id);
+ break;
+ case ZEBRA_INTERFACE_NBR_ADDRESS_DELETE:
+ if (zclient->interface_nbr_address_delete)
+ (*zclient->interface_nbr_address_delete) (command, zclient, length,
vrf_id);
+ break;
case ZEBRA_INTERFACE_UP:
if (zclient->interface_up)
(*zclient->interface_up) (command, zclient, length, vrf_id);
diff --git a/lib/zclient.h b/lib/zclient.h
index aaf86ac..4d3fc2c 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -85,6 +85,8 @@ struct zclient
int (*interface_down) (int, struct zclient *, uint16_t, vrf_id_t);
int (*interface_address_add) (int, struct zclient *, uint16_t,
vrf_id_t);
int (*interface_address_delete) (int, struct zclient *, uint16_t,
vrf_id_t);
+ int (*interface_nbr_address_add) (int, struct zclient *, uint16_t,
vrf_id_t);
+ int (*interface_nbr_address_delete) (int, struct zclient *,
uint16_t, vrf_id_t);
int (*ipv4_route_add) (int, struct zclient *, uint16_t, vrf_id_t);
int (*ipv4_route_delete) (int, struct zclient *, uint16_t, vrf_id_t);
int (*ipv6_route_add) (int, struct zclient *, uint16_t, vrf_id_t);
@@ -177,6 +179,7 @@ extern struct interface
*zebra_interface_state_read (struct stream *,
vrf_id_t);
extern struct connected *zebra_interface_address_read (int, struct
stream *,
vrf_id_t);
+extern struct nbr_connected *zebra_interface_nbr_address_read (int,
struct stream *);
extern void zebra_interface_if_set_value (struct stream *, struct
interface *);
extern void zebra_router_id_update_read (struct stream *s, struct
prefix *rid);
extern int zapi_ipv4_route (u_char, struct zclient *, struct
prefix_ipv4 *,
diff --git a/lib/zebra.h b/lib/zebra.h
index 63c97f4..726df44 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -418,7 +418,9 @@ struct in_pktinfo
#define ZEBRA_NEXTHOP_REGISTER 26
#define ZEBRA_NEXTHOP_UNREGISTER 27
#define ZEBRA_NEXTHOP_UPDATE 28
-#define ZEBRA_MESSAGE_MAX 29
+#define ZEBRA_INTERFACE_NBR_ADDRESS_ADD 29
+#define ZEBRA_INTERFACE_NBR_ADDRESS_DELETE 30
+#define ZEBRA_MESSAGE_MAX 31
/* Marker value used in new Zserv, in the byte location corresponding
* the command value in the old zserv header. To allow old and new
diff --git a/tests/aspath_test.c b/tests/aspath_test.c
index 0aa3e47..d103d2a 100644
--- a/tests/aspath_test.c
+++ b/tests/aspath_test.c
@@ -24,6 +24,7 @@
#include "vty.h"
#include "stream.h"
#include "privs.h"
+#include "linklist.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_aspath.h"
diff --git a/tests/bgp_capability_test.c b/tests/bgp_capability_test.c
index 96f18f0..a9dc613 100644
--- a/tests/bgp_capability_test.c
+++ b/tests/bgp_capability_test.c
@@ -25,6 +25,7 @@
#include "stream.h"
#include "privs.h"
#include "memory.h"
+#include "linklist.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_open.h"
diff --git a/tests/bgp_mp_attr_test.c b/tests/bgp_mp_attr_test.c
index d649e14..a2b023e 100644
--- a/tests/bgp_mp_attr_test.c
+++ b/tests/bgp_mp_attr_test.c
@@ -25,6 +25,7 @@
#include "stream.h"
#include "privs.h"
#include "memory.h"
+#include "linklist.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_attr.h"
diff --git a/tests/ecommunity_test.c b/tests/ecommunity_test.c
index f12aa71..2640407 100644
--- a/tests/ecommunity_test.c
+++ b/tests/ecommunity_test.c
@@ -24,6 +24,7 @@
#include "stream.h"
#include "privs.h"
#include "memory.h"
+#include "linklist.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_ecommunity.h"
diff --git a/zebra/interface.c b/zebra/interface.c
index 162439f..15c0e91 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -638,6 +638,21 @@ connected_dump_vty (struct vty *vty, struct
connected *connected)
vty_out (vty, "%s", VTY_NEWLINE);
}
+/* Dump interface neighbor address information to vty. */
+static void
+nbr_connected_dump_vty (struct vty *vty, struct nbr_connected
*connected)
+{
+ struct prefix *p;
+
+ /* Print interface address. */
+ p = connected->address;
+ vty_out (vty, " %s ", prefix_family_str (p));
+ prefix_vty_out (vty, p);
+ vty_out (vty, "/%d", p->prefixlen);
+
+ vty_out (vty, "%s", VTY_NEWLINE);
+}
+
#ifdef RTADV
/* Dump interface ND information to vty. */
static void
@@ -709,6 +724,7 @@ if_dump_vty (struct vty *vty, struct interface
*ifp)
struct sockaddr_dl *sdl;
#endif /* HAVE_STRUCT_SOCKADDR_DL */
struct connected *connected;
+ struct nbr_connected *nbr_connected;
struct listnode *node;
struct route_node *rn;
struct zebra_if *zebra_if;
@@ -809,6 +825,10 @@ if_dump_vty (struct vty *vty, struct interface
*ifp)
#ifdef RTADV
nd_dump_vty (vty, ifp);
#endif /* RTADV */
+ if (listhead(ifp->nbr_connected))
+ vty_out (vty, " Neighbor address(s):%s", VTY_NEWLINE);
+ for (ALL_LIST_ELEMENTS_RO (ifp->nbr_connected, node,
nbr_connected))
+ nbr_connected_dump_vty (vty, nbr_connected);
#ifdef HAVE_PROC_NET_DEV
/* Statistics print out using proc file system. */
diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index f5d5b4a..1806909 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -421,14 +421,83 @@ rtadv_process_solicit (struct interface *ifp)
}
static void
-rtadv_process_advert (void)
+rtadv_process_advert (u_char *msg, unsigned int len, struct interface
*ifp,
+ struct sockaddr_in6 *addr)
{
- zlog_info ("Router advertisement received");
+ struct nd_router_advert *radvert;
+ char addr_str[INET6_ADDRSTRLEN];
+ struct zebra_if *zif;
+
+ zif = ifp->info;
+
+ inet_ntop (AF_INET6, &addr->sin6_addr, addr_str, INET6_ADDRSTRLEN);
+
+ zlog_info ("Router advertisement received on %s from : %s",
ifp->name, addr_str);
+
+ if (len < sizeof(struct nd_router_advert)) {
+ zlog_warn("received icmpv6 RA packet with invalid length (%d)
from %s",
+ len, addr_str);
+ return;
+ }
+ if (!IN6_IS_ADDR_LINKLOCAL(&addr->sin6_addr)) {
+ zlog_warn("received icmpv6 RA packet with non-linklocal source
address from %s",
+ addr_str);
+ return;
+ }
+
+ radvert = (struct nd_router_advert *) msg;
+
+ if ((radvert->nd_ra_curhoplimit && zif->rtadv.AdvCurHopLimit) &&
+ (radvert->nd_ra_curhoplimit != zif->rtadv.AdvCurHopLimit))
+ {
+ zlog_warn("our AdvCurHopLimit on %s doesn't agree with %s",
+ ifp->name, addr_str);
+ }
+
+ if ((radvert->nd_ra_flags_reserved & ND_RA_FLAG_MANAGED) &&
+ !zif->rtadv.AdvManagedFlag)
+ {
+ zlog_warn("our AdvManagedFlag on %s doesn't agree with %s",
+ ifp->name, addr_str);
+ }
+
+ if ((radvert->nd_ra_flags_reserved & ND_RA_FLAG_OTHER) &&
+ !zif->rtadv.AdvOtherConfigFlag)
+ {
+ zlog_warn("our AdvOtherConfigFlag on %s doesn't agree with %s",
+ ifp->name, addr_str);
+ }
+
+ if ((radvert->nd_ra_reachable && zif->rtadv.AdvReachableTime) &&
+ (ntohl(radvert->nd_ra_reachable) !=
zif->rtadv.AdvReachableTime))
+ {
+ zlog_warn("our AdvReachableTime on %s doesn't agree with %s",
+ ifp->name, addr_str);
+ }
+
+ if ((radvert->nd_ra_retransmit && zif->rtadv.AdvRetransTimer) &&
+ (ntohl(radvert->nd_ra_retransmit) != (unsigned
int)zif->rtadv.AdvRetransTimer))
+ {
+ zlog_warn("our AdvRetransTimer on %s doesn't agree with %s",
+ ifp->name, addr_str);
+ }
+
+ /* Currently supporting only P2P links, so any new RA source
address is
+ considered as the replacement of the previously learnt
Link-Local address.
+ As per the RFC, lifetime zero is to be considered a delete */
+ if (ntohs(radvert->nd_ra_router_lifetime))
+ nbr_connected_replacement_add_ipv6(ifp, &addr->sin6_addr, 128);
+ else
+ nbr_connected_delete_ipv6(ifp, &addr->sin6_addr, 128);
+
+ return;
}
+
static void
rtadv_process_packet (u_char *buf, unsigned int len, unsigned int
ifindex,
- int hoplimit, vrf_id_t vrf_id)
+ int hoplimit, vrf_id_t vrf_id,
+ struct sockaddr_in6 *from)
{
struct icmp6_hdr *icmph;
struct interface *ifp;
@@ -479,7 +548,7 @@ rtadv_process_packet (u_char *buf, unsigned int
len, unsigned int ifindex,
if (icmph->icmp6_type == ND_ROUTER_SOLICIT)
rtadv_process_solicit (ifp);
else if (icmph->icmp6_type == ND_ROUTER_ADVERT)
- rtadv_process_advert ();
+ rtadv_process_advert (buf, len, ifp, from);
return;
}
@@ -509,7 +578,7 @@ rtadv_read (struct thread *thread)
return len;
}
- rtadv_process_packet (buf, (unsigned)len, ifindex, hoplimit,
zvrf->vrf_id);
+ rtadv_process_packet (buf, (unsigned)len, ifindex, hoplimit,
zvrf->vrf_id, &from);
return 0;
}
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 274bbd9..2f114a3 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -301,6 +301,143 @@ zsend_interface_address (int cmd, struct zserv
*client,
return zebra_server_send_message(client);
}
+static int
+zsend_interface_nbr_address (int cmd, struct zserv *client,
+ struct interface *ifp, struct
nbr_connected *ifc)
+{
+ int blen;
+ struct stream *s;
+ struct prefix *p;
+
+ /* Check this client need interface information. */
+ if (! client->ifinfo)
+ return 0;
+
+ s = client->obuf;
+ stream_reset (s);
+
+ zserv_create_header (s, cmd, ifp->vrf_id);
+ stream_putl (s, ifp->ifindex);
+
+ /* Prefix information. */
+ p = ifc->address;
+ stream_putc (s, p->family);
+ blen = prefix_blen (p);
+ stream_put (s, &p->u.prefix, blen);
+
+ /*
+ * XXX gnu version does not send prefixlen for
ZEBRA_INTERFACE_ADDRESS_DELETE
+ * but zebra_interface_address_delete_read() in the gnu version
+ * expects to find it
+ */
+ stream_putc (s, p->prefixlen);
+
+ /* Write packet size. */
+ stream_putw_at (s, 0, stream_get_endp (s));
+
+ return zebra_server_send_message(client);
+}
+
+/* Interface address addition. */
+static void
+zebra_interface_nbr_address_add_update (struct interface *ifp,
+ struct nbr_connected *ifc)
+{
+ struct listnode *node, *nnode;
+ struct zserv *client;
+ struct prefix *p;
+
+ if (IS_ZEBRA_DEBUG_EVENT)
+ {
+ char buf[INET6_ADDRSTRLEN];
+
+ p = ifc->address;
+ zlog_debug ("MESSAGE: ZEBRA_INTERFACE_NBR_ADDRESS_ADD %s/%d on
%s",
+ inet_ntop (p->family, &p->u.prefix, buf, INET6_ADDRSTRLEN),
+ p->prefixlen, ifc->ifp->name);
+ }
+
+ for (ALL_LIST_ELEMENTS (zebrad.client_list, node, nnode, client))
+ if (client->ifinfo)
+ zsend_interface_nbr_address (ZEBRA_INTERFACE_NBR_ADDRESS_ADD,
client, ifp, ifc);
+}
+
+/* Interface address deletion. */
+static void
+zebra_interface_nbr_address_delete_update (struct interface *ifp,
+ struct nbr_connected *ifc)
+{
+ struct listnode *node, *nnode;
+ struct zserv *client;
+ struct prefix *p;
+
+ if (IS_ZEBRA_DEBUG_EVENT)
+ {
+ char buf[INET6_ADDRSTRLEN];
+
+ p = ifc->address;
+ zlog_debug ("MESSAGE: ZEBRA_INTERFACE_NBR_ADDRESS_DELETE %s/%d
on %s",
+ inet_ntop (p->family, &p->u.prefix, buf, INET6_ADDRSTRLEN),
+ p->prefixlen, ifc->ifp->name);
+ }
+
+ for (ALL_LIST_ELEMENTS (zebrad.client_list, node, nnode, client))
+ if (client->ifinfo)
+ zsend_interface_nbr_address
(ZEBRA_INTERFACE_NBR_ADDRESS_DELETE, client, ifp, ifc);
+}
+
+/* Add new nbr connected IPv6 address if none exists already, or
replace the
+ existing one if an ifc entry is found on the interface. */
+void
+nbr_connected_replacement_add_ipv6 (struct interface *ifp, struct
in6_addr *address,
+ u_char prefixlen)
+{
+ struct nbr_connected *ifc;
+ struct prefix p;
+
+ p.family = AF_INET6;
+ IPV6_ADDR_COPY (&p.u.prefix, address);
+ p.prefixlen = prefixlen;
+
+ if (nbr_connected_check(ifp, &p))
+ return;
+
+ if (!(ifc = listnode_head(ifp->nbr_connected)))
+ {
+ /* new addition */
+ ifc = nbr_connected_new ();
+ ifc->address = prefix_new();
+ ifc->ifp = ifp;
+ listnode_add (ifp->nbr_connected, ifc);
+ }
+
+ prefix_copy(ifc->address, &p);
+
+ zebra_interface_nbr_address_add_update (ifp, ifc);
+}
+
+void
+nbr_connected_delete_ipv6 (struct interface *ifp, struct in6_addr
*address,
+ u_char prefixlen)
+{
+ struct nbr_connected *ifc;
+ struct prefix p;
+
+ p.family = AF_INET6;
+ IPV6_ADDR_COPY (&p.u.prefix, address);
+ p.prefixlen = prefixlen;
+
+ ifc = nbr_connected_check(ifp, &p);
+ if (!ifc)
+ return;
+
+ listnode_delete (ifp->nbr_connected, ifc);
+
+ zebra_interface_nbr_address_delete_update (ifp, ifc);
+
+ nbr_connected_free (ifc);
+}
+
/*
* The cmd passed to zsend_interface_update may be ZEBRA_INTERFACE_UP
or
* ZEBRA_INTERFACE_DOWN.
@@ -843,6 +980,7 @@ zread_interface_add (struct zserv *client, u_short
length, vrf_id_t vrf_id)
struct listnode *cnode, *cnnode;
struct interface *ifp;
struct connected *c;
+ struct nbr_connected *nc;
/* Interface information is needed. */
vrf_bitmap_set (client->ifinfo, vrf_id);
@@ -863,6 +1001,13 @@ zread_interface_add (struct zserv *client,
u_short length, vrf_id_t vrf_id)
ifp, c) < 0))
return -1;
}
+ for (ALL_LIST_ELEMENTS (ifp->nbr_connected, cnode, cnnode, nc))
+ {
+ if (zsend_interface_nbr_address (ZEBRA_INTERFACE_NBR_ADDRESS_ADD,
client,
+ ifp, nc) < 0)
+ return -1;
+ }
+
}
return 0;
}
diff --git a/zebra/zserv.h b/zebra/zserv.h
index 1ccc199..a674267 100644
--- a/zebra/zserv.h
+++ b/zebra/zserv.h
@@ -108,6 +108,9 @@ extern int zsend_interface_add (struct zserv *,
struct interface *);
extern int zsend_interface_delete (struct zserv *, struct interface
*);
extern int zsend_interface_address (int, struct zserv *, struct
interface *,
struct connected *);
+extern void nbr_connected_replacement_add_ipv6 (struct interface *,
+ struct in6_addr *,
u_char);
+extern void nbr_connected_delete_ipv6 (struct interface *, struct
in6_addr *, u_char);
extern int zsend_interface_update (int, struct zserv *, struct
interface *);
extern int zsend_route_multipath (int, struct zserv *, struct prefix
*,
struct rib *);
--
1.7.10.4
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
