diff options
| author | Paul Jakma <paul.jakma@hpe.com> | 2016-02-05 14:57:17 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@hpe.com> | 2016-02-26 14:11:48 +0000 |
| commit | c49a2747f6a6199dba27c0c413f4de6112fa649e (patch) | |
| tree | 27bc97363bf8e3f25535f39c030e6da7b37e4a0e /bgpd/bgp_packet.c | |
| parent | e98dce60cea213a4155a0db60b463e40c67aa77f (diff) | |
| download | quagga-c49a2747f6a6199dba27c0c413f4de6112fa649e.tar.bz2 quagga-c49a2747f6a6199dba27c0c413f4de6112fa649e.tar.xz | |
bgpd: make bgp_nlri_parse_encap conform with other nlri_parse funcs
* bgp_encap.{c,h} (bgp_nlri_parse_encap) afi is already in the NLRI argument.
update or withdraw is signalled by attr being non-NULL or NULL.
* bgp_packet.c: (update_receive) fixup to match, and also make the attr
argument conform with NLRI_ATTR_ARG for correct error handling on
optional, transitive, partial, attributes.
Diffstat (limited to 'bgpd/bgp_packet.c')
| -rw-r--r-- | bgpd/bgp_packet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 26e4d8ff..b8a38fa5 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -1943,12 +1943,12 @@ bgp_update_receive (struct peer *peer, bgp_size_t size) if (mp_update.length && mp_update.afi == AFI_IP && mp_update.safi == SAFI_ENCAP) - bgp_nlri_parse_encap (mp_update.afi, peer, &attr, &mp_update, 0); + bgp_nlri_parse_encap (peer, NLRI_ATTR_ARG, &mp_update); if (mp_withdraw.length && mp_withdraw.afi == AFI_IP && mp_withdraw.safi == SAFI_ENCAP) - bgp_nlri_parse_encap (mp_withdraw.afi, peer, &attr, &mp_withdraw, 1); + bgp_nlri_parse_encap (peer, NULL, &mp_withdraw); if (! withdraw_len && mp_withdraw.afi == AFI_IP @@ -1967,12 +1967,12 @@ bgp_update_receive (struct peer *peer, bgp_size_t size) if (mp_update.length && mp_update.afi == AFI_IP6 && mp_update.safi == SAFI_ENCAP) - bgp_nlri_parse_encap (mp_update.afi, peer, &attr, &mp_update, 0); + bgp_nlri_parse_encap (peer, NLRI_ATTR_ARG, &mp_update); if (mp_withdraw.length && mp_withdraw.afi == AFI_IP6 && mp_withdraw.safi == SAFI_ENCAP) - bgp_nlri_parse_encap (mp_withdraw.afi, peer, &attr, &mp_withdraw, 1); + bgp_nlri_parse_encap (peer, NULL, &mp_withdraw); if (! withdraw_len && mp_withdraw.afi == AFI_IP6 |