diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 00:29:35 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 00:29:35 +0100 |
| commit | e20f7ccd9e110fcd5deb945f8d23922efd8b0822 (patch) | |
| tree | 89b61ee61ac306817dc19b9313806bf2562b1c1b /bgpd/bgp_packet.c | |
| parent | 6481583be322b0ba223a0140500a0a6d50546dd9 (diff) | |
| download | quagga-ex14.tar.bz2 quagga-ex14.tar.xz | |
Bring "ex" version up to date with 0.99.18ex14
Release: 0.99.18ex14
Also fixes issue with unknown attributes -- does not release them prematurely.
Contains the "bgpd: New show commands for improved view and address family support", which is post 0.99.18. (But not RFC 5082 GTSM.)
Diffstat (limited to 'bgpd/bgp_packet.c')
| -rw-r--r-- | bgpd/bgp_packet.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 62d76c60..2cad6ab2 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -173,9 +173,10 @@ bgp_update_packet (struct peer *peer, afi_t afi, safi_t safi) if (rn->prn) prd = (struct prefix_rd *) &rn->prn->p; - if (binfo && binfo->extra) + if (binfo) { - tag = binfo->extra->tag; + if (binfo->extra) + tag = binfo->extra->tag; from = binfo->peer; } @@ -1809,12 +1810,6 @@ bgp_notify_receive (struct peer *peer, bgp_size_t size) bgp_notify.subcode == BGP_NOTIFY_OPEN_UNSUP_PARAM ) UNSET_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN); - /* Also apply to Unsupported Capability until remote router support - capability. */ - if (bgp_notify.code == BGP_NOTIFY_OPEN_ERR && - bgp_notify.subcode == BGP_NOTIFY_OPEN_UNSUP_CAPBL) - UNSET_FLAG (peer->sflags, PEER_STATUS_CAPABILITY_OPEN); - BGP_EVENT_ADD (peer, Receive_NOTIFICATION_message); } #endif |