diff options
| author | Chris Hall <GMCH@hestia.halldom.com> | 2010-08-03 16:01:23 +0100 |
|---|---|---|
| committer | Chris Hall <GMCH@hestia.halldom.com> | 2010-08-03 16:01:23 +0100 |
| commit | 4af8f7adc4fe05de92cb11912af029c623feb821 (patch) | |
| tree | 6aaa54cd2bc1b9a20bb1eca6ac381778e08ab8b8 /bgpd/bgp_open_state.c | |
| parent | 1235bafb2cd8a5ae2e9d2f5fb149bfc5ea74969a (diff) | |
| download | quagga-4af8f7adc4fe05de92cb11912af029c623feb821.tar.bz2 quagga-4af8f7adc4fe05de92cb11912af029c623feb821.tar.xz | |
Fix neighbor override-capability
Update version to "ex04".
Diffstat (limited to 'bgpd/bgp_open_state.c')
| -rw-r--r-- | bgpd/bgp_open_state.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/bgpd/bgp_open_state.c b/bgpd/bgp_open_state.c index c08160eb..49d1604b 100644 --- a/bgpd/bgp_open_state.c +++ b/bgpd/bgp_open_state.c @@ -353,19 +353,16 @@ bgp_peer_open_state_receive(bgp_peer peer) qbs = open_recv->can_mp_ext ; } - if (! CHECK_FLAG (peer->flags, PEER_FLAG_OVERRIDE_CAPABILITY)) - { - for (afi = qAFI_min ; afi <= qAFI_max ; ++afi) - for (safi = qSAFI_min ; safi <= qSAFI_max ; ++safi) + for (afi = qAFI_min ; afi <= qAFI_max ; ++afi) + for (safi = qSAFI_min ; safi <= qSAFI_max ; ++safi) + { + qafx_bit_t qb = qafx_bit_from_qAFI_qSAFI(afi, safi) ; + if (qb & qbs) { - qafx_bit_t qb = qafx_bit_from_qAFI_qSAFI(afi, safi) ; - if (qb & qbs) - { - peer->afc_recv[afi][safi] = recv ; - peer->afc_nego[afi][safi] = peer->afc[afi][safi] ; - } - } - } + peer->afc_recv[afi][safi] = recv ; + peer->afc_nego[afi][safi] = peer->afc[afi][safi] ; + } ; + } ; /* Route refresh. */ if (open_recv->can_r_refresh & bgp_form_pre) |