matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: Use a better name for oil_parent

Browse source 
Use oil_incoming_vif instead of oil_parent.  I had
to go look this up as that I failed to remember that
the linux kernel calls this parent for some bizarre
reason.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-09-14 07:18:37 -04:00
parent e7f0bbb198
commit 5f57d30ba4
7 changed files with 38 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pimd/pim_cmd_common.c
View file

@ -1078,7 +1078,7 @@ void pim_show_state(struct pim_instance *pim, struct vty *vty,
oil_mcastgrp(c_oil)); oil_mcastgrp(c_oil));
snprintfrr(src_str, sizeof(src_str), "%pPAs", snprintfrr(src_str, sizeof(src_str), "%pPAs",
oil_origin(c_oil)); oil_origin(c_oil));
ifp_in = pim_if_find_by_vif_index(pim, *oil_parent(c_oil)); ifp_in = pim_if_find_by_vif_index(pim, *oil_incoming_vif(c_oil));
if (ifp_in) if (ifp_in)
strlcpy(in_ifname, ifp_in->name, sizeof(in_ifname)); strlcpy(in_ifname, ifp_in->name, sizeof(in_ifname));
@ -3723,7 +3723,7 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
if (pim_channel_oil_empty(c_oil)) if (pim_channel_oil_empty(c_oil))
strlcat(state_str, "P", sizeof(state_str)); strlcat(state_str, "P", sizeof(state_str));
ifp_in = pim_if_find_by_vif_index(pim, *oil_parent(c_oil)); ifp_in = pim_if_find_by_vif_index(pim, *oil_incoming_vif(c_oil));
if (ifp_in) if (ifp_in)
strlcpy(in_ifname, ifp_in->name, sizeof(in_ifname)); strlcpy(in_ifname, ifp_in->name, sizeof(in_ifname));
@ -3789,7 +3789,7 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_MUTE) if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_MUTE)
continue; continue;
if (*oil_parent(c_oil) == oif_vif_index && if (*oil_incoming_vif(c_oil) == oif_vif_index &&
!pim_mroute_allow_iif_in_oil(c_oil, oif_vif_index)) !pim_mroute_allow_iif_in_oil(c_oil, oif_vif_index))
continue; continue;
@ -3840,7 +3840,7 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
"inboundInterface", "inboundInterface",
in_ifname); in_ifname);
json_object_int_add(json_ifp_out, "iVifI", json_object_int_add(json_ifp_out, "iVifI",
*oil_parent(c_oil)); *oil_incoming_vif(c_oil));
json_object_string_add(json_ifp_out, json_object_string_add(json_ifp_out,
"outboundInterface", "outboundInterface",
out_ifname); out_ifname);
@ -3989,9 +3989,9 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
json_object_string_add(json_ifp_out, json_object_string_add(json_ifp_out,
"inboundInterface", "inboundInterface",
in_ifname); in_ifname);
json_object_int_add( json_object_int_add(json_ifp_out, "iVifI",
json_ifp_out, "iVifI", *oil_incoming_vif(
*oil_parent(&s_route->c_oil)); &s_route->c_oil));
json_object_string_add(json_ifp_out, json_object_string_add(json_ifp_out,
"outboundInterface", "outboundInterface",
out_ifname); out_ifname);

41
pimd/pim_mroute.c
View file

@ -253,7 +253,7 @@ int pim_mroute_msg_nocache(int fd, struct interface *ifp, const kernmsg *msg)
up->channel_oil->cc.pktcnt++; up->channel_oil->cc.pktcnt++;
// resolve mfcc_parent prior to mroute_add in channel_add_oif // resolve mfcc_parent prior to mroute_add in channel_add_oif
if (up->rpf.source_nexthop.interface && if (up->rpf.source_nexthop.interface &&
*oil_parent(up->channel_oil) >= MAXVIFS) { *oil_incoming_vif(up->channel_oil) >= MAXVIFS) {
pim_upstream_mroute_iif_update(up->channel_oil, __func__); pim_upstream_mroute_iif_update(up->channel_oil, __func__);
} }
pim_register_join(up); pim_register_join(up);
@ -1042,10 +1042,10 @@ static inline void pim_mroute_copy(struct channel_oil *out,
*oil_origin(out) = *oil_origin(in); *oil_origin(out) = *oil_origin(in);
*oil_mcastgrp(out) = *oil_mcastgrp(in); *oil_mcastgrp(out) = *oil_mcastgrp(in);
*oil_parent(out) = *oil_parent(in); *oil_incoming_vif(out) = *oil_incoming_vif(in);
for (i = 0; i < MAXVIFS; ++i) { for (i = 0; i < MAXVIFS; ++i) {
if (*oil_parent(out) == i && if (*oil_incoming_vif(out) == i &&
!pim_mroute_allow_iif_in_oil(in, i)) { !pim_mroute_allow_iif_in_oil(in, i)) {
oil_if_set(out, i, 0); oil_if_set(out, i, 0);
continue; continue;
@ -1080,7 +1080,7 @@ static int pim_mroute_add(struct channel_oil *c_oil, const char *name)
* in the case of a (*,G). * in the case of a (*,G).
*/ */
if (pim_addr_is_any(*oil_origin(c_oil))) { if (pim_addr_is_any(*oil_origin(c_oil))) {
oil_if_set(tmp_oil, *oil_parent(c_oil), 1); oil_if_set(tmp_oil, *oil_incoming_vif(c_oil), 1);
} }
/* /*
@ -1090,18 +1090,17 @@ static int pim_mroute_add(struct channel_oil *c_oil, const char *name)
* the packets to be forwarded. Then set it * the packets to be forwarded. Then set it
* to the correct IIF afterwords. * to the correct IIF afterwords.
*/ */
if (!c_oil->installed && !pim_addr_is_any(*oil_origin(c_oil)) if (!c_oil->installed && !pim_addr_is_any(*oil_origin(c_oil)) &&
&& *oil_parent(c_oil) != 0) { *oil_incoming_vif(c_oil) != 0) {
*oil_parent(tmp_oil) = 0; *oil_incoming_vif(tmp_oil) = 0;
} }
/* For IPv6 MRT_ADD_MFC is defined to MRT6_ADD_MFC */ /* For IPv6 MRT_ADD_MFC is defined to MRT6_ADD_MFC */
err = setsockopt(pim->mroute_socket, PIM_IPPROTO, MRT_ADD_MFC, err = setsockopt(pim->mroute_socket, PIM_IPPROTO, MRT_ADD_MFC,
&tmp_oil->oil, sizeof(tmp_oil->oil)); &tmp_oil->oil, sizeof(tmp_oil->oil));
if (!err && !c_oil->installed if (!err && !c_oil->installed && !pim_addr_is_any(*oil_origin(c_oil)) &&
&& !pim_addr_is_any(*oil_origin(c_oil)) *oil_incoming_vif(c_oil) != 0) {
&& *oil_parent(c_oil) != 0) { *oil_incoming_vif(tmp_oil) = *oil_incoming_vif(c_oil);
*oil_parent(tmp_oil) = *oil_parent(c_oil);
err = setsockopt(pim->mroute_socket, PIM_IPPROTO, MRT_ADD_MFC, err = setsockopt(pim->mroute_socket, PIM_IPPROTO, MRT_ADD_MFC,
&tmp_oil->oil, sizeof(tmp_oil->oil)); &tmp_oil->oil, sizeof(tmp_oil->oil));
} }
@ -1158,7 +1157,7 @@ static int pim_upstream_mroute_update(struct channel_oil *c_oil,
{ {
char buf[1000]; char buf[1000];
if (*oil_parent(c_oil) >= MAXVIFS) { if (*oil_incoming_vif(c_oil) >= MAXVIFS) {
/* the c_oil cannot be installed as a mroute yet */ /* the c_oil cannot be installed as a mroute yet */
if (PIM_DEBUG_MROUTE) if (PIM_DEBUG_MROUTE)
zlog_debug( zlog_debug(
@ -1205,13 +1204,13 @@ int pim_upstream_mroute_add(struct channel_oil *c_oil, const char *name)
iif = pim_upstream_get_mroute_iif(c_oil, name); iif = pim_upstream_get_mroute_iif(c_oil, name);
if (*oil_parent(c_oil) != iif) { if (*oil_incoming_vif(c_oil) != iif) {
*oil_parent(c_oil) = iif; *oil_incoming_vif(c_oil) = iif;
if (pim_addr_is_any(*oil_origin(c_oil)) && if (pim_addr_is_any(*oil_origin(c_oil)) &&
c_oil->up) c_oil->up)
pim_upstream_all_sources_iif_update(c_oil->up); pim_upstream_all_sources_iif_update(c_oil->up);
} else { } else {
*oil_parent(c_oil) = iif; *oil_incoming_vif(c_oil) = iif;
} }
return pim_upstream_mroute_update(c_oil, name); return pim_upstream_mroute_update(c_oil, name);
@ -1226,11 +1225,11 @@ int pim_upstream_mroute_iif_update(struct channel_oil *c_oil, const char *name)
char buf[1000]; char buf[1000];
iif = pim_upstream_get_mroute_iif(c_oil, name); iif = pim_upstream_get_mroute_iif(c_oil, name);
if (*oil_parent(c_oil) == iif) { if (*oil_incoming_vif(c_oil) == iif) {
/* no change */ /* no change */
return 0; return 0;
} }
*oil_parent(c_oil) = iif; *oil_incoming_vif(c_oil) = iif;
if (pim_addr_is_any(*oil_origin(c_oil)) && if (pim_addr_is_any(*oil_origin(c_oil)) &&
c_oil->up) c_oil->up)
@ -1255,10 +1254,10 @@ void pim_static_mroute_iif_update(struct channel_oil *c_oil,
int input_vif_index, int input_vif_index,
const char *name) const char *name)
{ {
if (*oil_parent(c_oil) == input_vif_index) if (*oil_incoming_vif(c_oil) == input_vif_index)
return; return;
*oil_parent(c_oil) = input_vif_index; *oil_incoming_vif(c_oil) = input_vif_index;
if (input_vif_index == MAXVIFS) if (input_vif_index == MAXVIFS)
pim_mroute_del(c_oil, name); pim_mroute_del(c_oil, name);
else else
@ -1277,8 +1276,8 @@ int pim_mroute_del(struct channel_oil *c_oil, const char *name)
if (PIM_DEBUG_MROUTE) { if (PIM_DEBUG_MROUTE) {
char buf[1000]; char buf[1000];
struct interface *iifp = struct interface *iifp =
pim_if_find_by_vif_index(pim, pim_if_find_by_vif_index(pim, *oil_incoming_vif(
*oil_parent(c_oil)); c_oil));
zlog_debug("%s %s: incoming interface %s for route is %s not installed, do not need to send del req. ", zlog_debug("%s %s: incoming interface %s for route is %s not installed, do not need to send del req. ",
__FILE__, __func__, __FILE__, __func__,

11
pimd/pim_oil.c
View file

@ -31,7 +31,7 @@ char *pim_channel_oil_dump(struct channel_oil *c_oil, char *buf, size_t size)
sg.src = *oil_origin(c_oil); sg.src = *oil_origin(c_oil);
sg.grp = *oil_mcastgrp(c_oil); sg.grp = *oil_mcastgrp(c_oil);
ifp = pim_if_find_by_vif_index(c_oil->pim, *oil_parent(c_oil)); ifp = pim_if_find_by_vif_index(c_oil->pim, *oil_incoming_vif(c_oil));
snprintfrr(buf, size, "%pSG IIF: %s, OIFS: ", &sg, snprintfrr(buf, size, "%pSG IIF: %s, OIFS: ", &sg,
ifp ? ifp->name : "(?)"); ifp ? ifp->name : "(?)");
@ -135,7 +135,7 @@ struct channel_oil *pim_channel_oil_add(struct pim_instance *pim,
*oil_mcastgrp(c_oil) = sg->grp; *oil_mcastgrp(c_oil) = sg->grp;
*oil_origin(c_oil) = sg->src; *oil_origin(c_oil) = sg->src;
*oil_parent(c_oil) = MAXVIFS; *oil_incoming_vif(c_oil) = MAXVIFS;
c_oil->oil_ref_count = 1; c_oil->oil_ref_count = 1;
c_oil->installed = 0; c_oil->installed = 0;
c_oil->up = pim_upstream_find(pim, sg); c_oil->up = pim_upstream_find(pim, sg);
@ -164,7 +164,7 @@ void pim_clear_nocache_state(struct pim_interface *pim_ifp)
!(PIM_UPSTREAM_FLAG_TEST_SRC_NOCACHE(c_oil->up->flags))) !(PIM_UPSTREAM_FLAG_TEST_SRC_NOCACHE(c_oil->up->flags)))
continue; continue;
if (*oil_parent(c_oil) != pim_ifp->mroute_vif_index) if (*oil_incoming_vif(c_oil) != pim_ifp->mroute_vif_index)
continue; continue;
EVENT_OFF(c_oil->up->t_ka_timer); EVENT_OFF(c_oil->up->t_ka_timer);
@ -288,8 +288,7 @@ int pim_channel_del_oif(struct channel_oil *channel_oil, struct interface *oif,
if (PIM_DEBUG_MROUTE) { if (PIM_DEBUG_MROUTE) {
struct interface *iifp = struct interface *iifp =
pim_if_find_by_vif_index(pim_ifp->pim, pim_if_find_by_vif_index(pim_ifp->pim,
*oil_parent(channel_oil)); *oil_incoming_vif(channel_oil));
zlog_debug("%s(%s): (S,G)=(%pPAs,%pPAs): proto_mask=%u IIF:%s OIF=%s vif_index=%d", zlog_debug("%s(%s): (S,G)=(%pPAs,%pPAs): proto_mask=%u IIF:%s OIF=%s vif_index=%d",
__func__, caller, oil_origin(channel_oil), __func__, caller, oil_origin(channel_oil),
@ -525,7 +524,7 @@ int pim_channel_add_oif(struct channel_oil *channel_oil, struct interface *oif,
/* channel_oil->oil.mfcc_parent != MAXVIFS indicate this entry is not /* channel_oil->oil.mfcc_parent != MAXVIFS indicate this entry is not
* valid to get installed in kernel. * valid to get installed in kernel.
*/ */
if (*oil_parent(channel_oil) != MAXVIFS) { if (*oil_incoming_vif(channel_oil) != MAXVIFS) {
if (pim_upstream_mroute_add(channel_oil, __func__)) { if (pim_upstream_mroute_add(channel_oil, __func__)) {
if (PIM_DEBUG_MROUTE) { if (PIM_DEBUG_MROUTE) {
zlog_debug( zlog_debug(

4
pimd/pim_oil.h
View file

@ -112,7 +112,7 @@ static inline pim_addr *oil_mcastgrp(struct channel_oil *c_oil)
return &c_oil->oil.mfcc_mcastgrp; return &c_oil->oil.mfcc_mcastgrp;
} }
static inline vifi_t *oil_parent(struct channel_oil *c_oil) static inline vifi_t *oil_incoming_vif(struct channel_oil *c_oil)
{ {
return &c_oil->oil.mfcc_parent; return &c_oil->oil.mfcc_parent;
} }
@ -143,7 +143,7 @@ static inline pim_addr *oil_mcastgrp(struct channel_oil *c_oil)
return &c_oil->oil.mf6cc_mcastgrp.sin6_addr; return &c_oil->oil.mf6cc_mcastgrp.sin6_addr;
} }
static inline mifi_t *oil_parent(struct channel_oil *c_oil) static inline mifi_t *oil_incoming_vif(struct channel_oil *c_oil)
{ {
return &c_oil->oil.mf6cc_parent; return &c_oil->oil.mf6cc_parent;
} }

2
pimd/pim_static.c
View file

@ -44,7 +44,7 @@ static struct static_route *static_route_new(ifindex_t iif, ifindex_t oif,
s_route->c_oil.oil_ref_count = 1; s_route->c_oil.oil_ref_count = 1;
*oil_origin(&s_route->c_oil) = source; *oil_origin(&s_route->c_oil) = source;
*oil_mcastgrp(&s_route->c_oil) = group; *oil_mcastgrp(&s_route->c_oil) = group;
*oil_parent(&s_route->c_oil) = iif; *oil_incoming_vif(&s_route->c_oil) = iif;
oil_if_set(&s_route->c_oil, oif, 1); oil_if_set(&s_route->c_oil, oif, 1);
s_route->c_oil.oif_creation[oif] = pim_time_monotonic_sec(); s_route->c_oil.oif_creation[oif] = pim_time_monotonic_sec();

2
pimd/pim_upstream.c
View file

@ -1977,7 +1977,7 @@ static bool pim_upstream_kat_start_ok(struct pim_upstream *up)
return false; return false;
pim_ifp = ifp->info; pim_ifp = ifp->info;
if (pim_ifp->mroute_vif_index != *oil_parent(c_oil)) if (pim_ifp->mroute_vif_index != *oil_incoming_vif(c_oil))
return false; return false;
if (pim_if_connected_to_source(up->rpf.source_nexthop.interface, if (pim_if_connected_to_source(up->rpf.source_nexthop.interface,

4
pimd/pim_zlookup.c
View file

@ -497,13 +497,13 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
int ret; int ret;
pim_sgaddr more = {}; pim_sgaddr more = {};
struct interface *ifp = struct interface *ifp =
pim_if_find_by_vif_index(c_oil->pim, *oil_parent(c_oil)); pim_if_find_by_vif_index(c_oil->pim, *oil_incoming_vif(c_oil));
if (PIM_DEBUG_ZEBRA) { if (PIM_DEBUG_ZEBRA) {
more.src = *oil_origin(c_oil); more.src = *oil_origin(c_oil);
more.grp = *oil_mcastgrp(c_oil); more.grp = *oil_mcastgrp(c_oil);
zlog_debug("Sending Request for New Channel Oil Information%pSG VIIF %d(%s:%s)", zlog_debug("Sending Request for New Channel Oil Information%pSG VIIF %d(%s:%s)",
&more, *oil_parent(c_oil), &more, *oil_incoming_vif(c_oil),
ifp ? ifp->name : "Unknown", c_oil->pim->vrf->name); ifp ? ifp->name : "Unknown", c_oil->pim->vrf->name);
} }