diff options
author | Daniel Walton <dwalton@cumulusnetworks.com> | 2015-11-30 22:19:39 +0100 |
---|---|---|
committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2015-11-30 22:19:39 +0100 |
commit | 4c48cf63ae4c2072b206bea7b931e5a237aa97af (patch) | |
tree | 067cb64c035cfc8cf068270695a8aa91c37b2a6d /bgpd/bgpd.h | |
parent | Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga in... (diff) | |
download | frr-4c48cf63ae4c2072b206bea7b931e5a237aa97af.tar.xz frr-4c48cf63ae4c2072b206bea7b931e5a237aa97af.zip |
BGP: 'neighbor swpX interface peer-group FOO' is needed to simplify swpX
configuration
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Dinesh Dutt <ddutt@cumulusnetworks.com>
Ticket: CM-8321
This allows the user to configure the peer-group as an option for the
"neighbor swpX interface" command.
{code}
!
router bgp 100
neighbor FOO peer-group
neighbor FOO remote-as external
neighbor swp1 interface
neighbor swp2 interface v6only
neighbor swp3 interface peer-group FOO
neighbor swp4 interface v6only peer-group FOO
!
address-family ipv4 unicast
neighbor FOO activate
neighbor swp1 activate
neighbor swp2 activate
exit-address-family
!
{code}
Note that if the user configures
{code}
neighbor swp5 interface
neighbor swp5 peer-group FOO
{code}
We will display that as "neighbor swp5 interface peer-group FOO". It
did not seem worth tracking that the peer-group was entered via two
lines instead of one.
Diffstat (limited to 'bgpd/bgpd.h')
-rw-r--r-- | bgpd/bgpd.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index 8256d2a89..c8bdb3f92 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -1107,8 +1107,6 @@ 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_lookup_by_hostname(struct bgp *, const char *); -extern struct peer *peer_conf_interface_get(struct bgp *, const char *, afi_t, - safi_t, int v6only); extern void bgp_peer_conf_if_to_su_update (struct peer *); extern int peer_group_listen_range_del(struct peer_group *, struct prefix *); extern struct peer_group *peer_group_lookup (struct bgp *, const char *); @@ -1150,6 +1148,7 @@ extern void bgp_master_init (void); extern void bgp_init (void); extern void bgp_route_map_init (void); +extern void bgp_session_reset (struct peer *); extern int bgp_option_set (int); extern int bgp_option_unset (int); |