proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-10-19 18:07:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Store data in final temp variable

Browse Source 
There is no need to have a temp variable to then store that
data in another temporary variable.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2020-02-05 21:30:03 -05:00
parent af34d2da11
commit e26c305530
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bgpd/bgp_nexthop.c
View File

@ -473,7 +473,6 @@ static void bgp_connected_cleanup(struct route_table *table,
int bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, uint8_t sub_type, int bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, uint8_t sub_type,
struct attr *attr, struct bgp_node *rn) struct attr *attr, struct bgp_node *rn)
{ {
struct prefix p = {0};
uint8_t new_afi = afi == AFI_IP ? AF_INET : AF_INET6; uint8_t new_afi = afi == AFI_IP ? AF_INET : AF_INET6;
struct bgp_addr tmp_addr = {0}, *addr = NULL; struct bgp_addr tmp_addr = {0}, *addr = NULL;
struct tip_addr tmp_tip, *tip = NULL; struct tip_addr tmp_tip, *tip = NULL;
@ -486,46 +485,45 @@ int bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, uint8_t sub_type,
if (!is_bgp_static_route) if (!is_bgp_static_route)
new_afi = BGP_ATTR_NEXTHOP_AFI_IP6(attr) ? AF_INET6 : AF_INET; new_afi = BGP_ATTR_NEXTHOP_AFI_IP6(attr) ? AF_INET6 : AF_INET;
p.family = new_afi; tmp_addr.p.family = new_afi;
switch (new_afi) { switch (new_afi) {
case AF_INET: case AF_INET:
if (is_bgp_static_route) { if (is_bgp_static_route) {
p.u.prefix4 = rn->p.u.prefix4; tmp_addr.p.u.prefix4 = rn->p.u.prefix4;
p.prefixlen = rn->p.prefixlen; tmp_addr.p.prefixlen = rn->p.prefixlen;
} else { } else {
/* Here we need to find out which nexthop to be used*/ /* Here we need to find out which nexthop to be used*/
if (attr->flag & if (attr->flag &
ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) { ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) {
p.u.prefix4 = attr->nexthop; tmp_addr.p.u.prefix4 = attr->nexthop;
p.prefixlen = IPV4_MAX_BITLEN; tmp_addr.p.prefixlen = IPV4_MAX_BITLEN;
} else if ((attr->mp_nexthop_len) && } else if ((attr->mp_nexthop_len) &&
((attr->mp_nexthop_len == ((attr->mp_nexthop_len ==
BGP_ATTR_NHLEN_IPV4) || BGP_ATTR_NHLEN_IPV4) ||
(attr->mp_nexthop_len == (attr->mp_nexthop_len ==
BGP_ATTR_NHLEN_VPNV4))) { BGP_ATTR_NHLEN_VPNV4))) {
p.u.prefix4 = tmp_addr.p.u.prefix4 =
attr->mp_nexthop_global_in; attr->mp_nexthop_global_in;
p.prefixlen = IPV4_MAX_BITLEN; tmp_addr.p.prefixlen = IPV4_MAX_BITLEN;
} else } else
return 0; return 0;
} }
break; break;
case AF_INET6: case AF_INET6:
if (is_bgp_static_route) { if (is_bgp_static_route) {
p.u.prefix6 = rn->p.u.prefix6; tmp_addr.p.u.prefix6 = rn->p.u.prefix6;
p.prefixlen = rn->p.prefixlen; tmp_addr.p.prefixlen = rn->p.prefixlen;
} else { } else {
p.u.prefix6 = attr->mp_nexthop_global; tmp_addr.p.u.prefix6 = attr->mp_nexthop_global;
p.prefixlen = IPV6_MAX_BITLEN; tmp_addr.p.prefixlen = IPV6_MAX_BITLEN;
} }
break; break;
default: default:
break; break;
} }
tmp_addr.p = p;
addr = hash_lookup(bgp->address_hash, &tmp_addr); addr = hash_lookup(bgp->address_hash, &tmp_addr);
if (addr) if (addr)
return 1; return 1;