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

zebra: Remove code duplication for v4 and v6 versions of rib_match_multicast

Browse Source 
a) Consolidate v4 and v6 versions of rib_match_multicast
b) Improve debug to show what we matched against as well.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-02-13 12:13:42 -05:00
parent bf9bc2e5f2
commit 312e29b060
4 changed files with 29 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zebra/rib.h
View File

@ -407,11 +407,8 @@ extern void rib_delete(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
extern struct route_entry *rib_match(afi_t afi, safi_t safi, vrf_id_t vrf_id, extern struct route_entry *rib_match(afi_t afi, safi_t safi, vrf_id_t vrf_id,
const union g_addr *addr, const union g_addr *addr,
struct route_node **rn_out); struct route_node **rn_out);
extern struct route_entry *rib_match_ipv4_multicast(vrf_id_t vrf_id, extern struct route_entry *rib_match_multicast(afi_t afi, vrf_id_t vrf_id,
struct in_addr addr, union g_addr *gaddr,
struct route_node **rn_out);
extern struct route_entry *rib_match_ipv6_multicast(vrf_id_t vrf_id,
struct in6_addr addr,
struct route_node **rn_out); struct route_node **rn_out);
extern struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p, extern struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p,

9
zebra/zapi_msg.c
View File

@ -2249,17 +2249,18 @@ static void zread_nexthop_lookup_mrib(ZAPI_HANDLER_ARGS)
{ {
struct ipaddr addr; struct ipaddr addr;
struct route_entry *re = NULL; struct route_entry *re = NULL;
union g_addr gaddr;
STREAM_GET_IPADDR(msg, &addr); STREAM_GET_IPADDR(msg, &addr);
switch (addr.ipa_type) { switch (addr.ipa_type) {
case IPADDR_V4: case IPADDR_V4:
re = rib_match_ipv4_multicast(zvrf_id(zvrf), addr.ipaddr_v4, gaddr.ipv4 = addr.ipaddr_v4;
NULL); re = rib_match_multicast(AFI_IP, zvrf_id(zvrf), &gaddr, NULL);
break; break;
case IPADDR_V6: case IPADDR_V6:
re = rib_match_ipv6_multicast(zvrf_id(zvrf), addr.ipaddr_v6, gaddr.ipv6 = addr.ipaddr_v6;
NULL); re = rib_match_multicast(AFI_IP6, zvrf_id(zvrf), &gaddr, NULL);
break; break;
case IPADDR_NONE: case IPADDR_NONE:
/* ??? */ /* ??? */

89
zebra/zebra_rib.c
View File

@ -524,31 +524,28 @@ struct route_entry *rib_match(afi_t afi, safi_t safi, vrf_id_t vrf_id,
return NULL; return NULL;
} }
struct route_entry *rib_match_ipv4_multicast(vrf_id_t vrf_id, struct route_entry *rib_match_multicast(afi_t afi, vrf_id_t vrf_id,
struct in_addr addr, union g_addr *gaddr,
struct route_node **rn_out) struct route_node **rn_out)
{ {
struct route_entry *re = NULL, *mre = NULL, *ure = NULL; struct route_entry *re = NULL, *mre = NULL, *ure = NULL;
struct route_node *m_rn = NULL, *u_rn = NULL; struct route_node *m_rn = NULL, *u_rn = NULL;
union g_addr gaddr = {.ipv4 = addr};
switch (zrouter.ipv4_multicast_mode) { switch (zrouter.ipv4_multicast_mode) {
case MCAST_MRIB_ONLY: case MCAST_MRIB_ONLY:
return rib_match(AFI_IP, SAFI_MULTICAST, vrf_id, &gaddr, return rib_match(afi, SAFI_MULTICAST, vrf_id, gaddr, rn_out);
rn_out);
case MCAST_URIB_ONLY: case MCAST_URIB_ONLY:
return rib_match(AFI_IP, SAFI_UNICAST, vrf_id, &gaddr, rn_out); return rib_match(afi, SAFI_UNICAST, vrf_id, gaddr, rn_out);
case MCAST_NO_CONFIG: case MCAST_NO_CONFIG:
case MCAST_MIX_MRIB_FIRST: case MCAST_MIX_MRIB_FIRST:
re = mre = rib_match(AFI_IP, SAFI_MULTICAST, vrf_id, &gaddr, re = mre = rib_match(afi, SAFI_MULTICAST, vrf_id, gaddr, &m_rn);
&m_rn);
if (!mre) if (!mre)
re = ure = rib_match(AFI_IP, SAFI_UNICAST, vrf_id, re = ure = rib_match(afi, SAFI_UNICAST, vrf_id, gaddr,
&gaddr, &u_rn); &u_rn);
break; break;
case MCAST_MIX_DISTANCE: case MCAST_MIX_DISTANCE:
mre = rib_match(AFI_IP, SAFI_MULTICAST, vrf_id, &gaddr, &m_rn); mre = rib_match(afi, SAFI_MULTICAST, vrf_id, gaddr, &m_rn);
ure = rib_match(AFI_IP, SAFI_UNICAST, vrf_id, &gaddr, &u_rn); ure = rib_match(afi, SAFI_UNICAST, vrf_id, gaddr, &u_rn);
if (mre && ure) if (mre && ure)
re = ure->distance < mre->distance ? ure : mre; re = ure->distance < mre->distance ? ure : mre;
else if (mre) else if (mre)
@ -557,8 +554,8 @@ struct route_entry *rib_match_ipv4_multicast(vrf_id_t vrf_id,
re = ure; re = ure;
break; break;
case MCAST_MIX_PFXLEN: case MCAST_MIX_PFXLEN:
mre = rib_match(AFI_IP, SAFI_MULTICAST, vrf_id, &gaddr, &m_rn); mre = rib_match(afi, SAFI_MULTICAST, vrf_id, gaddr, &m_rn);
ure = rib_match(AFI_IP, SAFI_UNICAST, vrf_id, &gaddr, &u_rn); ure = rib_match(afi, SAFI_UNICAST, vrf_id, gaddr, &u_rn);
if (mre && ure) if (mre && ure)
re = u_rn->p.prefixlen > m_rn->p.prefixlen ? ure : mre; re = u_rn->p.prefixlen > m_rn->p.prefixlen ? ure : mre;
else if (mre) else if (mre)
@ -573,10 +570,12 @@ struct route_entry *rib_match_ipv4_multicast(vrf_id_t vrf_id,
if (IS_ZEBRA_DEBUG_RIB) { if (IS_ZEBRA_DEBUG_RIB) {
char buf[BUFSIZ]; char buf[BUFSIZ];
inet_ntop(AF_INET, &addr, buf, BUFSIZ); inet_ntop(afi == AFI_IP ? AF_INET : AF_INET6, gaddr, buf,
BUFSIZ);
zlog_debug("%s: %s: vrf: %s(%u) found %s, using %s", __func__, zlog_debug("%s: %s: %pRN vrf: %s(%u) found %s, using %s",
buf, vrf_id_to_name(vrf_id), vrf_id, __func__, buf, (re == mre) ? m_rn : u_rn,
vrf_id_to_name(vrf_id), vrf_id,
mre ? (ure ? "MRIB+URIB" : "MRIB") mre ? (ure ? "MRIB+URIB" : "MRIB")
: ure ? "URIB" : "nothing", : ure ? "URIB" : "nothing",
re == ure ? "URIB" : re == mre ? "MRIB" : "none"); re == ure ? "URIB" : re == mre ? "MRIB" : "none");
@ -584,62 +583,6 @@ struct route_entry *rib_match_ipv4_multicast(vrf_id_t vrf_id,
return re; return re;
} }
struct route_entry *rib_match_ipv6_multicast(vrf_id_t vrf_id,
struct in6_addr addr,
struct route_node **rn_out)
{
struct route_entry *re = NULL, *mre = NULL, *ure = NULL;
struct route_node *m_rn = NULL, *u_rn = NULL;
union g_addr gaddr = {.ipv6 = addr};
switch (zrouter.ipv4_multicast_mode) {
case MCAST_MRIB_ONLY:
return rib_match(AFI_IP6, SAFI_MULTICAST, vrf_id, &gaddr,
rn_out);
case MCAST_URIB_ONLY:
return rib_match(AFI_IP6, SAFI_UNICAST, vrf_id, &gaddr, rn_out);
case MCAST_NO_CONFIG:
case MCAST_MIX_MRIB_FIRST:
re = mre = rib_match(AFI_IP6, SAFI_MULTICAST, vrf_id, &gaddr,
&m_rn);
if (!mre)
re = ure = rib_match(AFI_IP6, SAFI_UNICAST, vrf_id,
&gaddr, &u_rn);
break;
case MCAST_MIX_DISTANCE:
mre = rib_match(AFI_IP6, SAFI_MULTICAST, vrf_id, &gaddr, &m_rn);
ure = rib_match(AFI_IP6, SAFI_UNICAST, vrf_id, &gaddr, &u_rn);
if (mre && ure)
re = ure->distance < mre->distance ? ure : mre;
else if (mre)
re = mre;
else if (ure)
re = ure;
break;
case MCAST_MIX_PFXLEN:
mre = rib_match(AFI_IP6, SAFI_MULTICAST, vrf_id, &gaddr, &m_rn);
ure = rib_match(AFI_IP6, SAFI_UNICAST, vrf_id, &gaddr, &u_rn);
if (mre && ure)
re = u_rn->p.prefixlen > m_rn->p.prefixlen ? ure : mre;
else if (mre)
re = mre;
else if (ure)
re = ure;
break;
}
if (rn_out)
*rn_out = (re == mre) ? m_rn : u_rn;
if (IS_ZEBRA_DEBUG_RIB)
zlog_debug("%s: %pI6: vrf: %s(%u) found %s, using %s", __func__,
&addr, vrf_id_to_name(vrf_id), vrf_id,
mre ? (ure ? "MRIB+URIB" : "MRIB")
: ure ? "URIB" : "nothing",
re == ure ? "URIB" : re == mre ? "MRIB" : "none");
return re;
}
struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p, vrf_id_t vrf_id) struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p, vrf_id_t vrf_id)
{ {
struct route_table *table; struct route_table *table;

16
zebra/zebra_vty.c
View File

@ -164,27 +164,19 @@ DEFUN (show_ip_rpf,
&ctx); &ctx);
} }
DEFUN (show_ip_rpf_addr, DEFPY (show_ip_rpf_addr,
show_ip_rpf_addr_cmd, show_ip_rpf_addr_cmd,
"show ip rpf A.B.C.D", "show ip rpf A.B.C.D$address",
SHOW_STR SHOW_STR
IP_STR IP_STR
"Display RPF information for multicast source\n" "Display RPF information for multicast source\n"
"IP multicast source address (e.g. 10.0.0.0)\n") "IP multicast source address (e.g. 10.0.0.0)\n")
{ {
int idx_ipv4 = 3;
struct in_addr addr;
struct route_node *rn; struct route_node *rn;
struct route_entry *re; struct route_entry *re;
int ret;
ret = inet_aton(argv[idx_ipv4]->arg, &addr); re = rib_match_multicast(AFI_IP, VRF_DEFAULT, (union g_addr *)&address,
if (ret == 0) { &rn);
vty_out(vty, "%% Malformed address\n");
return CMD_WARNING;
}
re = rib_match_ipv4_multicast(VRF_DEFAULT, addr, &rn);
if (re) if (re)
vty_show_ip_route_detail(vty, rn, 1, false, false); vty_show_ip_route_detail(vty, rn, 1, false, false);