proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 21:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: bgp_nexthop_self optimize afi and new_afi handling

Browse Source 
The new_afi and afi were being used over and over.  Switch
to the end result we want and just use that from the get go.

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

14
bgpd/bgp_nexthop.c
View File

@ -474,7 +474,7 @@ 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}; struct prefix p = {0};
afi_t new_afi = afi; 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;
@ -484,11 +484,11 @@ int bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, uint8_t sub_type,
: false; : false;
if (!is_bgp_static_route) if (!is_bgp_static_route)
new_afi = BGP_ATTR_NEXTHOP_AFI_IP6(attr) ? AFI_IP6 : AFI_IP; new_afi = BGP_ATTR_NEXTHOP_AFI_IP6(attr) ? AF_INET6 : AF_INET;
p.family = new_afi;
switch (new_afi) { switch (new_afi) {
case AFI_IP: case AF_INET:
p.family = AF_INET;
if (is_bgp_static_route) { if (is_bgp_static_route) {
p.u.prefix4 = rn->p.u.prefix4; p.u.prefix4 = rn->p.u.prefix4;
p.prefixlen = rn->p.prefixlen; p.prefixlen = rn->p.prefixlen;
@ -512,9 +512,7 @@ int bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, uint8_t sub_type,
return 0; return 0;
} }
break; break;
case AFI_IP6: case AF_INET6:
p.family = AF_INET6;
if (is_bgp_static_route) { if (is_bgp_static_route) {
p.u.prefix6 = rn->p.u.prefix6; p.u.prefix6 = rn->p.u.prefix6;
p.prefixlen = rn->p.prefixlen; p.prefixlen = rn->p.prefixlen;
@ -532,7 +530,7 @@ int bgp_nexthop_self(struct bgp *bgp, afi_t afi, uint8_t type, uint8_t sub_type,
if (addr) if (addr)
return 1; return 1;
if (new_afi == AFI_IP) { if (new_afi == AF_INET) {
memset(&tmp_tip, 0, sizeof(struct tip_addr)); memset(&tmp_tip, 0, sizeof(struct tip_addr));
tmp_tip.addr = attr->nexthop; tmp_tip.addr = attr->nexthop;