summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLou Berger <lberger@labn.net>2019-05-15 11:47:42 +0200
committerGitHub <noreply@github.com>2019-05-15 11:47:42 +0200
commitcf277e9e7977616272101517633d797c5b100024 (patch)
tree2d3c1d8c2f57a5c1c7f7733ef1ad98ec37e937e3
parentMerge pull request #4296 from adharkar/frr-master-fib_prefix (diff)
parentbgpd: Fix non-compilation of bgp_attr_extcom_tunnel_type (diff)
downloadfrr-cf277e9e7977616272101517633d797c5b100024.tar.xz
frr-cf277e9e7977616272101517633d797c5b100024.zip
Merge pull request #4341 from donaldsharp/bgp_attr_should_actually_compile
bgpd: Fix non-compilation of bgp_attr_extcom_tunnel_type
-rw-r--r--bgpd/bgp_attr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 0e9d38715..bdcce596c 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -2783,16 +2783,16 @@ bgp_attr_parse_ret_t bgp_attr_parse(struct peer *peer, struct attr *attr,
* Extract the tunnel type from extended community
*/
void bgp_attr_extcom_tunnel_type(struct attr *attr,
- bgp_encap_types *tunnel_type)
+ bgp_encap_types *tunnel_type)
{
struct ecommunity *ecom;
int i;
if (!attr)
- return false;
+ return;
ecom = attr->ecommunity;
if (!ecom || !ecom->size)
- return false;
+ return;
for (i = 0; i < ecom->size; i++) {
uint8_t *pnt;
@@ -2805,10 +2805,10 @@ void bgp_attr_extcom_tunnel_type(struct attr *attr,
sub_type == ECOMMUNITY_OPAQUE_SUBTYPE_ENCAP))
continue;
*tunnel_type = ((pnt[6] << 8) | pnt[7]);
- return true;
+ return;
}
- return false;
+ return;
}
size_t bgp_packet_mpattr_start(struct stream *s, struct peer *peer, afi_t afi,