diff options
| author | hasso <hasso> | 2005-02-01 22:01:48 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2005-02-01 22:01:48 +0000 |
| commit | 0900187af9134f28ea3bb9a3a69c0a472c8ad784 (patch) | |
| tree | 8749f6d3dfc5c369ab44694d820dd1f1be358aac /bgpd/bgp_open.c | |
| parent | 864db66bd2ea9bd35f0d7e212d91a1a4dcf4e7bd (diff) | |
| download | quagga-0900187af9134f28ea3bb9a3a69c0a472c8ad784.tar.bz2 quagga-0900187af9134f28ea3bb9a3a69c0a472c8ad784.tar.xz | |
* bgp_open.c, bgp_packet.c, bgp_vty.c, bgpd.[ch]: Remove "no neighbor
capability route-refresh" commands. Route refresh capability is sent
anyway now. Preserve dummy deprecated commands.
[merge from GNU Zebra]
Diffstat (limited to 'bgpd/bgp_open.c')
| -rw-r--r-- | bgpd/bgp_open.c | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index 86f48c44..8321bcfa 100644 --- a/bgpd/bgp_open.c +++ b/bgpd/bgp_open.c @@ -745,23 +745,6 @@ bgp_open_capability (struct stream *s, struct peer *peer) || CHECK_FLAG (peer->flags, PEER_FLAG_DONT_CAPABILITY)) return; - /* When the peer is IPv4 unicast only, do not send capability. */ - if (! peer->afc[AFI_IP][SAFI_MULTICAST] - && ! peer->afc[AFI_IP][SAFI_MPLS_VPN] - && ! peer->afc[AFI_IP6][SAFI_UNICAST] - && ! peer->afc[AFI_IP6][SAFI_MULTICAST] - && CHECK_FLAG (peer->flags, PEER_FLAG_NO_ROUTE_REFRESH_CAP) - && ! CHECK_FLAG (peer->af_flags[AFI_IP][SAFI_UNICAST], - PEER_FLAG_ORF_PREFIX_SM) - && ! CHECK_FLAG (peer->af_flags[AFI_IP][SAFI_UNICAST], - PEER_FLAG_ORF_PREFIX_RM) - && ! CHECK_FLAG (peer->af_flags[AFI_IP][SAFI_MULTICAST], - PEER_FLAG_ORF_PREFIX_SM) - && ! CHECK_FLAG (peer->af_flags[AFI_IP][SAFI_MULTICAST], - PEER_FLAG_ORF_PREFIX_RM) - && ! CHECK_FLAG (peer->flags, PEER_FLAG_DYNAMIC_CAPABILITY)) - return; - /* IPv4 unicast. */ if (peer->afc[AFI_IP][SAFI_UNICAST]) { @@ -826,18 +809,15 @@ bgp_open_capability (struct stream *s, struct peer *peer) #endif /* HAVE_IPV6 */ /* Route refresh. */ - if (! CHECK_FLAG (peer->flags, PEER_FLAG_NO_ROUTE_REFRESH_CAP)) - { - SET_FLAG (peer->cap, PEER_CAP_REFRESH_ADV); - stream_putc (s, BGP_OPEN_OPT_CAP); - stream_putc (s, CAPABILITY_CODE_REFRESH_LEN + 2); - stream_putc (s, CAPABILITY_CODE_REFRESH_OLD); - stream_putc (s, CAPABILITY_CODE_REFRESH_LEN); - stream_putc (s, BGP_OPEN_OPT_CAP); - stream_putc (s, CAPABILITY_CODE_REFRESH_LEN + 2); - stream_putc (s, CAPABILITY_CODE_REFRESH); - stream_putc (s, CAPABILITY_CODE_REFRESH_LEN); - } + SET_FLAG (peer->cap, PEER_CAP_REFRESH_ADV); + stream_putc (s, BGP_OPEN_OPT_CAP); + stream_putc (s, CAPABILITY_CODE_REFRESH_LEN + 2); + stream_putc (s, CAPABILITY_CODE_REFRESH_OLD); + stream_putc (s, CAPABILITY_CODE_REFRESH_LEN); + stream_putc (s, BGP_OPEN_OPT_CAP); + stream_putc (s, CAPABILITY_CODE_REFRESH_LEN + 2); + stream_putc (s, CAPABILITY_CODE_REFRESH); + stream_putc (s, CAPABILITY_CODE_REFRESH_LEN); /* ORF capability. */ for (afi = AFI_IP ; afi < AFI_MAX ; afi++) |