proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-13 17:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Use AF_UNSPEC instead of setting to 0

Browse Source 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-02-07 13:16:59 -05:00
parent 35215a013a
commit c7ca5ccf6f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/rfapi/rfapi_import.c
View File

@ -388,7 +388,7 @@ int rfapiGetVncTunnelUnAddr(struct attr *attr, struct prefix *p)
return 0; return 0;
/* MPLS carries UN address in next hop */ /* MPLS carries UN address in next hop */
rfapiNexthop2Prefix(attr, p); rfapiNexthop2Prefix(attr, p);
if (p->family != 0) if (p->family != AF_UNSPEC)
return 0; return 0;
return ENOENT; return ENOENT;
@ -457,7 +457,7 @@ int rfapiGetUnAddrOfVpnBi(struct bgp_path_info *bpi, struct prefix *p)
return 0; return 0;
default: default:
if (p) if (p)
p->family = 0; p->family = AF_UNSPEC;
#ifdef DEBUG_ENCAP_MONITOR #ifdef DEBUG_ENCAP_MONITOR
vnc_zlog_debug_verbose( vnc_zlog_debug_verbose(
"%s: bpi->extra->vnc.import.un_family is 0, no UN addr", "%s: bpi->extra->vnc.import.un_family is 0, no UN addr",
@ -1155,7 +1155,7 @@ static int rfapiVpnBiSamePtUn(struct bgp_path_info *bpi1,
bpi1->extra->vnc.import.un.addr6; bpi1->extra->vnc.import.un.addr6;
break; break;
default: default:
pfx_un1.family = 0; pfx_un1.family = AF_UNSPEC;
break; break;
} }
} }
@ -1174,13 +1174,13 @@ static int rfapiVpnBiSamePtUn(struct bgp_path_info *bpi1,
bpi2->extra->vnc.import.un.addr6; bpi2->extra->vnc.import.un.addr6;
break; break;
default: default:
pfx_un2.family = 0; pfx_un2.family = AF_UNSPEC;
break; break;
} }
} }
} }
if (pfx_un1.family == 0 || pfx_un2.family == 0) if (pfx_un1.family == AF_UNSPEC || pfx_un2.family == AF_UNSPEC)
return 0; return 0;
if (pfx_un1.family != pfx_un2.family) if (pfx_un1.family != pfx_un2.family)
@ -1358,7 +1358,7 @@ rfapiRouteInfo2NextHopEntry(struct rfapi_ip_prefix *rprefix,
struct prefix p; struct prefix p;
/* MPLS carries UN address in next hop */ /* MPLS carries UN address in next hop */
rfapiNexthop2Prefix(bpi->attr, &p); rfapiNexthop2Prefix(bpi->attr, &p);
if (p.family != 0) { if (p.family != AF_UNSPEC) {
rfapiQprefix2Raddr(&p, &new->un_address); rfapiQprefix2Raddr(&p, &new->un_address);
have_vnc_tunnel_un = 1; have_vnc_tunnel_un = 1;
} }
@ -2609,7 +2609,7 @@ static void rfapiCopyUnEncap2VPN(struct bgp_path_info *encap_bpi,
default: default:
zlog_warn("%s: invalid encap nexthop length: %d", __func__, zlog_warn("%s: invalid encap nexthop length: %d", __func__,
encap_bpi->attr->mp_nexthop_len); encap_bpi->attr->mp_nexthop_len);
vpn_bpi->extra->vnc.import.un_family = 0; vpn_bpi->extra->vnc.import.un_family = AF_UNSPEC;
break; break;
} }
} }
@ -2634,7 +2634,7 @@ rfapiWithdrawEncapUpdateCachedUn(struct rfapi_import_table *import_table,
__func__); __func__);
return 1; return 1;
} }
vpn_bpi->extra->vnc.import.un_family = 0; vpn_bpi->extra->vnc.import.un_family = AF_UNSPEC;
memset(&vpn_bpi->extra->vnc.import.un, 0, memset(&vpn_bpi->extra->vnc.import.un, 0,
sizeof(vpn_bpi->extra->vnc.import.un)); sizeof(vpn_bpi->extra->vnc.import.un));
if (CHECK_FLAG(vpn_bpi->flags, BGP_PATH_VALID)) { if (CHECK_FLAG(vpn_bpi->flags, BGP_PATH_VALID)) {
@ -3626,7 +3626,7 @@ void rfapiBgpInfoFilteredImportVPN(
/* Not a big deal, just means VPN route got here first */ /* Not a big deal, just means VPN route got here first */
vnc_zlog_debug_verbose("%s: no encap route for vn addr %pFX", vnc_zlog_debug_verbose("%s: no encap route for vn addr %pFX",
__func__, &vn_prefix); __func__, &vn_prefix);
info_new->extra->vnc.import.un_family = 0; info_new->extra->vnc.import.un_family = AF_UNSPEC;
} }
if (rn) { if (rn) {

2
bgpd/rfapi/rfapi_rib.c
View File

@ -1950,7 +1950,7 @@ rfapiRibPreload(struct bgp *bgp, struct rfapi_descriptor *rfd,
&& RFAPI_HOST_PREFIX(&rk.aux_prefix)) { && RFAPI_HOST_PREFIX(&rk.aux_prefix)) {
/* mark as "none" if nhp->prefix is 0/32 or /* mark as "none" if nhp->prefix is 0/32 or
* 0/128 */ * 0/128 */
rk.aux_prefix.family = 0; rk.aux_prefix.family = AF_UNSPEC;
} }
} }