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

staticd: minor refactor NHT register code

Browse Source 
Put static_nexthop -> prefix code into a small helper, remove extra
prefix variable, and grab AFI from prefix.

This commit should not result in any functional change.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2022-04-24 15:47:58 +02:00
parent 0e8d473b32
commit c68cd5af44
1 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
staticd/static_zebra.c
View File

@ -280,15 +280,40 @@ static void static_nht_hash_clear(void)
XFREE(MTYPE_STATIC_NHT_DATA, nhtd); XFREE(MTYPE_STATIC_NHT_DATA, nhtd);
} }
static bool static_zebra_nht_get_prefix(const struct static_nexthop *nh,
struct prefix *p)
{
switch (nh->type) {
case STATIC_IFNAME:
case STATIC_BLACKHOLE:
p->family = AF_UNSPEC;
return false;
case STATIC_IPV4_GATEWAY:
case STATIC_IPV4_GATEWAY_IFNAME:
p->family = AF_INET;
p->prefixlen = IPV4_MAX_BITLEN;
p->u.prefix4 = nh->addr.ipv4;
return true;
case STATIC_IPV6_GATEWAY:
case STATIC_IPV6_GATEWAY_IFNAME:
p->family = AF_INET6;
p->prefixlen = IPV6_MAX_BITLEN;
p->u.prefix6 = nh->addr.ipv6;
return true;
}
assertf(0, "BUG: someone forgot to add nexthop type %u", nh->type);
}
void static_zebra_nht_register(struct static_nexthop *nh, bool reg) void static_zebra_nht_register(struct static_nexthop *nh, bool reg)
{ {
struct static_path *pn = nh->pn; struct static_path *pn = nh->pn;
struct route_node *rn = pn->rn; struct route_node *rn = pn->rn;
struct static_route_info *si = static_route_info_from_rnode(rn); struct static_route_info *si = static_route_info_from_rnode(rn);
struct static_nht_data lookup; struct static_nht_data lookup = {};
uint32_t cmd; uint32_t cmd;
struct prefix p;
afi_t afi = AFI_IP;
cmd = (reg) ? cmd = (reg) ?
ZEBRA_NEXTHOP_REGISTER : ZEBRA_NEXTHOP_UNREGISTER; ZEBRA_NEXTHOP_REGISTER : ZEBRA_NEXTHOP_UNREGISTER;
@ -299,29 +324,8 @@ void static_zebra_nht_register(struct static_nexthop *nh, bool reg)
if (!nh->nh_registered && !reg) if (!nh->nh_registered && !reg)
return; return;
memset(&p, 0, sizeof(p)); if (!static_zebra_nht_get_prefix(nh, &lookup.nh))
switch (nh->type) {
case STATIC_IFNAME:
case STATIC_BLACKHOLE:
return; return;
case STATIC_IPV4_GATEWAY:
case STATIC_IPV4_GATEWAY_IFNAME:
p.family = AF_INET;
p.prefixlen = IPV4_MAX_BITLEN;
p.u.prefix4 = nh->addr.ipv4;
afi = AFI_IP;
break;
case STATIC_IPV6_GATEWAY:
case STATIC_IPV6_GATEWAY_IFNAME:
p.family = AF_INET6;
p.prefixlen = IPV6_MAX_BITLEN;
p.u.prefix6 = nh->addr.ipv6;
afi = AFI_IP6;
break;
}
memset(&lookup, 0, sizeof(lookup));
lookup.nh = p;
lookup.nh_vrf_id = nh->nh_vrf_id; lookup.nh_vrf_id = nh->nh_vrf_id;
lookup.safi = si->safi; lookup.safi = si->safi;
@ -335,11 +339,14 @@ void static_zebra_nht_register(struct static_nexthop *nh, bool reg)
if (nhtd->refcount > 1) { if (nhtd->refcount > 1) {
DEBUGD(&static_dbg_route, DEBUGD(&static_dbg_route,
"Already registered nexthop(%pFX) for %pRN %d", "Already registered nexthop(%pFX) for %pRN %d",
&p, rn, nhtd->nh_num); &lookup.nh, rn, nhtd->nh_num);
if (nhtd->nh_num) if (nhtd->nh_num) {
afi_t afi = prefix_afi(&lookup.nh);
static_nht_update(&rn->p, &nhtd->nh, static_nht_update(&rn->p, &nhtd->nh,
nhtd->nh_num, afi, si->safi, nhtd->nh_num, afi, si->safi,
nh->nh_vrf_id); nh->nh_vrf_id);
}
return; return;
} }
} else { } else {
@ -353,9 +360,9 @@ void static_zebra_nht_register(struct static_nexthop *nh, bool reg)
} }
DEBUGD(&static_dbg_route, "%s nexthop(%pFX) for %pRN", DEBUGD(&static_dbg_route, "%s nexthop(%pFX) for %pRN",
reg ? "Registering" : "Unregistering", &p, rn); reg ? "Registering" : "Unregistering", &lookup.nh, rn);
if (zclient_send_rnh(zclient, cmd, &p, si->safi, false, false, if (zclient_send_rnh(zclient, cmd, &lookup.nh, si->safi, false, false,
nh->nh_vrf_id) == ZCLIENT_SEND_FAILURE) nh->nh_vrf_id) == ZCLIENT_SEND_FAILURE)
zlog_warn("%s: Failure to send nexthop to zebra", __func__); zlog_warn("%s: Failure to send nexthop to zebra", __func__);
} }
@ -369,38 +376,19 @@ int static_zebra_nh_update(struct static_nexthop *nh)
struct route_node *rn = pn->rn; struct route_node *rn = pn->rn;
struct static_route_info *si = static_route_info_from_rnode(rn); struct static_route_info *si = static_route_info_from_rnode(rn);
struct static_nht_data *nhtd, lookup = {}; struct static_nht_data *nhtd, lookup = {};
struct prefix p = {};
afi_t afi = AFI_IP;
if (!nh->nh_registered) if (!nh->nh_registered)
return 0; return 0;
switch (nh->type) { if (!static_zebra_nht_get_prefix(nh, &lookup.nh))
case STATIC_IFNAME:
case STATIC_BLACKHOLE:
return 0; return 0;
case STATIC_IPV4_GATEWAY:
case STATIC_IPV4_GATEWAY_IFNAME:
p.family = AF_INET;
p.prefixlen = IPV4_MAX_BITLEN;
p.u.prefix4 = nh->addr.ipv4;
afi = AFI_IP;
break;
case STATIC_IPV6_GATEWAY:
case STATIC_IPV6_GATEWAY_IFNAME:
p.family = AF_INET6;
p.prefixlen = IPV6_MAX_BITLEN;
p.u.prefix6 = nh->addr.ipv6;
afi = AFI_IP6;
break;
}
lookup.nh = p;
lookup.nh_vrf_id = nh->nh_vrf_id; lookup.nh_vrf_id = nh->nh_vrf_id;
lookup.safi = si->safi; lookup.safi = si->safi;
nhtd = static_nht_hash_find(static_nht_hash, &lookup); nhtd = static_nht_hash_find(static_nht_hash, &lookup);
if (nhtd && nhtd->nh_num) { if (nhtd && nhtd->nh_num) {
afi_t afi = prefix_afi(&lookup.nh);
nh->state = STATIC_START; nh->state = STATIC_START;
static_nht_update(&rn->p, &nhtd->nh, nhtd->nh_num, afi, static_nht_update(&rn->p, &nhtd->nh, nhtd->nh_num, afi,
si->safi, nh->nh_vrf_id); si->safi, nh->nh_vrf_id);