summaryrefslogtreecommitdiffstats
path: root/bgpd/bgp_updgrp_adv.c
diff options
context:
space:
mode:
authorLou Berger <lberger@labn.net>2016-01-12 19:42:02 +0100
committervivek <vivek@cumulusnetworks.com>2016-06-12 00:36:42 +0200
commit587ff0fd881e3532226afa7a007a5a8ff7b89871 (patch)
tree365b73c9a50bcec3fa97763afd691e929eeb6b6e /bgpd/bgp_updgrp_adv.c
parentbgpd: Fixes and updates for VPNv6 (diff)
downloadfrr-587ff0fd881e3532226afa7a007a5a8ff7b89871.tar.xz
frr-587ff0fd881e3532226afa7a007a5a8ff7b89871.zip
bgpd: encap: add encap SAFI (RFC5512)
Adds RFC5512 and Encapsulation Attribute. Signed-off-by: Lou Berger <lberger@labn.net> (cherry picked from commit 298cc2f688dbadf0a447fcd06ae8e20fa5006ce4) Conflicts: bgpd/Makefile.am bgpd/bgp_attr.c bgpd/bgp_open.c bgpd/bgp_packet.c bgpd/bgp_route.c bgpd/bgp_vty.c bgpd/bgpd.c
Diffstat (limited to 'bgpd/bgp_updgrp_adv.c')
-rw-r--r--bgpd/bgp_updgrp_adv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index e3c4beb30..4b684be1b 100644
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -602,6 +602,7 @@ subgroup_announce_table (struct update_subgroup *subgrp,
table = peer->bgp->rib[afi][safi];
if (safi != SAFI_MPLS_VPN
+ && safi != SAFI_ENCAP
&& CHECK_FLAG (peer->af_flags[afi][safi], PEER_FLAG_DEFAULT_ORIGINATE))
subgroup_default_originate (subgrp, 0);
@@ -664,7 +665,8 @@ subgroup_announce_route (struct update_subgroup *subgrp)
PEER_STATUS_ORF_WAIT_REFRESH))
return;
- if (SUBGRP_SAFI (subgrp) != SAFI_MPLS_VPN)
+ if (SUBGRP_SAFI (subgrp) != SAFI_MPLS_VPN &&
+ SUBGRP_SAFI (subgrp) != SAFI_ENCAP)
subgroup_announce_table (subgrp, NULL);
else
for (rn = bgp_table_top (update_subgroup_rib (subgrp)); rn;