summaryrefslogtreecommitdiffstats
path: root/pimd/pim_zebra.c
diff options
context:
space:
mode:
Diffstat (limited to 'pimd/pim_zebra.c')
-rw-r--r--pimd/pim_zebra.c108
1 files changed, 48 insertions, 60 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index baa6216df..13d6a2eea 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -75,9 +75,8 @@ static int pim_zebra_interface_vrf_update(ZAPI_CALLBACK_ARGS)
return 0;
if (PIM_DEBUG_ZEBRA)
- zlog_debug("%s: %s updating from %u to %u",
- __PRETTY_FUNCTION__,
- ifp->name, vrf_id, new_vrf_id);
+ zlog_debug("%s: %s updating from %u to %u", __func__, ifp->name,
+ vrf_id, new_vrf_id);
if_update_to_new_vrf(ifp, new_vrf_id);
@@ -135,8 +134,7 @@ static int pim_zebra_if_address_add(ZAPI_CALLBACK_ARGS)
char buf[BUFSIZ];
prefix2str(p, buf, BUFSIZ);
zlog_debug("%s: %s(%u) connected IP address %s flags %u %s",
- __PRETTY_FUNCTION__, c->ifp->name, vrf_id, buf,
- c->flags,
+ __func__, c->ifp->name, vrf_id, buf, c->flags,
CHECK_FLAG(c->flags, ZEBRA_IFA_SECONDARY)
? "secondary"
: "primary");
@@ -161,7 +159,7 @@ static int pim_zebra_if_address_add(ZAPI_CALLBACK_ARGS)
zlog_warn(
"%s: %s : forcing secondary flag on %s",
- __PRETTY_FUNCTION__, c->ifp->name, buf);
+ __func__, c->ifp->name, buf);
}
SET_FLAG(c->flags, ZEBRA_IFA_SECONDARY);
}
@@ -218,8 +216,7 @@ static int pim_zebra_if_address_del(ZAPI_CALLBACK_ARGS)
prefix2str(p, buf, BUFSIZ);
zlog_debug(
"%s: %s(%u) disconnected IP address %s flags %u %s",
- __PRETTY_FUNCTION__, c->ifp->name, vrf_id, buf,
- c->flags,
+ __func__, c->ifp->name, vrf_id, buf, c->flags,
CHECK_FLAG(c->flags, ZEBRA_IFA_SECONDARY)
? "secondary"
: "primary");
@@ -291,7 +288,7 @@ void pim_zebra_upstream_rpf_changed(struct pim_instance *pim,
*/
if (!up->channel_oil->installed)
pim_upstream_mroute_add(up->channel_oil,
- __PRETTY_FUNCTION__);
+ __func__);
/*
* RFC 4601: 4.5.7. Sending (S,G)
@@ -329,8 +326,7 @@ void pim_zebra_upstream_rpf_changed(struct pim_instance *pim,
pim_jp_agg_switch_interface(old, &up->rpf, up);
if (!up->channel_oil->installed)
- pim_upstream_mroute_add(up->channel_oil,
- __PRETTY_FUNCTION__);
+ pim_upstream_mroute_add(up->channel_oil, __func__);
}
/* FIXME can join_desired actually be changed by pim_rpf_update()
@@ -430,7 +426,7 @@ void sched_rpf_cache_refresh(struct pim_instance *pim)
/* Start refresh timer */
if (PIM_DEBUG_ZEBRA) {
- zlog_debug("%s: triggering %ld msec timer", __PRETTY_FUNCTION__,
+ zlog_debug("%s: triggering %ld msec timer", __func__,
router->rpf_cache_refresh_delay_msec);
}
@@ -475,8 +471,7 @@ void pim_zebra_init(void)
zclient_init(zclient, ZEBRA_ROUTE_PIM, 0, &pimd_privs);
if (PIM_DEBUG_PIM_TRACE) {
- zlog_notice("%s: zclient socket initialized",
- __PRETTY_FUNCTION__);
+ zlog_notice("%s: zclient socket initialized", __func__);
}
zclient_lookup_new();
@@ -493,8 +488,7 @@ void igmp_anysource_forward_start(struct pim_instance *pim,
source = source_new(group, src_addr);
if (!source) {
- zlog_warn("%s: Failure to create * source",
- __PRETTY_FUNCTION__);
+ zlog_warn("%s: Failure to create * source", __func__);
return;
}
@@ -604,8 +598,8 @@ void igmp_source_forward_start(struct pim_instance *pim,
if (PIM_DEBUG_IGMP_TRACE) {
zlog_debug(
- "%s: (S,G)=%s igmp_sock=%d oif=%s fwd=%d",
- __PRETTY_FUNCTION__, pim_str_sg_dump(&sg),
+ "%s: (S,G)=%s igmp_sock=%d oif=%s fwd=%d", __func__,
+ pim_str_sg_dump(&sg),
source->source_group->group_igmp_sock->fd,
source->source_group->group_igmp_sock->interface->name,
IGMP_SOURCE_TEST_FORWARDING(source->source_flags));
@@ -621,11 +615,10 @@ void igmp_source_forward_start(struct pim_instance *pim,
pim_oif = group->group_igmp_sock->interface->info;
if (!pim_oif) {
if (PIM_DEBUG_IGMP_TRACE) {
- zlog_debug(
- "%s: multicast not enabled on oif=%s ?",
- __PRETTY_FUNCTION__,
+ zlog_debug("%s: multicast not enabled on oif=%s ?",
+ __func__,
source->source_group->group_igmp_sock
- ->interface->name);
+ ->interface->name);
}
return;
}
@@ -639,8 +632,8 @@ void igmp_source_forward_start(struct pim_instance *pim,
if (!pim_rp_set_upstream_addr(pim, &vif_source,
source->source_addr, sg.grp)) {
/*Create a dummy channel oil */
- source->source_channel_oil = pim_channel_oil_add(
- pim, &sg, __PRETTY_FUNCTION__);
+ source->source_channel_oil =
+ pim_channel_oil_add(pim, &sg, __func__);
}
else {
@@ -672,10 +665,10 @@ void igmp_source_forward_start(struct pim_instance *pim,
pim_inet4_dump("<source?>", vif_source, buf2,
sizeof(buf2));
- zlog_debug("%s: NHT %s vif_source %s vif_index:%d ",
- __PRETTY_FUNCTION__,
- pim_str_sg_dump(&sg),
- buf2, input_iface_vif_index);
+ zlog_debug(
+ "%s: NHT %s vif_source %s vif_index:%d ",
+ __func__, pim_str_sg_dump(&sg), buf2,
+ input_iface_vif_index);
}
if (input_iface_vif_index < 1) {
@@ -685,14 +678,11 @@ void igmp_source_forward_start(struct pim_instance *pim,
source->source_addr,
source_str, sizeof(source_str));
zlog_debug(
- "%s %s: could not find input interface for source %s",
- __FILE__, __PRETTY_FUNCTION__,
- source_str);
+ "%s %s: could not find input interface for source %s",
+ __FILE__, __func__, source_str);
}
source->source_channel_oil =
- pim_channel_oil_add(
- pim, &sg,
- __PRETTY_FUNCTION__);
+ pim_channel_oil_add(pim, &sg, __func__);
}
else {
@@ -710,30 +700,28 @@ void igmp_source_forward_start(struct pim_instance *pim,
*/
if (PIM_DEBUG_IGMP_TRACE) {
zlog_debug(
- "%s: ignoring request for looped MFC entry (S,G)=%s: igmp_sock=%d oif=%s vif_index=%d",
- __PRETTY_FUNCTION__,
- pim_str_sg_dump(&sg),
- source->source_group
- ->group_igmp_sock->fd,
- source->source_group
- ->group_igmp_sock
- ->interface->name,
- input_iface_vif_index);
+ "%s: ignoring request for looped MFC entry (S,G)=%s: igmp_sock=%d oif=%s vif_index=%d",
+ __func__,
+ pim_str_sg_dump(&sg),
+ source->source_group
+ ->group_igmp_sock
+ ->fd,
+ source->source_group
+ ->group_igmp_sock
+ ->interface->name,
+ input_iface_vif_index);
}
return;
}
source->source_channel_oil =
- pim_channel_oil_add(
- pim, &sg,
- __PRETTY_FUNCTION__);
+ pim_channel_oil_add(pim, &sg, __func__);
if (!source->source_channel_oil) {
if (PIM_DEBUG_IGMP_TRACE) {
zlog_debug(
- "%s %s: could not create OIL for channel (S,G)=%s",
- __FILE__,
- __PRETTY_FUNCTION__,
- pim_str_sg_dump(&sg));
+ "%s %s: could not create OIL for channel (S,G)=%s",
+ __FILE__, __func__,
+ pim_str_sg_dump(&sg));
}
return;
}
@@ -754,10 +742,10 @@ void igmp_source_forward_start(struct pim_instance *pim,
}
} else {
if (PIM_DEBUG_IGMP_TRACE)
- zlog_debug("%s: %s was received on %s interface but we are not DR for that interface",
- __PRETTY_FUNCTION__,
- pim_str_sg_dump(&sg),
- group->group_igmp_sock->interface->name);
+ zlog_debug(
+ "%s: %s was received on %s interface but we are not DR for that interface",
+ __func__, pim_str_sg_dump(&sg),
+ group->group_igmp_sock->interface->name);
return;
}
@@ -770,7 +758,7 @@ void igmp_source_forward_start(struct pim_instance *pim,
false /*is_vxlan*/)) {
if (PIM_DEBUG_MROUTE)
zlog_warn("%s: Failure to add local membership for %s",
- __PRETTY_FUNCTION__, pim_str_sg_dump(&sg));
+ __func__, pim_str_sg_dump(&sg));
pim_channel_del_oif(source->source_channel_oil,
group->group_igmp_sock->interface,
@@ -797,8 +785,8 @@ void igmp_source_forward_stop(struct igmp_source *source)
if (PIM_DEBUG_IGMP_TRACE) {
zlog_debug(
- "%s: (S,G)=%s igmp_sock=%d oif=%s fwd=%d",
- __PRETTY_FUNCTION__, pim_str_sg_dump(&sg),
+ "%s: (S,G)=%s igmp_sock=%d oif=%s fwd=%d", __func__,
+ pim_str_sg_dump(&sg),
source->source_group->group_igmp_sock->fd,
source->source_group->group_igmp_sock->interface->name,
IGMP_SOURCE_TEST_FORWARDING(source->source_flags));
@@ -861,7 +849,7 @@ void pim_forward_start(struct pim_ifchannel *ch)
sizeof(group_str));
pim_inet4_dump("<upstream?>", up->upstream_addr, upstream_str,
sizeof(upstream_str));
- zlog_debug("%s: (S,G)=(%s,%s) oif=%s (%s)", __PRETTY_FUNCTION__,
+ zlog_debug("%s: (S,G)=(%s,%s) oif=%s (%s)", __func__,
source_str, group_str, ch->interface->name,
inet_ntoa(up->upstream_addr));
}
@@ -879,7 +867,7 @@ void pim_forward_stop(struct pim_ifchannel *ch, bool install_it)
if (PIM_DEBUG_PIM_TRACE) {
zlog_debug("%s: (S,G)=%s oif=%s install_it: %d installed: %d",
- __PRETTY_FUNCTION__, ch->sg_str, ch->interface->name,
+ __func__, ch->sg_str, ch->interface->name,
install_it, up->channel_oil->installed);
}
@@ -895,7 +883,7 @@ void pim_forward_stop(struct pim_ifchannel *ch, bool install_it)
PIM_OIF_FLAG_PROTO_PIM, __func__);
if (install_it && !up->channel_oil->installed)
- pim_upstream_mroute_add(up->channel_oil, __PRETTY_FUNCTION__);
+ pim_upstream_mroute_add(up->channel_oil, __func__);
}
void pim_zebra_zclient_update(struct vty *vty)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 09:24:28 +0100