proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-13 09:04:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd rfapi: fix TT handling broken on Sat Jan 28 18:57:28 2017 -0500

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2017-02-02 19:50:36 -05:00
parent 56041a7706
commit 8f7f12f9d1
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bgpd/rfapi/vnc_import_bgp.c
View File

@ -466,6 +466,10 @@ vnc_import_bgp_add_route_mode_resolve_nve_one_bi (
struct bgp_attr_encap_subtlv *encaptlvs; struct bgp_attr_encap_subtlv *encaptlvs;
uint32_t label = 0; uint32_t label = 0;
struct rfapi_un_option optary[3];
struct rfapi_un_option *opt = NULL;
int cur_opt = 0;
vnc_zlog_debug_verbose ("%s: entry", __func__); vnc_zlog_debug_verbose ("%s: entry", __func__);
if (bi->type != ZEBRA_ROUTE_BGP && bi->type != ZEBRA_ROUTE_BGP_DIRECT) if (bi->type != ZEBRA_ROUTE_BGP && bi->type != ZEBRA_ROUTE_BGP_DIRECT)
@ -509,6 +513,16 @@ vnc_import_bgp_add_route_mode_resolve_nve_one_bi (
if (bi->attr && bi->attr->extra) if (bi->attr && bi->attr->extra)
{ {
encaptlvs = bi->attr->extra->vnc_subtlvs; encaptlvs = bi->attr->extra->vnc_subtlvs;
if (bi->attr->extra->encap_tunneltype != BGP_ENCAP_TYPE_MPLS)
{
if (opt != NULL)
opt->next = &optary[cur_opt];
opt = &optary[cur_opt++];
memset (opt, 0, sizeof (struct rfapi_un_option));
opt->type = RFAPI_UN_OPTION_TYPE_TUNNELTYPE;
opt->v.tunnel.type = bi->attr->extra->encap_tunneltype;
/* TBD parse bi->attr->extra->encap_subtlvs */
}
} }
else else
{ {
@ -533,7 +547,7 @@ vnc_import_bgp_add_route_mode_resolve_nve_one_bi (
local_pref, local_pref,
plifetime, plifetime,
(struct bgp_tea_options *) encaptlvs, /* RFP options */ (struct bgp_tea_options *) encaptlvs, /* RFP options */
NULL, opt,
NULL, NULL,
new_ecom, new_ecom,
med, /* NULL => don't set med */ med, /* NULL => don't set med */