__func__ everywhere #5918
Merged
__func__ everywhere #5918
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Same is for __PRETTY_FUNCTION__ Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
polychaeta
reviewed
Mar 5, 2020
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/4c316dfdaf82eab70d7bd554ee280a95/raw/723206bd416608609da6adc439355bccd0498f43/cr_5918_1583432554.diff | git apply
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index f6fdf33d9..664d62fd1 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -600,8 +600,9 @@ static int bgp_zebra_send_remote_macip(struct bgp *bgp, struct bgpevpn *vpn,
/* Don't try to register if Zebra doesn't know of this instance. */
if (!IS_BGP_INST_KNOWN_TO_ZEBRA(bgp)) {
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: No zebra instance to talk to, not installing remote macip",
- __func__);
+ zlog_debug(
+ "%s: No zebra instance to talk to, not installing remote macip",
+ __func__);
return 0;
}
s = zclient->obuf;
@@ -662,8 +663,9 @@ static int bgp_zebra_send_remote_vtep(struct bgp *bgp, struct bgpevpn *vpn,
/* Don't try to register if Zebra doesn't know of this instance. */
if (!IS_BGP_INST_KNOWN_TO_ZEBRA(bgp)) {
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: No zebra instance to talk to, not installing remote vtep",
- __func__);
+ zlog_debug(
+ "%s: No zebra instance to talk to, not installing remote vtep",
+ __func__);
return 0;
}
diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index 8495dd633..dfa9ac939 100644
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -591,15 +591,17 @@ static void sendmsg_zebra_rnh(struct bgp_nexthop_cache *bnc, int command)
/* Don't try to register if Zebra doesn't know of this instance. */
if (!IS_BGP_INST_KNOWN_TO_ZEBRA(bnc->bgp)) {
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: No zebra instance to talk to, not installing NHT entry",
- __func__);
+ zlog_debug(
+ "%s: No zebra instance to talk to, not installing NHT entry",
+ __func__);
return;
}
if (!bgp_zebra_num_connects()) {
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: We have not connected yet, cannot send nexthops",
- __func__);
+ zlog_debug(
+ "%s: We have not connected yet, cannot send nexthops",
+ __func__);
}
p = &(bnc->node->p);
if ((command == ZEBRA_NEXTHOP_REGISTER
@@ -801,9 +803,10 @@ static void evaluate_paths(struct bgp_nexthop_cache *bnc)
if (!CHECK_FLAG(bnc->flags, BGP_NEXTHOP_PEER_NOTIFIED)) {
if (BGP_DEBUG(nht, NHT))
- zlog_debug("%s: Updating peer (%s(%s)) status with NHT",
- __func__, peer->host,
- peer->bgp->name_pretty);
+ zlog_debug(
+ "%s: Updating peer (%s(%s)) status with NHT",
+ __func__, peer->host,
+ peer->bgp->name_pretty);
bgp_fsm_event_update(peer, valid_nexthops);
SET_FLAG(bnc->flags, BGP_NEXTHOP_PEER_NOTIFIED);
}
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 5321e15cd..bcd87eb01 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2924,8 +2924,7 @@ static int bgp_maximum_prefix_restart_timer(struct thread *thread)
peer->host);
if ((peer_clear(peer, NULL) < 0) && bgp_debug_neighbor_events(peer))
- zlog_debug("%s: %s peer_clear failed",
- __func__, peer->host);
+ zlog_debug("%s: %s peer_clear failed", __func__, peer->host);
return 0;
}
@@ -3878,8 +3877,8 @@ int bgp_update(struct peer *peer, struct prefix *p, uint32_t addpath_id,
inet_ntop(AF_INET,
(const void *)&attr_new->nexthop,
buf1, INET6_ADDRSTRLEN);
- zlog_debug("%s(%s): NH unresolved",
- __func__, buf1);
+ zlog_debug("%s(%s): NH unresolved", __func__,
+ buf1);
}
bgp_path_info_unset_flag(rn, new, BGP_PATH_VALID);
}
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 46855e6cf..f3ab60849 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -72,8 +72,9 @@ static inline int bgp_install_info_to_zebra(struct bgp *bgp)
return 0;
if (!IS_BGP_INST_KNOWN_TO_ZEBRA(bgp)) {
- zlog_debug("%s: No zebra instance to talk to, not installing information",
- __func__);
+ zlog_debug(
+ "%s: No zebra instance to talk to, not installing information",
+ __func__);
return 0;
}
@@ -1918,8 +1919,9 @@ int bgp_zebra_advertise_subnet(struct bgp *bgp, int advertise, vni_t vni)
/* Don't try to register if Zebra doesn't know of this instance. */
if (!IS_BGP_INST_KNOWN_TO_ZEBRA(bgp)) {
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: No zebra instance to talk to, cannot advertise subnet",
- __func__);
+ zlog_debug(
+ "%s: No zebra instance to talk to, cannot advertise subnet",
+ __func__);
return 0;
}
@@ -1968,8 +1970,9 @@ int bgp_zebra_advertise_gw_macip(struct bgp *bgp, int advertise, vni_t vni)
/* Don't try to register if Zebra doesn't know of this instance. */
if (!IS_BGP_INST_KNOWN_TO_ZEBRA(bgp)) {
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: No zebra instance to talk to, not installing gw_macip",
- __func__);
+ zlog_debug(
+ "%s: No zebra instance to talk to, not installing gw_macip",
+ __func__);
return 0;
}
@@ -1996,8 +1999,9 @@ int bgp_zebra_vxlan_flood_control(struct bgp *bgp,
/* Don't try to register if Zebra doesn't know of this instance. */
if (!IS_BGP_INST_KNOWN_TO_ZEBRA(bgp)) {
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: No zebra instance to talk to, not installing all vni",
- __func__);
+ zlog_debug(
+ "%s: No zebra instance to talk to, not installing all vni",
+ __func__);
return 0;
}
@@ -2100,8 +2104,7 @@ static int rule_notify_owner(ZAPI_CALLBACK_ARGS)
switch (note) {
case ZAPI_RULE_FAIL_INSTALL:
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Received RULE_FAIL_INSTALL",
- __func__);
+ zlog_debug("%s: Received RULE_FAIL_INSTALL", __func__);
if (bgp_pbra) {
bgp_pbra->installed = false;
bgp_pbra->install_in_progress = false;
@@ -2128,14 +2131,12 @@ static int rule_notify_owner(ZAPI_CALLBACK_ARGS)
bgp_pbr);
}
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Received RULE_INSTALLED",
- __func__);
+ zlog_debug("%s: Received RULE_INSTALLED", __func__);
break;
case ZAPI_RULE_FAIL_REMOVE:
case ZAPI_RULE_REMOVED:
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Received RULE REMOVED",
- __func__);
+ zlog_debug("%s: Received RULE REMOVED", __func__);
break;
}
@@ -2164,8 +2165,7 @@ static int ipset_notify_owner(ZAPI_CALLBACK_ARGS)
switch (note) {
case ZAPI_IPSET_FAIL_INSTALL:
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Received IPSET_FAIL_INSTALL",
- __func__);
+ zlog_debug("%s: Received IPSET_FAIL_INSTALL", __func__);
bgp_pbim->installed = false;
bgp_pbim->install_in_progress = false;
break;
@@ -2173,14 +2173,12 @@ static int ipset_notify_owner(ZAPI_CALLBACK_ARGS)
bgp_pbim->installed = true;
bgp_pbim->install_in_progress = false;
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Received IPSET_INSTALLED",
- __func__);
+ zlog_debug("%s: Received IPSET_INSTALLED", __func__);
break;
case ZAPI_IPSET_FAIL_REMOVE:
case ZAPI_IPSET_REMOVED:
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Received IPSET REMOVED",
- __func__);
+ zlog_debug("%s: Received IPSET REMOVED", __func__);
break;
}
@@ -2205,8 +2203,9 @@ static int ipset_entry_notify_owner(ZAPI_CALLBACK_ARGS)
unique);
if (!bgp_pbime) {
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Fail to look BGP match entry (%u, ID %u)",
- __func__, note, unique);
+ zlog_debug(
+ "%s: Fail to look BGP match entry (%u, ID %u)",
+ __func__, note, unique);
return 0;
}
@@ -2274,15 +2273,13 @@ static int iptable_notify_owner(ZAPI_CALLBACK_ARGS)
bgpm->installed_in_iptable = true;
bgpm->install_iptable_in_progress = false;
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Received IPTABLE_INSTALLED",
- __func__);
+ zlog_debug("%s: Received IPTABLE_INSTALLED", __func__);
bgpm->action->refcnt++;
break;
case ZAPI_IPTABLE_FAIL_REMOVE:
case ZAPI_IPTABLE_REMOVED:
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: Received IPTABLE REMOVED",
- __func__);
+ zlog_debug("%s: Received IPTABLE REMOVED", __func__);
break;
}
return 0;
@@ -2786,12 +2783,10 @@ void bgp_send_pbr_rule_action(struct bgp_pbr_action *pbra,
return;
if (BGP_DEBUG(zebra, ZEBRA)) {
if (pbr)
- zlog_debug("%s: table %d (ip rule) %d",
- __func__,
+ zlog_debug("%s: table %d (ip rule) %d", __func__,
pbra->table_id, install);
else
- zlog_debug("%s: table %d fwmark %d %d",
- __func__,
+ zlog_debug("%s: table %d fwmark %d %d", __func__,
pbra->table_id, pbra->fwmark, install);
}
s = zclient->obuf;
@@ -2820,10 +2815,9 @@ void bgp_send_pbr_ipset_match(struct bgp_pbr_match *pbrim, bool install)
if (pbrim->install_in_progress)
return;
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: name %s type %d %d, ID %u",
- __func__,
- pbrim->ipset_name, pbrim->type,
- install, pbrim->unique);
+ zlog_debug("%s: name %s type %d %d, ID %u", __func__,
+ pbrim->ipset_name, pbrim->type, install,
+ pbrim->unique);
s = zclient->obuf;
stream_reset(s);
@@ -2850,8 +2844,8 @@ void bgp_send_pbr_ipset_entry_match(struct bgp_pbr_match_entry *pbrime,
return;
if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("%s: name %s %d %d, ID %u", __func__,
- pbrime->backpointer->ipset_name,
- pbrime->unique, install, pbrime->unique);
+ pbrime->backpointer->ipset_name, pbrime->unique,
+ install, pbrime->unique);
s = zclient->obuf;
stream_reset(s);
@@ -2916,9 +2910,8 @@ void bgp_send_pbr_iptable(struct bgp_pbr_action *pba,
if (pbm->install_iptable_in_progress)
return;
if (BGP_DEBUG(zebra, ZEBRA))
- zlog_debug("%s: name %s type %d mark %d %d, ID %u",
- __func__, pbm->ipset_name,
- pbm->type, pba->fwmark, install,
+ zlog_debug("%s: name %s type %d mark %d %d, ID %u", __func__,
+ pbm->ipset_name, pbm->type, pba->fwmark, install,
pbm->unique2);
s = zclient->obuf;
stream_reset(s);
diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index 006a84db8..48e9a18e5 100644
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -351,8 +351,8 @@ int eigrp_write(struct thread *thread)
ep = eigrp_fifo_next(ei->obuf);
if (!ep) {
flog_err(EC_LIB_DEVELOPMENT,
- "%s: Interface %s no packet on queue?",
- __func__, ei->ifp->name);
+ "%s: Interface %s no packet on queue?", __func__,
+ ei->ifp->name);
goto out;
}
if (ep->length < EIGRP_HEADER_LEN) {
diff --git a/lib/ptm_lib.c b/lib/ptm_lib.c
index 04677a972..b66ae221c 100644
--- a/lib/ptm_lib.c
+++ b/lib/ptm_lib.c
@@ -425,8 +425,7 @@ int ptm_lib_process_msg(ptm_lib_handle_t *hdl, int fd, char *inbuf, int inlen,
csv_decode(csv, inbuf);
p_ctxt = calloc(1, sizeof(*p_ctxt));
if (!p_ctxt) {
- ERRLOG("%s: Could not allocate context \n",
- __func__);
+ ERRLOG("%s: Could not allocate context \n", __func__);
csv_clean(csv);
csv_free(csv);
return -1;
diff --git a/lib/routemap.c b/lib/routemap.c
index a2990c8b3..e2baa36f2 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -2684,8 +2684,7 @@ static void route_map_print_dependency(struct hash_bucket *bucket, void *data)
char *rmap_name = dep_data->rname;
char *dep_name = data;
- zlog_debug("%s: Dependency for %s: %s", __func__, dep_name,
- rmap_name);
+ zlog_debug("%s: Dependency for %s: %s", __func__, dep_name, rmap_name);
}
static int route_map_dep_update(struct hash *dephash, const char *dep_name,
diff --git a/lib/vrf.c b/lib/vrf.c
index 4d07c3d88..370a1b235 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -493,8 +493,7 @@ void vrf_init(int (*create)(struct vrf *), int (*enable)(struct vrf *),
/* initialise NS, in case VRF backend if NETNS */
ns_init();
if (debug_vrf)
- zlog_debug("%s: Initializing VRF subsystem",
- __func__);
+ zlog_debug("%s: Initializing VRF subsystem", __func__);
vrf_master.vrf_new_hook = create;
vrf_master.vrf_enable_hook = enable;
@@ -535,8 +534,7 @@ void vrf_terminate(void)
struct vrf *vrf;
if (debug_vrf)
- zlog_debug("%s: Shutting down vrf subsystem",
- __func__);
+ zlog_debug("%s: Shutting down vrf subsystem", __func__);
while (!RB_EMPTY(vrf_id_head, &vrfs_by_id)) {
vrf = RB_ROOT(vrf_id_head, &vrfs_by_id);
diff --git a/lib/wheel.c b/lib/wheel.c
index bf2a28b40..214e5e816 100644
--- a/lib/wheel.c
+++ b/lib/wheel.c
@@ -146,8 +146,8 @@ int wheel_add_item(struct timer_wheel *wheel, void *item)
slot = (*wheel->slot_key)(item);
if (debug_timer_wheel)
- zlog_debug("%s: Inserting %p: %lld %lld", __func__,
- item, slot, slot % wheel->slots);
+ zlog_debug("%s: Inserting %p: %lld %lld", __func__, item, slot,
+ slot % wheel->slots);
listnode_add(wheel->wheel_slot_lists[slot % wheel->slots], item);
return 0;
@@ -160,8 +160,8 @@ int wheel_remove_item(struct timer_wheel *wheel, void *item)
slot = (*wheel->slot_key)(item);
if (debug_timer_wheel)
- zlog_debug("%s: Removing %p: %lld %lld", __func__,
- item, slot, slot % wheel->slots);
+ zlog_debug("%s: Removing %p: %lld %lld", __func__, item, slot,
+ slot % wheel->slots);
listnode_delete(wheel->wheel_slot_lists[slot % wheel->slots], item);
return 0;
diff --git a/lib/zclient.c b/lib/zclient.c
index a605ddf8c..ec193035f 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -236,9 +236,8 @@ int zclient_socket_connect(struct zclient *zclient)
ret = connect(sock, (struct sockaddr *)&zclient_addr, zclient_addr_len);
if (ret < 0) {
if (zclient_debug)
- zlog_debug("%s connect failure: %d(%s)",
- __func__, errno,
- safe_strerror(errno));
+ zlog_debug("%s connect failure: %d(%s)", __func__,
+ errno, safe_strerror(errno));
close(sock);
return -1;
}
@@ -1161,8 +1160,8 @@ int zapi_route_decode(struct stream *s, struct zapi_route *api)
break;
default:
flog_err(EC_LIB_ZAPI_ENCODE,
- "%s: Specified family %d is not v4 or v6",
- __func__, api->prefix.family);
+ "%s: Specified family %d is not v4 or v6", __func__,
+ api->prefix.family);
return -1;
}
STREAM_GET(&api->prefix.u.prefix, s, PSIZE(api->prefix.prefixlen));
@@ -1309,8 +1308,7 @@ bool zapi_rule_notify_decode(struct stream *s, uint32_t *seqno,
STREAM_GETL(s, ifi);
if (zclient_debug)
- zlog_debug("%s: %u %u %u %u", __func__, seq, prio,
- uni, ifi);
+ zlog_debug("%s: %u %u %u %u", __func__, seq, prio, uni, ifi);
*seqno = seq;
*priority = prio;
*unique = uni;
@@ -2664,8 +2662,7 @@ int zapi_labels_decode(struct stream *s, struct zapi_labels *zl)
if (zl->route.prefix.prefixlen > IPV4_MAX_BITLEN) {
zlog_debug(
"%s: Specified prefix length %d is greater than a v4 address can support",
- __func__,
- zl->route.prefix.prefixlen);
+ __func__, zl->route.prefix.prefixlen);
return -1;
}
STREAM_GET(&zl->route.prefix.u.prefix4.s_addr, s,
@@ -2675,8 +2672,7 @@ int zapi_labels_decode(struct stream *s, struct zapi_labels *zl)
if (zl->route.prefix.prefixlen > IPV6_MAX_BITLEN) {
zlog_debug(
"%s: Specified prefix length %d is greater than a v6 address can support",
- __func__,
- zl->route.prefix.prefixlen);
+ __func__, zl->route.prefix.prefixlen);
return -1;
}
STREAM_GET(&zl->route.prefix.u.prefix6, s, psize);
diff --git a/nhrpd/vici.c b/nhrpd/vici.c
index 367e5a796..4f12d796a 100644
--- a/nhrpd/vici.c
+++ b/nhrpd/vici.c
@@ -481,8 +481,8 @@ static int vici_reconnect(struct thread *t)
fd = sock_open_unix("/var/run/charon.vici");
if (fd < 0) {
debugf(NHRP_DEBUG_VICI,
- "%s: failure connecting VICI socket: %s",
- __func__, strerror(errno));
+ "%s: failure connecting VICI socket: %s", __func__,
+ strerror(errno));
thread_add_timer(master, vici_reconnect, vici, 2,
&vici->t_reconnect);
return 0;
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index fd5b9e654..b0d501dab 100644
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -232,8 +232,8 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route,
&route->prefix)), buf,
sizeof(buf));
zlog_debug(
- "%s: route %s with cost %u is not best, ignore."
- , __func__, buf,
+ "%s: route %s with cost %u is not best, ignore.",
+ __func__, buf,
route->path.cost);
}
return 0;
@@ -246,9 +246,10 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route,
if (is_debug) {
prefix2str(&route->prefix, buf,
sizeof(buf));
- zlog_debug("%s: intra-prefix route %s with cost %u is not best, ignore."
- , __func__, buf,
- route->path.cost);
+ zlog_debug(
+ "%s: intra-prefix route %s with cost %u is not best, ignore.",
+ __func__, buf,
+ route->path.cost);
}
return 0;
}
diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
index 2405894e0..9fe077b54 100644
--- a/ospf6d/ospf6_area.c
+++ b/ospf6d/ospf6_area.c
@@ -61,8 +61,7 @@ static void ospf6_area_lsdb_hook_add(struct ospf6_lsa *lsa)
case OSPF6_LSTYPE_ROUTER:
case OSPF6_LSTYPE_NETWORK:
if (IS_OSPF6_DEBUG_EXAMIN_TYPE(lsa->header->type)) {
- zlog_debug("%s Examin LSA %s", __func__,
- lsa->name);
+ zlog_debug("%s Examin LSA %s", __func__, lsa->name);
zlog_debug(" Schedule SPF Calculation for %s",
OSPF6_AREA(lsa->lsdb->data)->name);
}
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 6d643511d..486e4d8d2 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -892,8 +892,7 @@ static int ospf6_asbr_routemap_update_timer(struct thread *thread)
if (ospf6->rmap[arg_type].map) {
if (IS_OSPF6_DEBUG_ASBR)
zlog_debug("%s: route-map %s update, reset redist %s",
- __func__,
- ospf6->rmap[arg_type].name,
+ __func__, ospf6->rmap[arg_type].name,
ZROUTE_NAME(arg_type));
ospf6_zebra_no_redistribute(arg_type);
@@ -917,8 +916,8 @@ void ospf6_asbr_distribute_list_update(int type)
args[1] = (void *)((ptrdiff_t)type);
if (IS_OSPF6_DEBUG_ASBR)
- zlog_debug("%s: trigger redistribute %s reset thread",
- __func__, ZROUTE_NAME(type));
+ zlog_debug("%s: trigger redistribute %s reset thread", __func__,
+ ZROUTE_NAME(type));
ospf6->t_distribute_update = NULL;
thread_add_timer_msec(master, ospf6_asbr_routemap_update_timer,
diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c
index 352b72cb6..891421b7e 100644
--- a/ospf6d/ospf6_flood.c
+++ b/ospf6d/ospf6_flood.c
@@ -258,8 +258,8 @@ void ospf6_install_lsa(struct ospf6_lsa *lsa)
if (IS_OSPF6_DEBUG_LSA_TYPE(lsa->header->type)
|| IS_OSPF6_DEBUG_EXAMIN_TYPE(lsa->header->type))
zlog_debug("%s Install LSA: %s age %d seqnum %x in LSDB.",
- __func__, lsa->name,
- ntohs(lsa->header->age), ntohl(lsa->header->seqnum));
+ __func__, lsa->name, ntohs(lsa->header->age),
+ ntohl(lsa->header->seqnum));
/* actually install */
lsa->installed = now;
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index 4a9560d14..192e6356b 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -1732,21 +1732,22 @@ void ospf6_intra_prefix_lsa_add(struct ospf6_lsa *lsa)
if (old) {
if (IS_OSPF6_DEBUG_EXAMIN(INTRA_PREFIX)) {
prefix2str(&route->prefix, buf, sizeof(buf));
- zlog_debug("%s Update route: %s old cost %u new cost %u paths %u nh %u",
- __func__, buf,
- old->path.cost, route->path.cost,
- listcount(route->paths),
- listcount(route->nh_list));
+ zlog_debug(
+ "%s Update route: %s old cost %u new cost %u paths %u nh %u",
+ __func__, buf, old->path.cost,
+ route->path.cost,
+ listcount(route->paths),
+ listcount(route->nh_list));
}
ospf6_intra_prefix_route_ecmp_path(oa, old, route);
} else {
if (IS_OSPF6_DEBUG_EXAMIN(INTRA_PREFIX)) {
prefix2str(&route->prefix, buf, sizeof(buf));
- zlog_debug("%s route %s add with cost %u paths %u nh %u",
- __func__, buf,
- route->path.cost,
- listcount(route->paths),
- listcount(route->nh_list));
+ zlog_debug(
+ "%s route %s add with cost %u paths %u nh %u",
+ __func__, buf, route->path.cost,
+ listcount(route->paths),
+ listcount(route->nh_list));
}
ospf6_route_add(route, oa->route_table);
}
@@ -1859,8 +1860,7 @@ void ospf6_intra_prefix_lsa_remove(struct ospf6_lsa *lsa)
char buf[PREFIX2STR_BUFFER];
if (IS_OSPF6_DEBUG_EXAMIN(INTRA_PREFIX))
- zlog_debug("%s: %s disappearing", __func__,
- lsa->name);
+ zlog_debug("%s: %s disappearing", __func__, lsa->name);
oa = OSPF6_AREA(lsa->lsdb->data);
@@ -1917,12 +1917,12 @@ void ospf6_intra_prefix_lsa_remove(struct ospf6_lsa *lsa)
if (IS_OSPF6_DEBUG_EXAMIN(INTRA_PREFIX)) {
prefix2str(&route->prefix, buf,
sizeof(buf));
- zlog_debug("%s: route remove %s with path type %u cost %u paths %u nh %u",
- __func__, buf,
- route->path.type,
- route->path.cost,
- listcount(route->paths),
- listcount(route->nh_list));
+ zlog_debug(
+ "%s: route remove %s with path type %u cost %u paths %u nh %u",
+ __func__, buf, route->path.type,
+ route->path.cost,
+ listcount(route->paths),
+ listcount(route->nh_list));
}
ospf6_route_remove(route, oa->route_table);
}
@@ -2054,8 +2054,8 @@ void ospf6_intra_brouter_calculation(struct ospf6_area *oa)
if (IS_OSPF6_DEBUG_BROUTER_SPECIFIC_AREA_ID(oa->area_id) ||
IS_OSPF6_DEBUG_ROUTE(MEMORY))
- zlog_info("%s: border-router calculation for area %s",
- __func__, oa->name);
+ zlog_info("%s: border-router calculation for area %s", __func__,
+ oa->name);
hook_add = oa->ospf6->brouter_table->hook_add;
hook_remove = oa->ospf6->brouter_table->hook_remove;
@@ -2161,10 +2161,11 @@ void ospf6_intra_brouter_calculation(struct ospf6_area *oa)
if (ospf6_route_lookup(&adv_prefix, oa->spf_table)) {
if (IS_OSPF6_DEBUG_BROUTER) {
- zlog_debug("%s: keep inter brouter %s as adv router 0x%x found in spf",
- __func__,
- brouter_name,
- brouter->path.origin.adv_router);
+ zlog_debug(
+ "%s: keep inter brouter %s as adv router 0x%x found in spf",
+ __func__, brouter_name,
+ brouter->path.origin
+ .adv_router);
ospf6_brouter_debug_print(brouter);
}
UNSET_FLAG(brouter->flag, OSPF6_ROUTE_REMOVE);
@@ -2183,9 +2184,9 @@ void ospf6_intra_brouter_calculation(struct ospf6_area *oa)
brouter_id)
|| IS_OSPF6_DEBUG_BROUTER_SPECIFIC_AREA_ID(
oa->area_id))
- zlog_info("%s: brouter %s disappears via area %s",
- __func__, brouter_name,
- oa->name);
+ zlog_info(
+ "%s: brouter %s disappears via area %s",
+ __func__, brouter_name, oa->name);
/* This is used to protect nbrouter from removed from
* the table. For an example, ospf6_abr_examin_summary,
* removes brouters which are marked for remove.
@@ -2201,8 +2202,7 @@ void ospf6_intra_brouter_calculation(struct ospf6_area *oa)
|| IS_OSPF6_DEBUG_BROUTER_SPECIFIC_AREA_ID(
oa->area_id))
zlog_info("%s: brouter %s appears via area %s",
- __func__, brouter_name,
- oa->name);
+ __func__, brouter_name, oa->name);
/* newly added */
if (hook_add)
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index ff918d019..21f9b0722 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -2186,9 +2186,8 @@ int ospf6_lsupdate_send_neighbor_now(struct ospf6_neighbor *on,
if (IS_OSPF6_DEBUG_FLOODING
|| IS_OSPF6_DEBUG_MESSAGE(OSPF6_MESSAGE_TYPE_LSUPDATE, SEND))
- zlog_debug("%s: Send lsupdate with lsa %s (age %u)",
- __func__, lsa->name,
- ntohs(lsa->header->age));
+ zlog_debug("%s: Send lsupdate with lsa %s (age %u)", __func__,
+ lsa->name, ntohs(lsa->header->age));
ospf6_send_lsupdate(on, NULL, oh);
@@ -2244,8 +2243,7 @@ int ospf6_lsupdate_send_interface(struct thread *thread)
if (IS_OSPF6_DEBUG_MESSAGE(
OSPF6_MESSAGE_TYPE_LSUPDATE, SEND))
zlog_debug("%s: LSUpdate length %d",
- __func__,
- ntohs(oh->length));
+ __func__, ntohs(oh->length));
memset(sendbuf, 0, iobuflen);
oh = (struct ospf6_header *)sendbuf;
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 86ea9ff32..524017a31 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -995,8 +995,8 @@ struct ospf6_lsa *ospf6_create_single_router_lsa(struct ospf6_area *area,
rtr_lsa = ospf6_lsdb_next(end, rtr_lsa);
}
if (IS_OSPF6_DEBUG_SPF(PROCESS))
- zlog_debug("%s: adv_router %s num_lsa %u to convert.",
- __func__, ifbuf, num_lsa);
+ zlog_debug("%s: adv_router %s num_lsa %u to convert.", __func__,
+ ifbuf, num_lsa);
if (num_lsa == 1)
return lsa;
@@ -1074,9 +1074,9 @@ struct ospf6_lsa *ospf6_create_single_router_lsa(struct ospf6_area *area,
if (IS_OSPF6_DEBUG_SPF(PROCESS))
zlog_debug("%s: LSA %s id %u type 0%x len %u num_lsa %u",
- __func__, lsa->name,
- ntohl(lsa->header->id), ntohs(lsa->header->type),
- ntohs(lsa->header->length), num_lsa);
+ __func__, lsa->name, ntohl(lsa->header->id),
+ ntohs(lsa->header->type), ntohs(lsa->header->length),
+ num_lsa);
return lsa;
}
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 8ebcb53bb..1717f1e65 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -64,10 +64,9 @@ static int ospf6_router_id_update_zebra(ZAPI_CALLBACK_ARGS)
if (IS_OSPF6_DEBUG_ZEBRA(RECV)) {
char buf[INET_ADDRSTRLEN];
- zlog_debug("%s: zebra router-id %s update",
- __func__,
- inet_ntop(AF_INET, &router_id.u.prefix4,
- buf, INET_ADDRSTRLEN));
+ zlog_debug("%s: zebra router-id %s update", __func__,
+ inet_ntop(AF_INET, &router_id.u.prefix4, buf,
+ INET_ADDRSTRLEN));
}
ospf6_router_id_update();
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 0b18463ff..1622b2fd2 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -272,8 +272,8 @@ struct ospf_interface *ospf_if_new(struct ospf *ospf, struct interface *ifp,
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("%s: ospf interface %s vrf %s id %u created",
- __func__, ifp->name,
- ospf_get_name(ospf), ospf->vrf_id);
+ __func__, ifp->name, ospf_get_name(ospf),
+ ospf->vrf_id);
return oi;
}
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 34a72cc0e..de8c371f1 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -2376,9 +2376,9 @@ static struct stream *ospf_recv_packet(struct ospf *ospf, int fd,
}
if (IS_DEBUG_OSPF_PACKET(0, RECV))
- zlog_debug("%s: fd %d(%s) on interface %d(%s)",
- __func__, fd, ospf_get_name(ospf),
- ifindex, *ifp ? (*ifp)->name : "Unknown");
+ zlog_debug("%s: fd %d(%s) on interface %d(%s)", __func__, fd,
+ ospf_get_name(ospf), ifindex,
+ *ifp ? (*ifp)->name : "Unknown");
return ibuf;
}
@@ -2984,8 +2984,7 @@ static enum ospf_read_return_enum ospf_read_helper(struct ospf *ospf)
if (IS_DEBUG_OSPF_PACKET(0, RECV))
zlog_debug(
"%s: Unable to determine incoming interface from: %s(%s)",
- __func__,
- inet_ntoa(iph->ip_src),
+ __func__, inet_ntoa(iph->ip_src),
ospf_get_name(ospf));
return OSPF_READ_CONTINUE;
}
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 356eba4aa..1cea79d64 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -87,8 +87,8 @@ static int ospf_router_id_update_zebra(ZAPI_CALLBACK_ARGS)
prefix2str(&router_id, buf, sizeof(buf));
zlog_debug(
"%s: ospf instance not found for vrf %s id %u router_id %s",
- __func__,
- ospf_vrf_id_to_name(vrf_id), vrf_id, buf);
+ __func__, ospf_vrf_id_to_name(vrf_id), vrf_id,
+ buf);
}
}
return 0;
@@ -1320,8 +1320,7 @@ void ospf_zebra_vrf_register(struct ospf *ospf)
if (ospf->vrf_id != VRF_UNKNOWN) {
if (IS_DEBUG_OSPF_EVENT)
- zlog_debug("%s: Register VRF %s id %u",
- __func__,
+ zlog_debug("%s: Register VRF %s id %u", __func__,
ospf_vrf_id_to_name(ospf->vrf_id),
ospf->vrf_id);
zclient_send_reg_requests(zclient, ospf->vrf_id);
@@ -1336,8 +1335,7 @@ void ospf_zebra_vrf_deregister(struct ospf *ospf)
if (ospf->vrf_id != VRF_DEFAULT && ospf->vrf_id != VRF_UNKNOWN) {
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("%s: De-Register VRF %s id %u to Zebra.",
- __func__,
- ospf_vrf_id_to_name(ospf->vrf_id),
+ __func__, ospf_vrf_id_to_name(ospf->vrf_id),
ospf->vrf_id);
/* Deregister for router-id, interfaces,
* redistributed routes. */
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 6001f7237..2a0f8cdc0 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -2019,8 +2019,8 @@ void ospf_vrf_unlink(struct ospf *ospf, struct vrf *vrf)
static int ospf_vrf_new(struct vrf *vrf)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_debug("%s: VRF Created: %s(%u)", __func__,
- vrf->name, vrf->vrf_id);
+ zlog_debug("%s: VRF Created: %s(%u)", __func__, vrf->name,
+ vrf->vrf_id);
return 0;
}
@@ -2029,8 +2029,8 @@ static int ospf_vrf_new(struct vrf *vrf)
static int ospf_vrf_delete(struct vrf *vrf)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_debug("%s: VRF Deletion: %s(%u)", __func__,
- vrf->name, vrf->vrf_id);
+ zlog_debug("%s: VRF Deletion: %s(%u)", __func__, vrf->name,
+ vrf->vrf_id);
return 0;
}
@@ -2113,8 +2113,8 @@ static int ospf_vrf_disable(struct vrf *vrf)
return 0;
if (IS_DEBUG_OSPF_EVENT)
- zlog_debug("%s: VRF %s id %d disabled.", __func__,
- vrf->name, vrf->vrf_id);
+ zlog_debug("%s: VRF %s id %d disabled.", __func__, vrf->name,
+ vrf->vrf_id);
ospf = ospf_lookup_by_name(vrf->name);
if (ospf) {
@@ -2126,8 +2126,8 @@ static int ospf_vrf_disable(struct vrf *vrf)
ospf_vrf_unlink(ospf, vrf);
ospf->oi_running = 0;
if (IS_DEBUG_OSPF_EVENT)
- zlog_debug("%s: ospf old_vrf_id %d unlinked",
- __func__, old_vrf_id);
+ zlog_debug("%s: ospf old_vrf_id %d unlinked", __func__,
+ old_vrf_id);
thread_cancel(ospf->t_read);
close(ospf->fd);
ospf->fd = -1;
diff --git a/pbrd/pbr_map.c b/pbrd/pbr_map.c
index 401518924..9f4a75fa4 100644
--- a/pbrd/pbr_map.c
+++ b/pbrd/pbr_map.c
@@ -595,8 +595,8 @@ bool pbr_map_check_valid(const char *name)
pbrm = pbrm_find(name);
if (!pbrm) {
DEBUGD(&pbr_dbg_map,
- "%s: Specified PBR-MAP(%s) does not exist?",
- __func__, name);
+ "%s: Specified PBR-MAP(%s) does not exist?", __func__,
+ name);
return false;
}
@@ -726,8 +726,8 @@ void pbr_map_check(struct pbr_map_sequence *pbrms)
bool install;
pbrm = pbrms->parent;
- DEBUGD(&pbr_dbg_map, "%s: for %s(%u)", __func__,
- pbrm->name, pbrms->seqno);
+ DEBUGD(&pbr_dbg_map, "%s: for %s(%u)", __func__, pbrm->name,
+ pbrms->seqno);
if (pbr_map_check_valid(pbrm->name))
DEBUGD(&pbr_dbg_map, "We are totally valid %s",
pbrm->name);
@@ -735,16 +735,13 @@ void pbr_map_check(struct pbr_map_sequence *pbrms)
if (pbrms->reason == PBR_MAP_VALID_SEQUENCE_NUMBER) {
install = true;
DEBUGD(&pbr_dbg_map, "%s: Installing %s(%u) reason: %" PRIu64,
- __func__, pbrm->name, pbrms->seqno,
- pbrms->reason);
+ __func__, pbrm->name, pbrms->seqno, pbrms->reason);
DEBUGD(&pbr_dbg_map,
"\tSending PBR_MAP_POLICY_INSTALL event");
} else {
install = false;
- DEBUGD(&pbr_dbg_map,
- "%s: Removing %s(%u) reason: %" PRIu64,
- __func__, pbrm->name,
- pbrms->seqno, pbrms->reason);
+ DEBUGD(&pbr_dbg_map, "%s: Removing %s(%u) reason: %" PRIu64,
+ __func__, pbrm->name, pbrms->seqno, pbrms->reason);
}
if (install)
diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c
index a55008240..c0c417a74 100644
--- a/pbrd/pbr_nht.c
+++ b/pbrd/pbr_nht.c
@@ -97,8 +97,7 @@ static void *pbr_nh_alloc(void *p)
/* Decremented again in pbr_nh_delete */
++nhrc->refcount;
- DEBUGD(&pbr_dbg_nht, "%s: Sending nexthop to Zebra",
- __func__);
+ DEBUGD(&pbr_dbg_nht, "%s: Sending nexthop to Zebra", __func__);
pbr_send_rnh(new->nexthop, true);
@@ -197,8 +196,8 @@ static void *pbr_nhgc_alloc(void *p)
strlcpy(new->name, pnhgc->name, sizeof(pnhgc->name));
new->table_id = pbr_nht_get_next_tableid(false);
- DEBUGD(&pbr_dbg_nht, "%s: NHT: %s assigned Table ID: %u",
- __func__, new->name, new->table_id);
+ DEBUGD(&pbr_dbg_nht, "%s: NHT: %s assigned Table ID: %u", __func__,
+ new->name, new->table_id);
new->nhh = hash_create_size(8, pbr_nh_hash_key, pbr_nh_hash_equal,
"PBR NH Cache Hash");
@@ -224,8 +223,7 @@ void pbr_nhgroup_add_cb(const char *name)
if (!pnhgc)
return;
- DEBUGD(&pbr_dbg_nht, "%s: Added nexthop-group %s", __func__,
- name);
+ DEBUGD(&pbr_dbg_nht, "%s: Added nexthop-group %s", __func__, name);
pbr_map_check_nh_group_change(name);
}
@@ -315,8 +313,7 @@ void pbr_nhgroup_del_nexthop_cb(const struct nexthop_group_cmd *nhgc,
void pbr_nhgroup_delete_cb(const char *name)
{
- DEBUGD(&pbr_dbg_nht, "%s: Removed nexthop-group %s",
- __func__, name);
+ DEBUGD(&pbr_dbg_nht, "%s: Removed nexthop-group %s", __func__, name);
/* delete group from all pbrms's */
pbr_nht_delete_group(name);
@@ -339,8 +336,8 @@ static void pbr_nht_find_nhg_from_table_install(struct hash_bucket *b,
uint32_t *table_id = (uint32_t *)data;
if (pnhgc->table_id == *table_id) {
- DEBUGD(&pbr_dbg_nht, "%s: Table ID (%u) matches %s",
- __func__, *table_id, pnhgc->name);
+ DEBUGD(&pbr_dbg_nht, "%s: Table ID (%u) matches %s", __func__,
+ *table_id, pnhgc->name);
/*
* If the table has been re-handled by zebra
diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c
index 459cab365..c2d93a405 100644
--- a/pbrd/pbr_zebra.c
+++ b/pbrd/pbr_zebra.c
@@ -62,8 +62,7 @@ struct pbr_interface *pbr_if_new(struct interface *ifp)
/* Inteface addition message from zebra. */
int pbr_ifp_create(struct interface *ifp)
{
- DEBUGD(&pbr_dbg_zebra,
- "%s: %s", __func__, ifp->name);
+ DEBUGD(&pbr_dbg_zebra, "%s: %s", __func__, ifp->name);
if (!ifp->info)
pbr_if_new(ifp);
@@ -78,8 +77,7 @@ int pbr_ifp_create(struct interface *ifp)
int pbr_ifp_destroy(struct interface *ifp)
{
- DEBUGD(&pbr_dbg_zebra,
- "%s: %s", __func__, ifp->name);
+ DEBUGD(&pbr_dbg_zebra, "%s: %s", __func__, ifp->name);
pbr_map_policy_interface_update(ifp, false);
@@ -93,8 +91,7 @@ static int interface_address_add(ZAPI_CALLBACK_ARGS)
c = zebra_interface_address_read(cmd, zclient->ibuf, vrf_id);
- DEBUGD(&pbr_dbg_zebra,
- "%s: %s added %s", __func__,
+ DEBUGD(&pbr_dbg_zebra, "%s: %s added %s", __func__,
c ? c->ifp->name : "Unknown",
c ? prefix2str(c->address, buf, sizeof(buf)) : "Unknown");
@@ -111,8 +108,7 @@ static int interface_address_delete(ZAPI_CALLBACK_ARGS)
if (!c)
return 0;
- DEBUGD(&pbr_dbg_zebra,
- "%s: %s deleted %s", __func__, c->ifp->name,
+ DEBUGD(&pbr_dbg_zebra, "%s: %s deleted %s", __func__, c->ifp->name,
prefix2str(c->address, buf, sizeof(buf)));
connected_free(&c);
@@ -121,8 +117,7 @@ static int interface_address_delete(ZAPI_CALLBACK_ARGS)
int pbr_ifp_up(struct interface *ifp)
{
- DEBUGD(&pbr_dbg_zebra,
- "%s: %s is up", __func__, ifp->name);
+ DEBUGD(&pbr_dbg_zebra, "%s: %s is up", __func__, ifp->name);
pbr_nht_nexthop_interface_update(ifp);
@@ -131,8 +126,7 @@ int pbr_ifp_up(struct interface *ifp)
int pbr_ifp_down(struct interface *ifp)
{
- DEBUGD(&pbr_dbg_zebra,
- "%s: %s is down", __func__, ifp->name);
+ DEBUGD(&pbr_dbg_zebra, "%s: %s is down", __func__, ifp->name);
pbr_nht_nexthop_interface_update(ifp);
@@ -177,8 +171,8 @@ static int route_notify_owner(ZAPI_CALLBACK_ARGS)
switch (note) {
case ZAPI_ROUTE_FAIL_INSTALL:
DEBUGD(&pbr_dbg_zebra,
- "%s: [%s] Route install failure for table: %u",
- __func__, buf, table_id);
+ "%s: [%s] Route install failure for table: %u", __func__,
+ buf, table_id);
break;
case ZAPI_ROUTE_BETTER_ADMIN_WON:
DEBUGD(&pbr_dbg_zebra,
@@ -199,8 +193,8 @@ static int route_notify_owner(ZAPI_CALLBACK_ARGS)
break;
case ZAPI_ROUTE_REMOVE_FAIL:
DEBUGD(&pbr_dbg_zebra,
- "%s: [%s] Route remove fail for table: %u",
- __func__, buf, table_id);
+ "%s: [%s] Route remove fail for table: %u", __func__,
+ buf, table_id);
break;
}
@@ -224,8 +218,8 @@ static int rule_notify_owner(ZAPI_CALLBACK_ARGS)
pbrms = pbrms_lookup_unique(unique, ifi, &pmi);
if (!pbrms) {
DEBUGD(&pbr_dbg_zebra,
- "%s: Failure to lookup pbrms based upon %u",
- __func__, unique);
+ "%s: Failure to lookup pbrms based upon %u", __func__,
+ unique);
return 0;
}
@@ -256,8 +250,7 @@ static int rule_notify_owner(ZAPI_CALLBACK_ARGS)
static void zebra_connected(struct zclient *zclient)
{
- DEBUGD(&pbr_dbg_zebra, "%s: Registering for fun and profit",
- __func__);
+ DEBUGD(&pbr_dbg_zebra, "%s: Registering for fun and profit", __func__);
zclient_send_reg_requests(zclient, VRF_DEFAULT);
}
@@ -318,8 +311,7 @@ void route_add(struct pbr_nexthop_group_cache *pnhgc, struct nexthop_group nhg,
{
struct zapi_route api;
- DEBUGD(&pbr_dbg_zebra, "%s for Table: %d", __func__,
- pnhgc->table_id);
+ DEBUGD(&pbr_dbg_zebra, "%s for Table: %d", __func__, pnhgc->table_id);
memset(&api, 0, sizeof(api));
@@ -351,8 +343,7 @@ void route_add(struct pbr_nexthop_group_cache *pnhgc, struct nexthop_group nhg,
break;
case AFI_UNSPEC:
DEBUGD(&pbr_dbg_zebra,
- "%s: Asked to install unspecified route type",
- __func__);
+ "%s: Asked to install unspecified route type", __func__);
break;
}
}
@@ -365,8 +356,7 @@ void route_delete(struct pbr_nexthop_group_cache *pnhgc, afi_t afi)
{
struct zapi_route api;
- DEBUGD(&pbr_dbg_zebra, "%s for Table: %d", __func__,
- pnhgc->table_id);
+ DEBUGD(&pbr_dbg_zebra, "%s for Table: %d", __func__, pnhgc->table_id);
memset(&api, 0, sizeof(api));
api.vrf_id = VRF_DEFAULT;
@@ -398,8 +388,7 @@ void route_delete(struct pbr_nexthop_group_cache *pnhgc, afi_t afi)
break;
case AFI_UNSPEC:
DEBUGD(&pbr_dbg_zebra,
- "%s: Asked to delete unspecified route type",
- __func__);
+ "%s: Asked to delete unspecified route type", __func__);
break;
}
}
@@ -418,11 +407,10 @@ static int pbr_zebra_nexthop_update(ZAPI_CALLBACK_ARGS)
if (DEBUG_MODE_CHECK(&pbr_dbg_zebra, DEBUG_MODE_ALL)) {
DEBUGD(&pbr_dbg_zebra, "%s: Received Nexthop update: %s",
- __func__,
- prefix2str(&nhr.prefix, buf, sizeof(buf)));
+ __func__, prefix2str(&nhr.prefix, buf, sizeof(buf)));
- DEBUGD(&pbr_dbg_zebra, "%s: (\tNexthops(%u)",
- __func__, nhr.nexthop_num);
+ DEBUGD(&pbr_dbg_zebra, "%s: (\tNexthops(%u)", __func__,
+ nhr.nexthop_num);
for (i = 0; i < nhr.nexthop_num; i++) {
DEBUGD(&pbr_dbg_zebra,
@@ -490,8 +478,7 @@ void pbr_send_rnh(struct nexthop *nhop, bool reg)
if (zclient_send_rnh(zclient, command, &p,
false, nhop->vrf_id) < 0) {
- zlog_warn("%s: Failure to send nexthop to zebra",
- __func__);
+ zlog_warn("%s: Failure to send nexthop to zebra", __func__);
}
}
@@ -569,8 +556,8 @@ void pbr_send_pbr_map(struct pbr_map_sequence *pbrms,
is_installed &= pbrms->installed;
- DEBUGD(&pbr_dbg_zebra, "%s: for %s %d(%" PRIu64 ")",
- __func__, pbrm->name, install, is_installed);
+ DEBUGD(&pbr_dbg_zebra, "%s: for %s %d(%" PRIu64 ")", __func__,
+ pbrm->name, install, is_installed);
/*
* If we are installed and asked to do so again
@@ -595,9 +582,9 @@ void pbr_send_pbr_map(struct pbr_map_sequence *pbrms,
*/
stream_putl(s, 1);
- DEBUGD(&pbr_dbg_zebra, "%s: \t%s %s %d %s %u",
- __func__, install ? "Installing" : "Deleting",
- pbrm->name, install, pmi->ifp->name, pmi->delete);
+ DEBUGD(&pbr_dbg_zebra, "%s: \t%s %s %d %s %u", __func__,
+ install ? "Installing" : "Deleting", pbrm->name, install,
+ pmi->ifp->name, pmi->delete);
pbr_encode_pbr_map_sequence(s, pbrms, pmi->ifp);
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index 0fab00f9a..957f90471 100644
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -71,8 +71,8 @@ void pim_ifassert_winner_set(struct pim_ifchannel *ch,
sizeof(winner_str));
zlog_debug(
"%s: (S,G)=%s assert winner changed from %s to %s on interface %s",
- __func__, ch->sg_str, was_str,
- winner_str, ch->interface->name);
+ __func__, ch->sg_str, was_str, winner_str,
+ ch->interface->name);
}
} /* PIM_DEBUG_PIM_EVENTS */
@@ -205,8 +205,7 @@ static int dispatch_assert(struct interface *ifp, struct in_addr source_addr,
default: {
zlog_warn(
"%s: (S,G)=%s invalid assert state %d on interface %s",
- __func__, ch->sg_str, ch->ifassert_state,
- ifp->name);
+ __func__, ch->sg_str, ch->ifassert_state, ifp->name);
}
return -2;
}
@@ -297,9 +296,8 @@ int pim_assert_recv(struct interface *ifp, struct pim_neighbor *neigh,
pim_inet4_dump("<grp?>", sg.grp, group_str, sizeof(group_str));
zlog_debug(
"%s: from %s on %s: (S,G)=(%s,%s) pref=%u metric=%u rpt_bit=%u",
- __func__, neigh_str, ifp->name, source_str,
- group_str, msg_metric.metric_preference,
- msg_metric.route_metric,
+ __func__, neigh_str, ifp->name, source_str, group_str,
+ msg_metric.metric_preference, msg_metric.route_metric,
PIM_FORCE_BOOLEAN(msg_metric.rpt_bit_flag));
}
@@ -532,8 +530,8 @@ static int on_assert_timer(struct thread *t)
if (PIM_DEBUG_PIM_EVENTS)
zlog_warn(
"%s: (S,G)=%s invalid assert state %d on interface %s",
- __func__, ch->sg_str,
- ch->ifassert_state, ifp->name);
+ __func__, ch->sg_str, ch->ifassert_state,
+ ifp->name);
}
}
@@ -546,8 +544,7 @@ static void assert_timer_off(struct pim_ifchannel *ch)
if (ch->t_ifassert_timer) {
zlog_debug(
"%s: (S,G)=%s cancelling timer on interface %s",
- __func__, ch->sg_str,
- ch->interface->name);
+ __func__, ch->sg_str, ch->interface->name);
}
}
THREAD_OFF(ch->t_ifassert_timer);
@@ -559,8 +556,7 @@ static void pim_assert_timer_set(struct pim_ifchannel *ch, int interval)
if (PIM_DEBUG_PIM_TRACE) {
zlog_debug("%s: (S,G)=%s starting %u sec timer on interface %s",
- __func__, ch->sg_str, interval,
- ch->interface->name);
+ __func__, ch->sg_str, interval, ch->interface->name);
}
thread_add_timer(router->master, on_assert_timer, ch, interval,
diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c
index 1d068159e..f5fc1eebf 100644
--- a/pimd/pim_bfd.c
+++ b/pimd/pim_bfd.c
@@ -199,8 +199,8 @@ void pim_bfd_if_param_set(struct interface *ifp, uint32_t min_rx,
if (pim_ifp->bfd_info) {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: interface %s has bfd_info",
- __func__, ifp->name);
+ zlog_debug("%s: interface %s has bfd_info", __func__,
+ ifp->name);
}
if (command)
pim_bfd_reg_dereg_all_nbr(ifp, command);
diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index 5574bf0df..91fbddf93 100644
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -145,8 +145,7 @@ static struct bsgrp_node *pim_bsm_new_bsgrp_node(struct route_table *rt,
rn = route_node_get(rt, grp);
if (!rn) {
- zlog_warn("%s: route node creation failed",
- __func__);
+ zlog_warn("%s: route node creation failed", __func__);
return NULL;
}
bsgrp = XCALLOC(MTYPE_PIM_BSGRP_NODE, sizeof(struct bsgrp_node));
@@ -209,8 +208,7 @@ static int pim_on_bs_timer(struct thread *t)
bsgrp_node = (struct bsgrp_node *)rn->info;
if (!bsgrp_node) {
if (PIM_DEBUG_BSM)
- zlog_debug("%s: bsgrp_node is null",
- __func__);
+ zlog_debug("%s: bsgrp_node is null", __func__);
continue;
}
/* Give grace time for rp to continue for another hold time */
@@ -231,8 +229,8 @@ static int pim_on_bs_timer(struct thread *t)
static void pim_bs_timer_stop(struct bsm_scope *scope)
{
if (PIM_DEBUG_BSM)
- zlog_debug("%s : BS timer being stopped of sz: %d",
- __func__, scope->sz_id);
+ zlog_debug("%s : BS timer being stopped of sz: %d", __func__,
+ scope->sz_id);
THREAD_OFF(scope->bs_timer);
}
@@ -240,14 +238,14 @@ static void pim_bs_timer_start(struct bsm_scope *scope, int bs_timeout)
{
if (!scope) {
if (PIM_DEBUG_BSM)
- zlog_debug("%s : Invalid scope(NULL).",
- __func__);
+ zlog_debug("%s : Invalid scope(NULL).", __func__);
return;
}
THREAD_OFF(scope->bs_timer);
if (PIM_DEBUG_BSM)
- zlog_debug("%s : starting bs timer for scope %d with timeout %d secs",
- __func__, scope->sz_id, bs_timeout);
+ zlog_debug(
+ "%s : starting bs timer for scope %d with timeout %d secs",
+ __func__, scope->sz_id, bs_timeout);
thread_add_timer(router->master, pim_on_bs_timer, scope, bs_timeout,
&scope->bs_timer);
}
@@ -376,8 +374,7 @@ static void pim_g2rp_timer_start(struct bsm_rpinfo *bsrp, int hold_time)
{
if (!bsrp) {
if (PIM_DEBUG_BSM)
- zlog_debug("%s : Invalid brsp(NULL).",
- __func__);
+ zlog_debug("%s : Invalid brsp(NULL).", __func__);
return;
}
THREAD_OFF(bsrp->g2rp_timer);
@@ -386,8 +383,7 @@ static void pim_g2rp_timer_start(struct bsm_rpinfo *bsrp, int hold_time)
zlog_debug(
"%s : starting g2rp timer for grp: %s - rp: %s with timeout %d secs(Actual Hold time : %d secs)",
- __func__,
- prefix2str(&bsrp->bsgrp_node->group, buf, 48),
+ __func__, prefix2str(&bsrp->bsgrp_node->group, buf, 48),
inet_ntoa(bsrp->rp_address), hold_time,
bsrp->rp_holdtime);
}
@@ -466,8 +462,7 @@ static void pim_instate_pend_list(struct bsgrp_node *bsgrp_node)
if (!rn || (prefix_same(&rp_all->group, &bsgrp_node->group)
&& pim_rpf_addr_is_inaddr_none(&rp_all->rp))) {
if (PIM_DEBUG_BSM)
- zlog_debug("%s: Route node doesn't exist",
- __func__);
+ zlog_debug("%s: Route node doesn't exist", __func__);
if (pend)
pim_rp_new(pim, pend->rp_address, bsgrp_node->group,
NULL, RP_SRC_BSR);
@@ -587,8 +582,8 @@ static bool pim_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr,
char bsr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<bsr?>", bsr, bsr_str, sizeof(bsr_str));
- zlog_debug("%s : No route to BSR address %s",
- __func__, bsr_str);
+ zlog_debug("%s : No route to BSR address %s", __func__,
+ bsr_str);
}
return false;
}
@@ -886,8 +881,7 @@ static void pim_bsm_fwd_whole_sz(struct pim_instance *pim, uint8_t *buf,
dst_addr, no_fwd);
if (PIM_DEBUG_BSM)
zlog_debug("%s: pim_bsm_frag_send returned %s",
- __func__,
- ret ? "TRUE" : "FALSE");
+ __func__, ret ? "TRUE" : "FALSE");
} else {
pim_msg_build_header(buf, len, PIM_MSG_TYPE_BOOTSTRAP,
no_fwd);
@@ -1150,8 +1144,9 @@ static bool pim_bsm_parse_install_g2rp(struct bsm_scope *scope, uint8_t *buf,
group.family = AF_INET;
if (grpinfo.group.mask > IPV4_MAX_BITLEN) {
if (PIM_DEBUG_BSM)
- zlog_debug("%s, v4 prefix length specified: %d is too long",
- __func__, grpinfo.group.mask);
+ zlog_debug(
+ "%s, v4 prefix length specified: %d is too long",
+ __func__, grpinfo.group.mask);
return false;
}
group.prefixlen = grpinfo.group.mask;
@@ -1208,8 +1203,8 @@ static bool pim_bsm_parse_install_g2rp(struct bsm_scope *scope, uint8_t *buf,
rp_str, sizeof(rp_str));
zlog_debug(
"%s, Rp address - %s; pri:%d hold:%d\r\n",
- __func__, rp_str,
- rpinfo.rp_pri, rpinfo.rp_holdtime);
+ __func__, rp_str, rpinfo.rp_pri,
+ rpinfo.rp_holdtime);
}
/* Call Install api to update grp-rp mappings */
@@ -1259,8 +1254,8 @@ int pim_bsm_process(struct interface *ifp, struct ip *ip_hdr, uint8_t *buf,
/* Drop if bsm processing is disabled on interface */
if (!pim_ifp->bsm_enable) {
- zlog_warn("%s: BSM not enabled on interface %s",
- __func__, ifp->name);
+ zlog_warn("%s: BSM not enabled on interface %s", __func__,
+ ifp->name);
pim_ifp->pim_ifstat_bsm_cfg_miss++;
pim->bsm_dropped++;
return -1;
@@ -1268,8 +1263,9 @@ int pim_bsm_process(struct interface *ifp, struct ip *ip_hdr, uint8_t *buf,
if (buf_size < (PIM_MSG_HEADER_LEN + sizeof(struct bsm_hdr))) {
if (PIM_DEBUG_BSM)
- zlog_debug("%s: received buffer length of %d which is too small to properly decode",
- __func__, buf_size);
+ zlog_debug(
+ "%s: received buffer length of %d which is too small to properly decode",
+ __func__, buf_size);
return -1;
}
@@ -1361,8 +1357,7 @@ int pim_bsm_process(struct interface *ifp, struct ip *ip_hdr, uint8_t *buf,
if (empty_bsm) {
if (PIM_DEBUG_BSM)
- zlog_debug("%s : Empty Pref BSM received",
- __func__);
+ zlog_debug("%s : Empty Pref BSM received", __func__);
}
/* Parse Update bsm rp table and install/uninstall rp if required */
if (!pim_bsm_parse_install_g2rp(
@@ -1371,8 +1366,7 @@ int pim_bsm_process(struct interface *ifp, struct ip *ip_hdr, uint8_t *buf,
(buf_size - PIM_BSM_HDR_LEN - PIM_MSG_HEADER_LEN),
frag_tag)) {
if (PIM_DEBUG_BSM) {
- zlog_debug("%s, Parsing BSM failed.\r\n",
- __func__);
+ zlog_debug("%s, Parsing BSM failed.\r\n", __func__);
}
pim->bsm_dropped++;
return -1;
diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c
index a75dd25b5..ecdb3a34a 100644
--- a/pimd/pim_hello.c
+++ b/pimd/pim_hello.c
@@ -180,8 +180,8 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
sizeof(src_str));
zlog_debug(
"%s: short PIM hello TLV size=%d < min=%d from %s on interface %s",
- __func__, remain,
- PIM_TLV_MIN_SIZE, src_str, ifp->name);
+ __func__, remain, PIM_TLV_MIN_SIZE,
+ src_str, ifp->name);
}
FREE_ADDR_LIST_THEN_RETURN(-1);
}
@@ -198,9 +198,9 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
sizeof(src_str));
zlog_debug(
"%s: long PIM hello TLV type=%d length=%d > left=%td from %s on interface %s",
- __func__, option_type,
- option_len, tlv_pastend - tlv_curr,
- src_str, ifp->name);
+ __func__, option_type, option_len,
+ tlv_pastend - tlv_curr, src_str,
+ ifp->name);
}
FREE_ADDR_LIST_THEN_RETURN(-2);
}
@@ -211,8 +211,8 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
sizeof(src_str));
zlog_debug(
"%s: parse left_size=%d: PIM hello TLV type=%d length=%d from %s on %s",
- __func__, remain, option_type,
- option_len, src_str, ifp->name);
+ __func__, remain, option_type, option_len,
+ src_str, ifp->name);
}
switch (option_type) {
@@ -264,8 +264,8 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
sizeof(src_str));
zlog_debug(
"%s: ignoring PIM hello dense-mode state refresh TLV option type=%d length=%d from %s on interface %s",
- __func__, option_type,
- option_len, src_str, ifp->name);
+ __func__, option_type, option_len,
+ src_str, ifp->name);
}
break;
default:
@@ -275,8 +275,8 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
sizeof(src_str));
zlog_debug(
"%s: ignoring unknown PIM hello TLV type=%d length=%d from %s on interface %s",
- __func__, option_type,
- option_len, src_str, ifp->name);
+ __func__, option_type, option_len,
+ src_str, ifp->name);
}
}
@@ -288,40 +288,38 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
*/
if (PIM_DEBUG_PIM_HELLO) {
- tlv_trace_uint16(__func__, "holdtime", ifp->name,
- src_addr,
+ tlv_trace_uint16(__func__, "holdtime", ifp->name, src_addr,
PIM_OPTION_IS_SET(hello_options,
PIM_OPTION_MASK_HOLDTIME),
hello_option_holdtime);
- tlv_trace_uint16(__func__, "propagation_delay", ifp->name,
- src_addr,
- PIM_OPTION_IS_SET(hello_options,
- PIM_OPTION_MASK_LAN_PRUNE_DELAY),
- hello_option_propagation_delay);
- tlv_trace_uint16(__func__, "override_interval", ifp->name,
- src_addr,
- PIM_OPTION_IS_SET(hello_options,
- PIM_OPTION_MASK_LAN_PRUNE_DELAY),
- hello_option_override_interval);
- tlv_trace_bool(__func__, "can_disable_join_suppression",
- ifp->name, src_addr,
- PIM_OPTION_IS_SET(hello_options,
- PIM_OPTION_MASK_LAN_PRUNE_DELAY),
- PIM_OPTION_IS_SET(
- hello_options,
- PIM_OPTION_MASK_CAN_DISABLE_JOIN_SUPPRESSION));
- tlv_trace_uint32(__func__, "dr_priority", ifp->name,
- src_addr,
+ tlv_trace_uint16(
+ __func__, "propagation_delay", ifp->name, src_addr,
+ PIM_OPTION_IS_SET(hello_options,
+ PIM_OPTION_MASK_LAN_PRUNE_DELAY),
+ hello_option_propagation_delay);
+ tlv_trace_uint16(
+ __func__, "override_interval", ifp->name, src_addr,
+ PIM_OPTION_IS_SET(hello_options,
+ PIM_OPTION_MASK_LAN_PRUNE_DELAY),
+ hello_option_override_interval);
+ tlv_trace_bool(
+ __func__, "can_disable_join_suppression", ifp->name,
+ src_addr,
+ PIM_OPTION_IS_SET(hello_options,
+ PIM_OPTION_MASK_LAN_PRUNE_DELAY),
+ PIM_OPTION_IS_SET(
+ hello_options,
+ PIM_OPTION_MASK_CAN_DISABLE_JOIN_SUPPRESSION));
+ tlv_trace_uint32(__func__, "dr_priority", ifp->name, src_addr,
PIM_OPTION_IS_SET(hello_options,
PIM_OPTION_MASK_DR_PRIORITY),
hello_option_dr_priority);
- tlv_trace_uint32_hex(__func__, "generation_id", ifp->name,
- src_addr,
- PIM_OPTION_IS_SET(hello_options,
- PIM_OPTION_MASK_GENERATION_ID),
- hello_option_generation_id);
- tlv_trace_list(__func__, "address_list", ifp->name,
- src_addr,
+ tlv_trace_uint32_hex(
+ __func__, "generation_id", ifp->name, src_addr,
+ PIM_OPTION_IS_SET(hello_options,
+ PIM_OPTION_MASK_GENERATION_ID),
+ hello_option_generation_id);
+ tlv_trace_list(__func__, "address_list", ifp->name, src_addr,
PIM_OPTION_IS_SET(hello_options,
PIM_OPTION_MASK_ADDRESS_LIST),
hello_option_addr_list);
@@ -359,16 +357,16 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
sizeof(src_str));
zlog_warn(
"%s: failure creating PIM neighbor %s on interface %s",
- __func__, src_str,
- ifp->name);
+ __func__, src_str, ifp->name);
}
FREE_ADDR_LIST_THEN_RETURN(-8);
}
/* Forward BSM if required */
if (!pim_bsm_new_nbr_fwd(neigh, ifp)) {
if (PIM_DEBUG_PIM_HELLO)
- zlog_debug("%s: forwarding bsm to new nbr failed",
- __func__);
+ zlog_debug(
+ "%s: forwarding bsm to new nbr failed",
+ __func__);
}
/* actual addr list has been saved under neighbor */
@@ -392,8 +390,7 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
sizeof(src_str));
zlog_debug(
"%s: GenId mismatch new=%08x old=%08x: replacing neighbor %s on %s",
- __func__,
- hello_option_generation_id,
+ __func__, hello_option_generation_id,
neigh->generation_id, src_str,
ifp->name);
}
@@ -418,16 +415,16 @@ int pim_hello_recv(struct interface *ifp, struct in_addr src_addr,
sizeof(src_str));
zlog_debug(
"%s: failure re-creating PIM neighbor %s on interface %s",
- __func__, src_str,
- ifp->name);
+ __func__, src_str, ifp->name);
}
FREE_ADDR_LIST_THEN_RETURN(-9);
}
/* Forward BSM if required */
if (!pim_bsm_new_nbr_fwd(neigh, ifp)) {
if (PIM_DEBUG_PIM_HELLO)
- zlog_debug("%s: forwarding bsm to new nbr failed",
- __func__);
+ zlog_debug(
+ "%s: forwarding bsm to new nbr failed",
+ __func__);
}
/* actual addr list is saved under neighbor */
return 0;
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 5a5636d43..16eea1d6d 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -314,9 +314,9 @@ static int detect_primary_address_change(struct interface *ifp,
sizeof(new_prim_str));
pim_inet4_dump("<old?>", pim_ifp->primary_address, old_prim_str,
sizeof(old_prim_str));
- zlog_debug("%s: old=%s new=%s on interface %s: %s",
- __func__, old_prim_str, new_prim_str,
- ifp->name, changed ? "changed" : "unchanged");
+ zlog_debug("%s: old=%s new=%s on interface %s: %s", __func__,
+ old_prim_str, new_prim_str, ifp->name,
+ changed ? "changed" : "unchanged");
}
if (changed) {
@@ -487,8 +487,7 @@ int pim_update_source_set(struct interface *ifp, struct in_addr source)
}
pim_ifp->update_source = source;
- detect_address_change(ifp, 0 /* force_prim_as_any */,
- __func__);
+ detect_address_change(ifp, 0 /* force_prim_as_any */, __func__);
return PIM_SUCCESS;
}
@@ -947,14 +946,14 @@ int pim_if_add_vif(struct interface *ifp, bool ispimreg, bool is_vxlan_term)
if (pim_ifp->mroute_vif_index > 0) {
zlog_warn("%s: vif_index=%d > 0 on interface %s ifindex=%d",
- __func__, pim_ifp->mroute_vif_index,
- ifp->name, ifp->ifindex);
+ __func__, pim_ifp->mroute_vif_index, ifp->name,
+ ifp->ifindex);
return -1;
}
if (ifp->ifindex < 0) {
- zlog_warn("%s: ifindex=%d < 1 on interface %s",
- __func__, ifp->ifindex, ifp->name);
+ zlog_warn("%s: ifindex=%d < 1 on interface %s", __func__,
+ ifp->ifindex, ifp->name);
return -2;
}
@@ -1001,8 +1000,8 @@ int pim_if_del_vif(struct interface *ifp)
if (pim_ifp->mroute_vif_index < 1) {
zlog_warn("%s: vif_index=%d < 1 on interface %s ifindex=%d",
- __func__, pim_ifp->mroute_vif_index,
- ifp->name, ifp->ifindex);
+ __func__, pim_ifp->mroute_vif_index, ifp->name,
+ ifp->ifindex);
return -1;
}
@@ -1223,8 +1222,8 @@ static int igmp_join_sock(const char *ifname, ifindex_t ifindex,
sizeof(source_str));
zlog_warn(
"%s: setsockopt(fd=%d) failure for IGMP group %s source %s ifindex %d on interface %s: errno=%d: %s",
- __func__, join_fd, group_str, source_str,
- ifindex, ifname, errno, safe_strerror(errno));
+ __func__, join_fd, group_str, source_str, ifindex,
+ ifname, errno, safe_strerror(errno));
close(join_fd);
return -2;
@@ -1323,14 +1322,14 @@ int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr,
pim_ifp = ifp->info;
if (!pim_ifp) {
- zlog_warn("%s: multicast not enabled on interface %s",
- __func__, ifp->name);
+ zlog_warn("%s: multicast not enabled on interface %s", __func__,
+ ifp->name);
return -1;
}
if (!pim_ifp->igmp_join_list) {
- zlog_warn("%s: no IGMP join on interface %s",
- __func__, ifp->name);
+ zlog_warn("%s: no IGMP join on interface %s", __func__,
+ ifp->name);
return -2;
}
@@ -1357,8 +1356,8 @@ int pim_if_igmp_join_del(struct interface *ifp, struct in_addr group_addr,
sizeof(source_str));
zlog_warn(
"%s: failure closing sock_fd=%d for IGMP group %s source %s on interface %s: errno=%d: %s",
- __func__, ij->sock_fd, group_str, source_str,
- ifp->name, errno, safe_strerror(errno));
+ __func__, ij->sock_fd, group_str, source_str, ifp->name,
+ errno, safe_strerror(errno));
/* warning only */
}
listnode_delete(pim_ifp->igmp_join_list, ij);
@@ -1546,8 +1545,8 @@ int pim_ifp_create(struct interface *ifp)
if (PIM_DEBUG_ZEBRA) {
zlog_debug(
"%s: %s index %d(%u) flags %ld metric %d mtu %d operative %d",
- __func__, ifp->name, ifp->ifindex,
- ifp->vrf_id, (long)ifp->flags, ifp->metric, ifp->mtu,
+ __func__, ifp->name, ifp->ifindex, ifp->vrf_id,
+ (long)ifp->flags, ifp->metric, ifp->mtu,
if_is_operative(ifp));
}
@@ -1599,8 +1598,8 @@ int pim_ifp_up(struct interface *ifp)
if (PIM_DEBUG_ZEBRA) {
zlog_debug(
"%s: %s index %d(%u) flags %ld metric %d mtu %d operative %d",
- __func__, ifp->name, ifp->ifindex,
- ifp->vrf_id, (long)ifp->flags, ifp->metric, ifp->mtu,
+ __func__, ifp->name, ifp->ifindex, ifp->vrf_id,
+ (long)ifp->flags, ifp->metric, ifp->mtu,
if_is_operative(ifp));
}
@@ -1651,8 +1650,8 @@ int pim_ifp_down(struct interface *ifp)
if (PIM_DEBUG_ZEBRA) {
zlog_debug(
"%s: %s index %d(%u) flags %ld metric %d mtu %d operative %d",
- __func__, ifp->name, ifp->ifindex,
- ifp->vrf_id, (long)ifp->flags, ifp->metric, ifp->mtu,
+ __func__, ifp->name, ifp->ifindex, ifp->vrf_id,
+ (long)ifp->flags, ifp->metric, ifp->mtu,
if_is_operative(ifp));
}
@@ -1687,8 +1686,8 @@ int pim_ifp_destroy(struct interface *ifp)
if (PIM_DEBUG_ZEBRA) {
zlog_debug(
"%s: %s index %d(%u) flags %ld metric %d mtu %d operative %d",
- __func__, ifp->name, ifp->ifindex,
- ifp->vrf_id, (long)ifp->flags, ifp->metric, ifp->mtu,
+ __func__, ifp->name, ifp->ifindex, ifp->vrf_id,
+ (long)ifp->flags, ifp->metric, ifp->mtu,
if_is_operative(ifp));
}
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index f86e3e913..f3975a387 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -231,8 +231,7 @@ void pim_ifchannel_delete_all(struct interface *ifp)
while (!RB_EMPTY(pim_ifchannel_rb, &pim_ifp->ifchannel_rb)) {
ch = RB_ROOT(pim_ifchannel_rb, &pim_ifp->ifchannel_rb);
- pim_ifchannel_ifjoin_switch(__func__,
- ch, PIM_IFJOIN_NOINFO);
+ pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_NOINFO);
pim_ifchannel_delete(ch);
}
}
@@ -564,8 +563,7 @@ struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp,
RB_INSERT(pim_ifchannel_rb, &pim_ifp->ifchannel_rb, ch);
- up = pim_upstream_add(pim_ifp->pim, sg, NULL, up_flags,
- __func__, ch);
+ up = pim_upstream_add(pim_ifp->pim, sg, NULL, up_flags, __func__, ch);
ch->upstream = up;
@@ -695,8 +693,8 @@ static void check_recv_upstream(int is_join, struct interface *recv_ifp,
if (pim_rpf_addr_is_inaddr_any(&up->rpf)) {
/* RPF'(S,G) not found */
- zlog_warn("%s %s: RPF'%s not found", __FILE__,
- __func__, up->sg_str);
+ zlog_warn("%s %s: RPF'%s not found", __FILE__, __func__,
+ up->sg_str);
return;
}
@@ -709,8 +707,8 @@ static void check_recv_upstream(int is_join, struct interface *recv_ifp,
sizeof(rpf_str));
zlog_warn(
"%s %s: (S,G)=%s upstream=%s not directed to RPF'(S,G)=%s on interface %s",
- __FILE__, __func__, up->sg_str, up_str,
- rpf_str, recv_ifp->name);
+ __FILE__, __func__, up->sg_str, up_str, rpf_str,
+ recv_ifp->name);
return;
}
/* upstream directed to RPF'(S,G) */
@@ -778,8 +776,7 @@ static int nonlocal_upstream(int is_join, struct interface *recv_ifp,
static void pim_ifchannel_ifjoin_handler(struct pim_ifchannel *ch,
struct pim_interface *pim_ifp)
{
- pim_ifchannel_ifjoin_switch(__func__, ch,
- PIM_IFJOIN_JOIN);
+ pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_JOIN);
PIM_IF_FLAG_UNSET_S_G_RPT(ch->flags);
/* check if the interface qualifies as an immediate
* OIF
@@ -833,8 +830,7 @@ void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr,
pim_inet4_dump("<neigh?>", neigh_addr, neigh_str,
sizeof(neigh_str));
zlog_warn("%s: Assert Loser recv Join%s from %s on %s",
- __func__, ch->sg_str, neigh_str,
- ifp->name);
+ __func__, ch->sg_str, neigh_str, ifp->name);
assert_action_a5(ch);
}
@@ -844,8 +840,7 @@ void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr,
switch (ch->ifjoin_state) {
case PIM_IFJOIN_NOINFO:
- pim_ifchannel_ifjoin_switch(__func__, ch,
- PIM_IFJOIN_JOIN);
+ pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_JOIN);
if (pim_macro_chisin_oiflist(ch)) {
pim_upstream_inherited_olist(pim_ifp->pim,
ch->upstream);
@@ -948,8 +943,8 @@ void pim_ifchannel_prune(struct interface *ifp, struct in_addr upstream,
if (PIM_DEBUG_PIM_TRACE)
zlog_debug(
"%s: Received prune with no relevant ifchannel %s%s state: %d",
- __func__, ifp->name,
- pim_str_sg_dump(sg), source_flags);
+ __func__, ifp->name, pim_str_sg_dump(sg),
+ source_flags);
return;
}
@@ -1214,9 +1209,8 @@ void pim_ifchannel_update_could_assert(struct pim_ifchannel *ch)
pim_inet4_dump("<src?>", ch->sg.src, src_str, sizeof(src_str));
pim_inet4_dump("<grp?>", ch->sg.grp, grp_str, sizeof(grp_str));
zlog_debug("%s: CouldAssert(%s,%s,%s) changed from %d to %d",
- __func__, src_str, grp_str,
- ch->interface->name, old_couldassert,
- new_couldassert);
+ __func__, src_str, grp_str, ch->interface->name,
+ old_couldassert, new_couldassert);
}
if (new_couldassert) {
@@ -1263,8 +1257,7 @@ void pim_ifchannel_update_my_assert_metric(struct pim_ifchannel *ch)
new_addr_str, sizeof(new_addr_str));
zlog_debug(
"%s: my_assert_metric(%s,%s,%s) changed from %u,%u,%u,%s to %u,%u,%u,%s",
- __func__, src_str, grp_str,
- ch->interface->name,
+ __func__, src_str, grp_str, ch->interface->name,
ch->ifassert_my_metric.rpt_bit_flag,
ch->ifassert_my_metric.metric_preference,
ch->ifassert_my_metric.route_metric, old_addr_str,
@@ -1298,8 +1291,8 @@ void pim_ifchannel_update_assert_tracking_desired(struct pim_ifchannel *ch)
pim_inet4_dump("<grp?>", ch->sg.grp, grp_str, sizeof(grp_str));
zlog_debug(
"%s: AssertTrackingDesired(%s,%s,%s) changed from %d to %d",
- __func__, src_str, grp_str,
- ch->interface->name, old_atd, new_atd);
+ __func__, src_str, grp_str, ch->interface->name,
+ old_atd, new_atd);
}
if (new_atd) {
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 4c8423c0a..8d39d7e80 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -64,9 +64,8 @@ static int igmp_sock_open(struct in_addr ifaddr, struct interface *ifp,
} else {
zlog_warn(
"%s %s: IGMP socket fd=%d interface %s: could not solve %s to group address: errno=%d: %s",
- __FILE__, __func__, fd,
- inet_ntoa(ifaddr), PIM_ALL_ROUTERS, errno,
- safe_strerror(errno));
+ __FILE__, __func__, fd, inet_ntoa(ifaddr),
+ PIM_ALL_ROUTERS, errno, safe_strerror(errno));
}
}
@@ -119,8 +118,8 @@ static void igmp_sock_dump(array_t *igmp_sock_array)
struct igmp_sock *igmp = array_get(igmp_sock_array, i);
zlog_debug("%s %s: [%d/%d] igmp_addr=%s fd=%d", __FILE__,
- __func__, i, size,
- inet_ntoa(igmp->ifaddr), igmp->fd);
+ __func__, i, size, inet_ntoa(igmp->ifaddr),
+ igmp->fd);
}
}
#endif
@@ -166,8 +165,7 @@ static int pim_igmp_other_querier_expire(struct thread *t)
char ifaddr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str,
sizeof(ifaddr_str));
- zlog_debug("%s: Querier %s resuming", __func__,
- ifaddr_str);
+ zlog_debug("%s: Querier %s resuming", __func__, ifaddr_str);
}
/*
@@ -435,8 +433,7 @@ static int igmp_v1_recv_report(struct igmp_sock *igmp, struct in_addr from,
igmp->rx_stats.report_v1++;
if (PIM_DEBUG_IGMP_TRACE) {
- zlog_warn("%s %s: FIXME WRITEME", __FILE__,
- __func__);
+ zlog_warn("%s %s: FIXME WRITEME", __FILE__, __func__);
}
memcpy(&group_addr, igmp_msg + 4, sizeof(struct in_addr));
@@ -1014,9 +1011,8 @@ static int igmp_group_timer(struct thread *t)
char group_str[INET_ADDRSTRLEN];
pim_inet4_dump("<group?>", group->group_addr, group_str,
sizeof(group_str));
- zlog_debug("%s: Timer for group %s on interface %s",
- __func__, group_str,
- group->group_igmp_sock->interface->name);
+ zlog_debug("%s: Timer for group %s on interface %s", __func__,
+ group_str, group->group_igmp_sock->interface->name);
}
zassert(group->group_filtermode_isexcl);
diff --git a/pimd/pim_igmp_mtrace.c b/pimd/pim_igmp_mtrace.c
index f51a8905e..1cecd976c 100644
--- a/pimd/pim_igmp_mtrace.c
+++ b/pimd/pim_igmp_mtrace.c
@@ -132,8 +132,8 @@ static bool mtrace_fwd_info(struct pim_instance *pim,
if (!up->rpf.source_nexthop.interface) {
if (PIM_DEBUG_TRACE)
- zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ zlog_debug("%s: up %s RPF is not present", __func__,
+ up->sg_str);
return false;
}
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 49ddfbb46..d63269da9 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -332,8 +332,7 @@ void igmp_source_free(struct igmp_source *source)
static void source_channel_oil_detach(struct igmp_source *source)
{
if (source->source_channel_oil) {
- pim_channel_oil_del(source->source_channel_oil,
- __func__);
+ pim_channel_oil_del(source->source_channel_oil, __func__);
source->source_channel_oil = NULL;
}
}
@@ -545,8 +544,8 @@ void igmpv3_report_isin(struct igmp_sock *igmp, struct in_addr from,
struct in_addr group_addr, int num_sources,
struct in_addr *sources)
{
- on_trace(__func__, igmp->interface, from, group_addr,
- num_sources, sources);
+ on_trace(__func__, igmp->interface, from, group_addr, num_sources,
+ sources);
allow(igmp, from, group_addr, num_sources, sources);
}
@@ -654,8 +653,7 @@ void igmpv3_report_isex(struct igmp_sock *igmp, struct in_addr from,
struct interface *ifp = igmp->interface;
struct igmp_group *group;
- on_trace(__func__, ifp, from, group_addr, num_sources,
- sources);
+ on_trace(__func__, ifp, from, group_addr, num_sources, sources);
if (pim_is_group_filtered(ifp->info, &group_addr))
return;
@@ -774,8 +772,7 @@ void igmpv3_report_toin(struct igmp_sock *igmp, struct in_addr from,
struct interface *ifp = igmp->interface;
struct igmp_group *group;
- on_trace(__func__, ifp, from, group_addr, num_sources,
- sources);
+ on_trace(__func__, ifp, from, group_addr, num_sources, sources);
/*
* If the requested filter mode is INCLUDE *and* the requested source
@@ -937,8 +934,7 @@ void igmpv3_report_toex(struct igmp_sock *igmp, struct in_addr from,
struct interface *ifp = igmp->interface;
struct igmp_group *group;
- on_trace(__func__, ifp, from, group_addr, num_sources,
- sources);
+ on_trace(__func__, ifp, from, group_addr, num_sources, sources);
/* non-existant group is created as INCLUDE {empty} */
group = igmp_add_group_by_addr(igmp, group_addr);
@@ -964,8 +960,8 @@ void igmpv3_report_allow(struct igmp_sock *igmp, struct in_addr from,
struct in_addr group_addr, int num_sources,
struct in_addr *sources)
{
- on_trace(__func__, igmp->interface, from, group_addr,
- num_sources, sources);
+ on_trace(__func__, igmp->interface, from, group_addr, num_sources,
+ sources);
allow(igmp, from, group_addr, num_sources, sources);
}
@@ -1469,8 +1465,7 @@ void igmpv3_report_block(struct igmp_sock *igmp, struct in_addr from,
struct interface *ifp = igmp->interface;
struct igmp_group *group;
- on_trace(__func__, ifp, from, group_addr, num_sources,
- sources);
+ on_trace(__func__, ifp, from, group_addr, num_sources, sources);
/* non-existant group is created as INCLUDE {empty} */
group = igmp_add_group_by_addr(igmp, group_addr);
@@ -1564,8 +1559,8 @@ void igmp_source_timer_lower_to_lmqt(struct igmp_source *source)
sizeof(source_str));
zlog_debug(
"%s: group %s source %s on %s: LMQC=%d LMQI=%d dsec LMQT=%d msec",
- __func__, group_str, source_str, ifname,
- lmqc, lmqi_dsec, lmqt_msec);
+ __func__, group_str, source_str, ifname, lmqc,
+ lmqi_dsec, lmqt_msec);
}
igmp_source_timer_on(group, source, lmqt_msec);
@@ -1593,8 +1588,7 @@ void igmp_v3_send_query(struct igmp_group *group, int fd, const char *ifname,
flog_err(
EC_LIB_DEVELOPMENT,
"%s %s: unable to send: msg_size=%zd larger than query_buf_size=%d",
- __FILE__, __func__, msg_size,
- query_buf_size);
+ __FILE__, __func__, msg_size, query_buf_size);
return;
}
diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 805300bfe..f2cd04e45 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -84,8 +84,8 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
struct pim_rpf *rp = RP(pim_ifp->pim, sg->grp);
if (!rp) {
- zlog_warn("%s: Lookup of RP failed for %pSG4",
- __func__, sg);
+ zlog_warn("%s: Lookup of RP failed for %pSG4", __func__,
+ sg);
return;
}
/*
@@ -99,8 +99,9 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
sizeof(received_rp));
pim_inet4_dump("<local?>", rp->rpf_addr.u.prefix4,
local_rp, sizeof(local_rp));
- zlog_warn("%s: Specified RP(%s) in join is different than our configured RP(%s)",
- __func__, received_rp, local_rp);
+ zlog_warn(
+ "%s: Specified RP(%s) in join is different than our configured RP(%s)",
+ __func__, received_rp, local_rp);
return;
}
@@ -143,8 +144,9 @@ static void recv_prune(struct interface *ifp, struct pim_neighbor *neigh,
if (!rp) {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: RP for %pSG4 completely failed lookup",
- __func__, sg);
+ zlog_debug(
+ "%s: RP for %pSG4 completely failed lookup",
+ __func__, sg);
return;
}
// Ignoring Prune *,G's at the moment.
@@ -195,9 +197,9 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
if (msg_upstream_addr.family != AF_INET) {
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str));
- zlog_warn("%s: ignoring join/prune directed to unexpected addr family=%d from %s on %s",
- __func__, msg_upstream_addr.family,
- src_str, ifp->name);
+ zlog_warn(
+ "%s: ignoring join/prune directed to unexpected addr family=%d from %s on %s",
+ __func__, msg_upstream_addr.family, src_str, ifp->name);
return -2;
}
@@ -226,8 +228,8 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
upstream_str, sizeof(upstream_str));
zlog_debug(
"%s: join/prune upstream=%s groups=%d holdtime=%d from %s on %s",
- __func__, upstream_str, msg_num_groups,
- msg_holdtime, src_str, ifp->name);
+ __func__, upstream_str, msg_num_groups, msg_holdtime,
+ src_str, ifp->name);
}
/* Scan groups */
@@ -254,8 +256,7 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
sizeof(src_str));
zlog_warn(
"%s: short join/prune buffer for source list: size=%d minimum=%d from %s on %s",
- __func__, remain, 4, src_str,
- ifp->name);
+ __func__, remain, 4, src_str, ifp->name);
return -6;
}
@@ -345,8 +346,7 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
if (PIM_DEBUG_PIM_TRACE)
zlog_debug(
"%s: SGRpt flag is set, del inherit oif from up %s",
- __func__,
- up->sg_str);
+ __func__, up->sg_str);
pim_channel_del_inherited_oif(
up->channel_oil,
starg_ch->interface,
diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index 1a806d8d4..ea3e1a244 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -113,8 +113,7 @@ int pim_macro_ch_lost_assert(const struct pim_ifchannel *ch)
ifp = ch->interface;
if (!ifp) {
- zlog_warn("%s: (S,G)=%s: null interface", __func__,
- ch->sg_str);
+ zlog_warn("%s: (S,G)=%s: null interface", __func__, ch->sg_str);
return 0; /* false */
}
@@ -221,8 +220,7 @@ int pim_macro_ch_could_assert_eval(const struct pim_ifchannel *ch)
ifp = ch->interface;
if (!ifp) {
- zlog_warn("%s: (S,G)=%s: null interface", __func__,
- ch->sg_str);
+ zlog_warn("%s: (S,G)=%s: null interface", __func__, ch->sg_str);
return 0; /* false */
}
@@ -379,8 +377,7 @@ int pim_macro_assert_tracking_desired_eval(const struct pim_ifchannel *ch)
ifp = ch->interface;
if (!ifp) {
- zlog_warn("%s: (S,G)=%s: null interface", __func__,
- ch->sg_str);
+ zlog_warn("%s: (S,G)=%s: null interface", __func__, ch->sg_str);
return 0; /* false */
}
diff --git a/pimd/pim_mlag.c b/pimd/pim_mlag.c
index 4dca5b840..cbde45abb 100644
--- a/pimd/pim_mlag.c
+++ b/pimd/pim_mlag.c
@@ -186,13 +186,12 @@ static void pim_mlag_up_peer_add(struct mlag_mroute_add *msg)
* doesn't already exist.
*/
if (!PIM_UPSTREAM_FLAG_TEST_MLAG_PEER(up->flags))
- pim_upstream_ref(up,
- PIM_UPSTREAM_FLAG_MASK_MLAG_PEER,
- __func__);
+ pim_upstream_ref(up, PIM_UPSTREAM_FLAG_MASK_MLAG_PEER,
+ __func__);
} else {
PIM_UPSTREAM_FLAG_SET_MLAG_PEER(flags);
- up = pim_upstream_add(pim, &sg, NULL /*iif*/, flags,
- __func__, NULL /*if_ch*/);
+ up = pim_upstream_add(pim, &sg, NULL /*iif*/, flags, __func__,
+ NULL /*if_ch*/);
if (!up) {
if (PIM_DEBUG_MLAG)
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index f16999d6f..36b066735 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -191,8 +191,9 @@ static int pim_mroute_msg_nocache(int fd, struct interface *ifp,
if (!(PIM_I_am_DR(pim_ifp))) {
if (PIM_DEBUG_MROUTE_DETAIL)
- zlog_debug("%s: Interface is not the DR blackholing incoming traffic for %s",
- __func__, pim_str_sg_dump(&sg));
+ zlog_debug(
+ "%s: Interface is not the DR blackholing incoming traffic for %s",
+ __func__, pim_str_sg_dump(&sg));
/*
* We are not the DR, but we are still receiving packets
@@ -205,8 +206,7 @@ static int pim_mroute_msg_nocache(int fd, struct interface *ifp,
* this for future reference.
*/
up = pim_upstream_find_or_add(
- &sg, ifp, PIM_UPSTREAM_FLAG_MASK_SRC_NOCACHE,
- __func__);
+ &sg, ifp, PIM_UPSTREAM_FLAG_MASK_SRC_NOCACHE, __func__);
pim_upstream_mroute_add(up->channel_oil, __func__);
return 0;
@@ -270,8 +270,7 @@ static int pim_mroute_msg_wholepkt(int fd, struct interface *ifp,
if (PIM_DEBUG_MROUTE)
zlog_debug(
"%s: Unable to create upstream information for %s",
- __func__,
- pim_str_sg_dump(&sg));
+ __func__, pim_str_sg_dump(&sg));
return 0;
}
pim_upstream_keep_alive_timer_start(
@@ -294,8 +293,8 @@ static int pim_mroute_msg_wholepkt(int fd, struct interface *ifp,
if (!up->rpf.source_nexthop.interface) {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ zlog_debug("%s: up %s RPF is not present", __func__,
+ up->sg_str);
return 0;
}
@@ -306,8 +305,7 @@ static int pim_mroute_msg_wholepkt(int fd, struct interface *ifp,
if ((pim_rpf_addr_is_inaddr_none(rpg)) || (!pim_ifp)
|| (!(PIM_I_am_DR(pim_ifp)))) {
if (PIM_DEBUG_MROUTE) {
- zlog_debug("%s: Failed Check send packet",
- __func__);
+ zlog_debug("%s: Failed Check send packet", __func__);
}
return 0;
}
@@ -365,8 +363,7 @@ static int pim_mroute_msg_wrongvif(int fd, struct interface *ifp,
if (PIM_DEBUG_MROUTE)
zlog_debug(
"%s: WRONGVIF (S,G)=%s could not find input interface for input_vif_index=%d",
- __func__, pim_str_sg_dump(&sg),
- msg->im_vif);
+ __func__, pim_str_sg_dump(&sg), msg->im_vif);
return -1;
}
@@ -375,8 +372,7 @@ static int pim_mroute_msg_wrongvif(int fd, struct interface *ifp,
if (PIM_DEBUG_MROUTE)
zlog_debug(
"%s: WRONGVIF (S,G)=%s multicast not enabled on interface %s",
- __func__, pim_str_sg_dump(&sg),
- ifp->name);
+ __func__, pim_str_sg_dump(&sg), ifp->name);
return -2;
}
@@ -386,8 +382,7 @@ static int pim_mroute_msg_wrongvif(int fd, struct interface *ifp,
if (PIM_DEBUG_MROUTE)
zlog_debug(
"%s: WRONGVIF (S,G)=%s could not find channel on interface %s",
- __func__, pim_str_sg_dump(&sg),
- ifp->name);
+ __func__, pim_str_sg_dump(&sg), ifp->name);
star_g.src.s_addr = INADDR_ANY;
ch = pim_ifchannel_find(ifp, &star_g);
@@ -395,8 +390,8 @@ static int pim_mroute_msg_wrongvif(int fd, struct interface *ifp,
if (PIM_DEBUG_MROUTE)
zlog_debug(
"%s: WRONGVIF (*,G)=%s could not find channel on interface %s",
- __func__,
- pim_str_sg_dump(&star_g), ifp->name);
+ __func__, pim_str_sg_dump(&star_g),
+ ifp->name);
return -3;
}
}
@@ -521,7 +516,7 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp,
pim_upstream_inherited_olist(pim_ifp->pim, up);
if (!up->channel_oil->installed)
pim_upstream_mroute_add(up->channel_oil,
- __func__);
+ __func__);
} else {
if (I_am_RP(pim_ifp->pim, up->sg.grp)) {
if (pim_nexthop_lookup(pim_ifp->pim, &source,
@@ -544,8 +539,8 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp,
pim_ifp = ifp->info;
if (pim_if_connected_to_source(ifp, sg.src)) {
up = pim_upstream_add(pim_ifp->pim, &sg, ifp,
- PIM_UPSTREAM_FLAG_MASK_FHR,
- __func__, NULL);
+ PIM_UPSTREAM_FLAG_MASK_FHR, __func__,
+ NULL);
if (!up) {
if (PIM_DEBUG_MROUTE)
zlog_debug(
@@ -569,8 +564,7 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp,
PIM_UPSTREAM_FLAG_MASK_SRC_NOCACHE,
__func__, NULL);
if (!up->channel_oil->installed)
- pim_upstream_mroute_add(up->channel_oil,
- __func__);
+ pim_upstream_mroute_add(up->channel_oil, __func__);
}
return 0;
@@ -621,8 +615,8 @@ static int pim_mroute_msg(struct pim_instance *pim, const char *buf,
zlog_debug(
"%s(%s): igmp kernel upcall on %s(%p) for %s -> %s",
- __func__, pim->vrf->name, ifp->name,
- igmp, ip_src_str, ip_dst_str);
+ __func__, pim->vrf->name, ifp->name, igmp,
+ ip_src_str, ip_dst_str);
}
if (igmp)
pim_igmp_packet(igmp, (char *)buf, buf_size);
@@ -635,8 +629,8 @@ static int pim_mroute_msg(struct pim_instance *pim, const char *buf,
sizeof(grp_str));
zlog_debug(
"%s: no kernel upcall proto=%d src: %s dst: %s msg_size=%d",
- __func__, ip_hdr->ip_p, src_str,
- grp_str, buf_size);
+ __func__, ip_hdr->ip_p, src_str, grp_str,
+ buf_size);
}
} else {
@@ -653,8 +647,7 @@ static int pim_mroute_msg(struct pim_instance *pim, const char *buf,
sizeof(grp_str));
zlog_debug(
"%s: pim kernel upcall %s type=%d ip_p=%d from fd=%d for (S,G)=(%s,%s) on %s vifi=%d size=%d",
- __func__,
- igmpmsgtype2str[msg->im_msgtype],
+ __func__, igmpmsgtype2str[msg->im_msgtype],
msg->im_msgtype, ip_hdr->ip_p,
pim->mroute_socket, src_str, grp_str, ifp->name,
msg->im_vif, buf_size);
@@ -706,9 +699,10 @@ static int mroute_read(struct thread *t)
if (errno == EWOULDBLOCK || errno == EAGAIN)
break;
- zlog_warn("%s: failure reading rd=%d: fd=%d: errno=%d: %s",
- __func__, rd, pim->mroute_socket,
- errno, safe_strerror(errno));
+ zlog_warn(
+ "%s: failure reading rd=%d: fd=%d: errno=%d: %s",
+ __func__, rd, pim->mroute_socket, errno,
+ safe_strerror(errno));
goto done;
}
@@ -853,9 +847,8 @@ int pim_mroute_add_vif(struct interface *ifp, struct in_addr ifaddr,
zlog_warn(
"%s: failure: setsockopt(fd=%d,IPPROTO_IP,MRT_ADD_VIF,vif_index=%d,ifaddr=%s,flag=%d): errno=%d: %s",
- __func__, pim_ifp->pim->mroute_socket,
- ifp->ifindex, ifaddr_str, flags, errno,
- safe_strerror(errno));
+ __func__, pim_ifp->pim->mroute_socket, ifp->ifindex,
+ ifaddr_str, flags, errno, safe_strerror(errno));
return -2;
}
@@ -881,9 +874,8 @@ int pim_mroute_del_vif(struct interface *ifp)
if (err) {
zlog_warn(
"%s %s: failure: setsockopt(fd=%d,IPPROTO_IP,MRT_DEL_VIF,vif_index=%d): errno=%d: %s",
- __FILE__, __func__,
- pim_ifp->pim->mroute_socket, pim_ifp->mroute_vif_index,
- errno, safe_strerror(errno));
+ __FILE__, __func__, pim_ifp->pim->mroute_socket,
+ pim_ifp->mroute_vif_index, errno, safe_strerror(errno));
return -2;
}
@@ -1003,15 +995,15 @@ static int pim_mroute_add(struct channel_oil *c_oil, const char *name)
if (err) {
zlog_warn(
"%s %s: failure: setsockopt(fd=%d,IPPROTO_IP,MRT_ADD_MFC): errno=%d: %s",
- __FILE__, __func__, pim->mroute_socket,
- errno, safe_strerror(errno));
+ __FILE__, __func__, pim->mroute_socket, errno,
+ safe_strerror(errno));
return -2;
}
if (PIM_DEBUG_MROUTE) {
char buf[1000];
- zlog_debug("%s(%s), vrf %s Added Route: %s",
- __func__, name, pim->vrf->name,
+ zlog_debug("%s(%s), vrf %s Added Route: %s", __func__, name,
+ pim->vrf->name,
pim_channel_oil_dump(c_oil, buf, sizeof(buf)));
}
@@ -1170,8 +1162,7 @@ int pim_mroute_del(struct channel_oil *c_oil, const char *name)
char buf[1000];
zlog_debug(
"%s %s: vifi %d for route is %s not installed, do not need to send del req. ",
- __FILE__, __func__,
- c_oil->oil.mfcc_parent,
+ __FILE__, __func__, c_oil->oil.mfcc_parent,
pim_channel_oil_dump(c_oil, buf, sizeof(buf)));
}
return -2;
@@ -1183,16 +1174,15 @@ int pim_mroute_del(struct channel_oil *c_oil, const char *name)
if (PIM_DEBUG_MROUTE)
zlog_warn(
"%s %s: failure: setsockopt(fd=%d,IPPROTO_IP,MRT_DEL_MFC): errno=%d: %s",
- __FILE__, __func__,
- pim->mroute_socket, errno,
+ __FILE__, __func__, pim->mroute_socket, errno,
safe_strerror(errno));
return -2;
}
if (PIM_DEBUG_MROUTE) {
char buf[1000];
- zlog_debug("%s(%s), vrf %s Deleted Route: %s",
- __func__, name, pim->vrf->name,
+ zlog_debug("%s(%s), vrf %s Deleted Route: %s", __func__, name,
+ pim->vrf->name,
pim_channel_oil_dump(c_oil, buf, sizeof(buf)));
}
diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 6e84d6a42..63d34e859 100644
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -210,8 +210,7 @@ static void pim_msdp_sa_upstream_update(struct pim_msdp_sa *sa,
/* RFC3618: "RP triggers a (S, G) join event towards the data source
* as if a JP message was rxed addressed to the RP itself." */
up = pim_upstream_add(sa->pim, &sa->sg, NULL /* iif */,
- PIM_UPSTREAM_FLAG_MASK_SRC_MSDP,
- __func__, NULL);
+ PIM_UPSTREAM_FLAG_MASK_SRC_MSDP, __func__, NULL);
sa->up = up;
if (up) {
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index ab219c008..ec40beec7 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -133,8 +133,7 @@ int pim_if_dr_election(struct interface *ifp)
pim_inet4_dump("<new_dr?>", pim_ifp->pim_dr_addr,
dr_new_str, sizeof(dr_new_str));
zlog_debug("%s: DR was %s now is %s on interface %s",
- __func__, dr_old_str, dr_new_str,
- ifp->name);
+ __func__, dr_old_str, dr_new_str, ifp->name);
}
pim_ifp->pim_dr_election_last =
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index a93169653..289f2a2ed 100644
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -283,8 +283,8 @@ bool pim_nexthop_match(struct pim_instance *pim, struct in_addr addr,
sizeof(addr_str));
zlog_debug(
"%s %s: could not find interface for ifindex %d (address %s)",
- __FILE__, __func__,
- first_ifindex, addr_str);
+ __FILE__, __func__, first_ifindex,
+ addr_str);
}
i++;
continue;
@@ -298,8 +298,8 @@ bool pim_nexthop_match(struct pim_instance *pim, struct in_addr addr,
sizeof(addr_str));
zlog_debug(
"%s: multicast not enabled on input interface %s (ifindex=%d, RPF for source %s)",
- __func__, ifp->name,
- first_ifindex, addr_str);
+ __func__, ifp->name, first_ifindex,
+ addr_str);
}
i++;
continue;
@@ -361,9 +361,8 @@ bool pim_nexthop_match_nht_cache(struct pim_instance *pim, struct in_addr addr,
sizeof(addr_str));
zlog_debug(
"%s %s: could not find interface for ifindex %d (address %s(%s))",
- __FILE__, __func__,
- first_ifindex, addr_str,
- pim->vrf->name);
+ __FILE__, __func__, first_ifindex,
+ addr_str, pim->vrf->name);
}
nh_iter++;
continue;
@@ -376,9 +375,8 @@ bool pim_nexthop_match_nht_cache(struct pim_instance *pim, struct in_addr addr,
sizeof(addr_str));
zlog_debug(
"%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %s)",
- __func__, ifp->name,
- pim->vrf->name, first_ifindex,
- addr_str);
+ __func__, ifp->name, pim->vrf->name,
+ first_ifindex, addr_str);
}
nh_iter++;
continue;
@@ -460,12 +458,15 @@ static int pim_update_upstream_nh_helper(struct hash_bucket *bucket, void *arg)
if (PIM_DEBUG_PIM_NHT) {
- zlog_debug("%s: NHT upstream %s(%s) old ifp %s new ifp %s",
+ zlog_debug(
+ "%s: NHT upstream %s(%s) old ifp %s new ifp %s",
__func__, up->sg_str, pim->vrf->name,
- old.source_nexthop.interface
- ? old.source_nexthop.interface->name : "Unknown",
- up->rpf.source_nexthop.interface
- ? up->rpf.source_nexthop.interface->name : "Unknown");
+ old.source_nexthop.interface ? old.source_nexthop
+ .interface->name
+ : "Unknown",
+ up->rpf.source_nexthop.interface ? up->rpf.source_nexthop
+ .interface->name
+ : "Unknown");
}
return HASHWALK_CONTINUE;
@@ -581,9 +582,8 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
sizeof(grp_str));
zlog_debug(
"%s: (%s,%s)(%s) current nexthop %s is valid, skipping new path selection",
- __func__,
- src_str, grp_str,
- pim->vrf->name,
+ __func__, src_str,
+ grp_str, pim->vrf->name,
nexthop->interface->name);
}
return 1;
@@ -633,9 +633,8 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
addr_str, sizeof(addr_str));
zlog_debug(
"%s %s: could not find interface for ifindex %d (address %s(%s))",
- __FILE__, __func__,
- first_ifindex, addr_str,
- pim->vrf->name);
+ __FILE__, __func__, first_ifindex,
+ addr_str, pim->vrf->name);
}
if (nh_iter == mod_val)
mod_val++; // Select nexthpath
@@ -649,9 +648,8 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
addr_str, sizeof(addr_str));
zlog_debug(
"%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %s)",
- __func__, ifp->name,
- pim->vrf->name, first_ifindex,
- addr_str);
+ __func__, ifp->name, pim->vrf->name,
+ first_ifindex, addr_str);
}
if (nh_iter == mod_val)
mod_val++; // Select nexthpath
@@ -701,9 +699,9 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
buf, sizeof(buf));
zlog_debug(
"%s: (%s,%s)(%s) selected nhop interface %s addr %s mod_val %u iter %d ecmp %d",
- __func__, buf2, buf3,
- pim->vrf->name, ifp->name, buf, mod_val,
- nh_iter, pim->ecmp_enable);
+ __func__, buf2, buf3, pim->vrf->name,
+ ifp->name, buf, mod_val, nh_iter,
+ pim->ecmp_enable);
}
}
nh_iter++;
@@ -810,8 +808,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
char buf[NEXTHOP_STRLEN];
zlog_debug(
"%s: could not find interface for ifindex %d(%s) (addr %s)",
- __func__,
- nexthop->ifindex,
+ __func__, nexthop->ifindex,
pim->vrf->name,
nexthop2str(nexthop, buf,
sizeof(buf)));
@@ -826,8 +823,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
prefix2str(&nhr.prefix, p_str, sizeof(p_str));
zlog_debug(
"%s: NHT addr %s(%s) %d-nhop via %s(%s) type %d distance:%u metric:%u ",
- __func__, p_str,
- pim->vrf->name, i + 1,
+ __func__, p_str, pim->vrf->name, i + 1,
inet_ntoa(nexthop->gate.ipv4),
ifp->name, nexthop->type, nhr.distance,
nhr.metric);
@@ -886,9 +882,9 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
prefix2str(&nhr.prefix, buf, sizeof(buf));
zlog_debug(
"%s: NHT Update for %s(%s) num_nh %d num_pim_nh %d vrf:%u up %ld rp %d",
- __func__, buf, pim->vrf->name,
- nhr.nexthop_num, pnc->nexthop_num, vrf_id,
- pnc->upstream_hash->count, listcount(pnc->rp_list));
+ __func__, buf, pim->vrf->name, nhr.nexthop_num,
+ pnc->nexthop_num, vrf_id, pnc->upstream_hash->count,
+ listcount(pnc->rp_list));
}
pim_rpf_set_refresh_time(pim);
@@ -984,8 +980,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
hash_val = pim_compute_ecmp_hash(src, grp);
mod_val = hash_val % consider;
if (PIM_DEBUG_PIM_NHT_DETAIL)
- zlog_debug("%s: hash_val %u mod_val %u",
- __func__, hash_val, mod_val);
+ zlog_debug("%s: hash_val %u mod_val %u", __func__,
+ hash_val, mod_val);
}
i = 0;
@@ -997,9 +993,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
if (PIM_DEBUG_PIM_NHT)
zlog_debug(
"%s %s: could not find interface for ifindex %d (address %s(%s))",
- __FILE__, __func__,
- first_ifindex, addr_str,
- pim->vrf->name);
+ __FILE__, __func__, first_ifindex,
+ addr_str, pim->vrf->name);
if (i == mod_val)
mod_val++;
i++;
@@ -1010,9 +1005,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
if (PIM_DEBUG_PIM_NHT)
zlog_debug(
"%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %s)",
- __func__, ifp->name,
- pim->vrf->name, first_ifindex,
- addr_str);
+ __func__, ifp->name, pim->vrf->name,
+ first_ifindex, addr_str);
if (i == mod_val)
mod_val++;
i++;
@@ -1046,8 +1040,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
nexthop_str, sizeof(nexthop_str));
zlog_debug(
"%s: found nhop %s for addr %s interface %s(%s) metric %d dist %d",
- __func__, nexthop_str,
- addr_str, ifp->name, pim->vrf->name,
+ __func__, nexthop_str, addr_str,
+ ifp->name, pim->vrf->name,
nexthop_tab[i].route_metric,
nexthop_tab[i].protocol_distance);
}
@@ -1098,8 +1092,7 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim,
if (PIM_DEBUG_PIM_NHT)
zlog_debug(
"%s: found nexthop ifindex=%d (interface %s(%s)) for address %s",
- __func__, ifindex,
- ifindex2ifname(ifindex, pim->vrf_id),
+ __func__, ifindex, ifindex2ifname(ifindex, pim->vrf_id),
pim->vrf->name, addr_str);
vif_index = pim_if_find_vifindex_by_ifindex(pim, ifindex);
@@ -1108,8 +1101,7 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim,
if (PIM_DEBUG_PIM_NHT) {
zlog_debug(
"%s: low vif_index=%d(%s) < 1 nexthop for address %s",
- __func__, vif_index, pim->vrf->name,
- addr_str);
+ __func__, vif_index, pim->vrf->name, addr_str);
}
return -2;
}
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index cf190bd4f..0618308ba 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -149,8 +149,7 @@ struct channel_oil *pim_channel_oil_add(struct pim_instance *pim,
if (PIM_DEBUG_MROUTE)
zlog_debug(
"%s(%s): Existing oil for %pSG4 Ref Count: %d (Post Increment)",
- __func__, name, sg,
- c_oil->oil_ref_count);
+ __func__, name, sg, c_oil->oil_ref_count);
return c_oil;
}
@@ -313,8 +312,8 @@ int pim_channel_del_oif(struct channel_oil *channel_oil, struct interface *oif,
source_str, sizeof(source_str));
zlog_debug(
"%s(%s): (S,G)=(%s,%s): proto_mask=%u IIF:%d OIF=%s vif_index=%d",
- __func__, caller, source_str, group_str,
- proto_mask, channel_oil->oil.mfcc_parent, oif->name,
+ __func__, caller, source_str, group_str, proto_mask,
+ channel_oil->oil.mfcc_parent, oif->name,
pim_ifp->mroute_vif_index);
}
@@ -455,8 +454,8 @@ int pim_channel_add_oif(struct channel_oil *channel_oil, struct interface *oif,
sizeof(source_str));
zlog_debug(
"%s %s: existing protocol mask %u requested OIF %s (vif_index=%d, min_ttl=%d) for channel (S,G)=(%s,%s)",
- __FILE__, __func__, proto_mask,
- oif->name, pim_ifp->mroute_vif_index,
+ __FILE__, __func__, proto_mask, oif->name,
+ pim_ifp->mroute_vif_index,
channel_oil->oil
.mfcc_ttls[pim_ifp->mroute_vif_index],
source_str, group_str);
@@ -489,9 +488,8 @@ int pim_channel_add_oif(struct channel_oil *channel_oil, struct interface *oif,
source_str, sizeof(source_str));
zlog_warn(
"%s %s: new protocol mask %u requested nonexistent OIF %s (vif_index=%d, min_ttl=%d) for channel (S,G)=(%s,%s)",
- __FILE__, __func__,
- proto_mask, oif->name,
- pim_ifp->mroute_vif_index,
+ __FILE__, __func__, proto_mask,
+ oif->name, pim_ifp->mroute_vif_index,
channel_oil->oil.mfcc_ttls
[pim_ifp->mroute_vif_index],
source_str, group_str);
@@ -552,10 +550,10 @@ int pim_channel_add_oif(struct channel_oil *channel_oil, struct interface *oif,
channel_oil->oil.mfcc_origin, source_str,
sizeof(source_str));
zlog_debug(
- "%s %s: could not add output interface %s (vif_index=%d) for channel (S,G)=(%s,%s)",
- __FILE__, __func__, oif->name,
- pim_ifp->mroute_vif_index, source_str,
- group_str);
+ "%s %s: could not add output interface %s (vif_index=%d) for channel (S,G)=(%s,%s)",
+ __FILE__, __func__, oif->name,
+ pim_ifp->mroute_vif_index, source_str,
+ group_str);
}
channel_oil->oil.mfcc_ttls[pim_ifp->mroute_vif_index]
@@ -578,8 +576,8 @@ int pim_channel_add_oif(struct channel_oil *channel_oil, struct interface *oif,
source_str, sizeof(source_str));
zlog_debug(
"%s(%s): (S,G)=(%s,%s): proto_mask=%u OIF=%s vif_index=%d: DONE",
- __func__, caller, source_str, group_str,
- proto_mask, oif->name, pim_ifp->mroute_vif_index);
+ __func__, caller, source_str, group_str, proto_mask,
+ oif->name, pim_ifp->mroute_vif_index);
}
return 0;
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index 6821c9ef7..8d7a921cf 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -258,8 +258,8 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug(
"%s %s: non-hello PIM message type=%d from non-neighbor %s on %s",
- __FILE__, __func__,
- header->type, src_str, ifp->name);
+ __FILE__, __func__, header->type,
+ src_str, ifp->name);
return -1;
}
pim_neighbor_timer_reset(neigh, neigh->holdtime);
@@ -273,8 +273,8 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len)
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug(
"%s %s: non-hello PIM message type=%d from non-neighbor %s on %s",
- __FILE__, __func__,
- header->type, src_str, ifp->name);
+ __FILE__, __func__, header->type,
+ src_str, ifp->name);
return -1;
}
pim_neighbor_timer_reset(neigh, neigh->holdtime);
@@ -347,8 +347,8 @@ static int pim_sock_read(struct thread *t)
if (PIM_DEBUG_PIM_PACKETS)
zlog_debug(
"%s: Received incoming pim packet on interface(%s:%d) not yet configured for pim",
- __func__,
- ifp ? ifp->name : "Unknown", ifindex);
+ __func__, ifp ? ifp->name : "Unknown",
+ ifindex);
goto done;
}
int fail = pim_pim_packet(ifp, buf, len);
@@ -519,8 +519,8 @@ static int pim_msg_send_frame(int fd, char *buf, size_t len,
sizeof(dst_str));
zlog_warn(
"%s: sendto() failure to %s: fd=%d msg_size=%zd: errno=%d: %s",
- __func__, dst_str, fd, len,
- errno, safe_strerror(errno));
+ __func__, dst_str, fd, len, errno,
+ safe_strerror(errno));
}
return -1;
}
@@ -588,9 +588,8 @@ int pim_msg_send(int fd, struct in_addr src, struct in_addr dst,
if (PIM_DEBUG_PIM_PACKETS) {
char dst_str[INET_ADDRSTRLEN];
pim_inet4_dump("<dst?>", dst, dst_str, sizeof(dst_str));
- zlog_debug("%s: to %s on %s: msg_size=%d checksum=%x",
- __func__, dst_str, ifname, pim_msg_size,
- header->checksum);
+ zlog_debug("%s: to %s on %s: msg_size=%d checksum=%x", __func__,
+ dst_str, ifname, pim_msg_size, header->checksum);
}
memset(&to, 0, sizeof(to));
diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 552395efb..19baecb9c 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -196,8 +196,8 @@ void pim_register_send(const uint8_t *buf, int buf_size, struct in_addr src,
strlcpy(rp_str, inet_ntoa(rpg->rpf_addr.u.prefix4),
sizeof(rp_str));
zlog_debug("%s: Sending %s %sRegister Packet to %s on %s",
- __func__, up->sg_str,
- null_register ? "NULL " : "", rp_str, ifp->name);
+ __func__, up->sg_str, null_register ? "NULL " : "",
+ rp_str, ifp->name);
}
memset(buffer, 0, 10000);
@@ -419,8 +419,8 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr,
if (!upstream) {
upstream = pim_upstream_add(
pim_ifp->pim, &sg, ifp,
- PIM_UPSTREAM_FLAG_MASK_SRC_STREAM,
- __func__, NULL);
+ PIM_UPSTREAM_FLAG_MASK_SRC_STREAM, __func__,
+ NULL);
if (!upstream) {
zlog_warn("Failure to create upstream state");
return 1;
diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index e8ea05cf3..55b7db6a5 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -351,8 +351,7 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
if (PIM_DEBUG_PIM_TRACE)
zlog_debug("%s: pim upstream update for old upstream %s",
- __func__,
- inet_ntoa(old_upstream_addr));
+ __func__, inet_ntoa(old_upstream_addr));
if (old_upstream_addr.s_addr == new_upstream_addr.s_addr)
return;
@@ -371,8 +370,9 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
char buf[PREFIX2STR_BUFFER];
prefix2str(&nht_p, buf, sizeof(buf));
- zlog_debug("%s: Deregister upstream %s addr %s with Zebra NHT",
- __func__, up->sg_str, buf);
+ zlog_debug(
+ "%s: Deregister upstream %s addr %s with Zebra NHT",
+ __func__, up->sg_str, buf);
}
pim_delete_tracked_nexthop(pim, &nht_p, up, NULL, false);
}
@@ -744,8 +744,8 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
}
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: Delete RP %s for the group %s",
- __func__, rp_str, grp_str);
+ zlog_debug("%s: Delete RP %s for the group %s", __func__,
+ rp_str, grp_str);
/* While static RP is getting deleted, we need to check if dynamic RP
* present for the same group in BSM RP table, then install the dynamic
@@ -764,9 +764,9 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
sizeof(bsrp_str)))
sprintf(bsrp_str, "<bsrp?>");
- zlog_debug("%s: BSM RP %s found for the group %s",
- __func__,
- bsrp_str, grp_str);
+ zlog_debug(
+ "%s: BSM RP %s found for the group %s",
+ __func__, bsrp_str, grp_str);
}
return pim_rp_change(pim, bsrp->rp_address,
group, RP_SRC_BSR);
@@ -786,8 +786,8 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
if (PIM_DEBUG_PIM_NHT_RP) {
char buf[PREFIX2STR_BUFFER];
prefix2str(&nht_p, buf, sizeof(buf));
- zlog_debug("%s: Deregister RP addr %s with Zebra ",
- __func__, buf);
+ zlog_debug("%s: Deregister RP addr %s with Zebra ", __func__,
+ buf);
}
pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info, false);
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index cc222a69a..010ec7d74 100644
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -78,9 +78,9 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
pim_addr_dump("<nexthop?>", &nexthop->mrib_nexthop_addr,
nexthop_str, sizeof(nexthop_str));
zlog_debug(
- "%s: Using last lookup for %s at %lld, %" PRId64 " addr %s",
- __func__, addr_str,
- nexthop->last_lookup_time,
+ "%s: Using last lookup for %s at %lld, %" PRId64
+ " addr %s",
+ __func__, addr_str, nexthop->last_lookup_time,
pim->last_route_change_time, nexthop_str);
}
pim->nexthop_lookups_avoided++;
@@ -92,8 +92,7 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
sizeof(addr_str));
zlog_debug(
"%s: Looking up: %s, last lookup time: %lld, %" PRId64,
- __func__, addr_str,
- nexthop->last_lookup_time,
+ __func__, addr_str, nexthop->last_lookup_time,
pim->last_route_change_time);
}
}
@@ -122,8 +121,8 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
sizeof(addr_str));
zlog_debug(
"%s %s: could not find interface for ifindex %d (address %s)",
- __FILE__, __func__,
- first_ifindex, addr_str);
+ __FILE__, __func__, first_ifindex,
+ addr_str);
}
i++;
continue;
@@ -136,8 +135,8 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
sizeof(addr_str));
zlog_debug(
"%s: multicast not enabled on input interface %s (ifindex=%d, RPF for source %s)",
- __func__, ifp->name,
- first_ifindex, addr_str);
+ __func__, ifp->name, first_ifindex,
+ addr_str);
}
i++;
} else if (neighbor_needed
@@ -166,8 +165,8 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
sizeof(addr_str));
zlog_debug(
"%s %s: found nexthop %s for address %s: interface %s ifindex=%d metric=%d pref=%d",
- __FILE__, __func__, nexthop_str,
- addr_str, ifp->name, first_ifindex,
+ __FILE__, __func__, nexthop_str, addr_str,
+ ifp->name, first_ifindex,
nexthop_tab[i].route_metric,
nexthop_tab[i].protocol_distance);
}
diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index a4bb8f0cb..177dab05c 100644
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -231,8 +231,8 @@ int pim_socket_mcast(int protocol, struct in_addr ifaddr, struct interface *ifp,
}
if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf)))
- zlog_warn("%s: Failure to set buffer size to %d",
- __func__, rcvbuf);
+ zlog_warn("%s: Failure to set buffer size to %d", __func__,
+ rcvbuf);
{
long flags;
diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index a0b84fc5d..f4d3547b3 100644
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -98,8 +98,8 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str));
zlog_warn(
"%s: bind(fd=%d,addr=%s,port=%d,len=%zu) failure: errno=%d: %s",
- __func__, fd, addr_str, port,
- sizeof(sockaddr), errno, safe_strerror(errno));
+ __func__, fd, addr_str, port, sizeof(sockaddr), errno,
+ safe_strerror(errno));
close(fd);
return -1;
}
@@ -112,8 +112,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
if (setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &opt, sizeof(opt))) {
zlog_warn(
"%s: could not set IP_PKTINFO on socket fd=%d: errno=%d: %s",
- __func__, fd, errno,
- safe_strerror(errno));
+ __func__, fd, errno, safe_strerror(errno));
}
#elif defined(HAVE_IP_RECVDSTADDR)
/* BSD IP_RECVDSTADDR */
@@ -122,8 +121,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
sizeof(opt))) {
zlog_warn(
"%s: could not set IP_RECVDSTADDR on socket fd=%d: errno=%d: %s",
- __func__, fd, errno,
- safe_strerror(errno));
+ __func__, fd, errno, safe_strerror(errno));
}
#else
flog_err(
@@ -141,8 +139,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
sizeof(reuse))) {
zlog_warn(
"%s: could not set Reuse Address Option on socket fd=%d: errno=%d: %s",
- __func__, fd, errno,
- safe_strerror(errno));
+ __func__, fd, errno, safe_strerror(errno));
close(fd);
return -1;
}
@@ -152,8 +149,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
sizeof(mttl))) {
zlog_warn(
"%s: could not set multicast TTL=%d on socket fd=%d: errno=%d: %s",
- __func__, mttl, fd, errno,
- safe_strerror(errno));
+ __func__, mttl, fd, errno, safe_strerror(errno));
close(fd);
return -1;
}
@@ -182,8 +178,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
if (flags < 0) {
zlog_warn(
"%s: could not get fcntl(F_GETFL,O_NONBLOCK) on socket fd=%d: errno=%d: %s",
- __func__, fd, errno,
- safe_strerror(errno));
+ __func__, fd, errno, safe_strerror(errno));
close(fd);
return -1;
}
@@ -191,8 +186,7 @@ static int ssmpingd_socket(struct in_addr addr, int port, int mttl)
if (fcntl(fd, F_SETFL, flags | O_NONBLOCK)) {
zlog_warn(
"%s: could not set fcntl(F_SETFL,O_NONBLOCK) on socket fd=%d: errno=%d: %s",
- __func__, fd, errno,
- safe_strerror(errno));
+ __func__, fd, errno, safe_strerror(errno));
close(fd);
return -1;
}
@@ -286,8 +280,8 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
pim_inet4_dump("<to?>", to.sin_addr, to_str, sizeof(to_str));
zlog_warn(
"%s: bad ssmping type=%d from %s,%d to %s,%d on interface %s ifindex=%d fd=%d src=%s",
- __func__, buf[0], from_str,
- ntohs(from.sin_port), to_str, ntohs(to.sin_port),
+ __func__, buf[0], from_str, ntohs(from.sin_port),
+ to_str, ntohs(to.sin_port),
ifp ? ifp->name : "<iface?>", ifindex, ss->sock_fd,
source_str);
return 0;
@@ -304,10 +298,9 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss)
pim_inet4_dump("<to?>", to.sin_addr, to_str, sizeof(to_str));
zlog_debug(
"%s: recv ssmping from %s,%d to %s,%d on interface %s ifindex=%d fd=%d src=%s",
- __func__, from_str, ntohs(from.sin_port),
- to_str, ntohs(to.sin_port),
- ifp ? ifp->name : "<iface?>", ifindex, ss->sock_fd,
- source_str);
+ __func__, from_str, ntohs(from.sin_port), to_str,
+ ntohs(to.sin_port), ifp ? ifp->name : "<iface?>",
+ ifindex, ss->sock_fd, source_str);
}
buf[0] = PIM_SSMPINGD_REPLY;
@@ -395,8 +388,8 @@ int pim_ssmpingd_start(struct pim_instance *pim, struct in_addr source_addr)
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
- zlog_info("%s: starting ssmpingd for source %s",
- __func__, source_str);
+ zlog_info("%s: starting ssmpingd for source %s", __func__,
+ source_str);
}
ss = ssmpingd_new(pim, source_addr);
@@ -404,8 +397,8 @@ int pim_ssmpingd_start(struct pim_instance *pim, struct in_addr source_addr)
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
- zlog_warn("%s: ssmpingd_new() failure for source %s",
- __func__, source_str);
+ zlog_warn("%s: ssmpingd_new() failure for source %s", __func__,
+ source_str);
return -1;
}
@@ -421,8 +414,8 @@ int pim_ssmpingd_stop(struct pim_instance *pim, struct in_addr source_addr)
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
- zlog_warn("%s: could not find ssmpingd for source %s",
- __func__, source_str);
+ zlog_warn("%s: could not find ssmpingd for source %s", __func__,
+ source_str);
return -1;
}
@@ -430,8 +423,8 @@ int pim_ssmpingd_stop(struct pim_instance *pim, struct in_addr source_addr)
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
- zlog_info("%s: stopping ssmpingd for source %s",
- __func__, source_str);
+ zlog_info("%s: stopping ssmpingd for source %s", __func__,
+ source_str);
}
ssmpingd_delete(ss);
diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c
index bc8e63fea..7b27211ed 100644
--- a/pimd/pim_tlv.c
+++ b/pimd/pim_tlv.c
@@ -346,8 +346,7 @@ int pim_tlv_parse_holdtime(const char *ifname, struct in_addr src_addr,
}
check_tlv_redefinition_uint16(__func__, label, ifname, src_addr,
- *hello_options,
- PIM_OPTION_MASK_HOLDTIME,
+ *hello_options, PIM_OPTION_MASK_HOLDTIME,
PIM_TLV_GET_HOLDTIME(tlv_curr),
*hello_option_holdtime);
@@ -364,13 +363,13 @@ int pim_tlv_parse_lan_prune_delay(const char *ifname, struct in_addr src_addr,
uint16_t *hello_option_override_interval,
uint16_t option_len, const uint8_t *tlv_curr)
{
- if (check_tlv_length(__func__, "lan_prune_delay", ifname,
- src_addr, sizeof(uint32_t), option_len)) {
+ if (check_tlv_length(__func__, "lan_prune_delay", ifname, src_addr,
+ sizeof(uint32_t), option_len)) {
return -1;
}
- check_tlv_redefinition_uint16(__func__, "propagation_delay",
- ifname, src_addr, *hello_options,
+ check_tlv_redefinition_uint16(__func__, "propagation_delay", ifname,
+ src_addr, *hello_options,
PIM_OPTION_MASK_LAN_PRUNE_DELAY,
PIM_TLV_GET_PROPAGATION_DELAY(tlv_curr),
*hello_option_propagation_delay);
@@ -406,11 +405,10 @@ int pim_tlv_parse_dr_priority(const char *ifname, struct in_addr src_addr,
return -1;
}
- check_tlv_redefinition_uint32(__func__, label, ifname, src_addr,
- *hello_options,
- PIM_OPTION_MASK_DR_PRIORITY,
- PIM_TLV_GET_DR_PRIORITY(tlv_curr),
- *hello_option_dr_priority);
+ check_tlv_redefinition_uint32(
+ __func__, label, ifname, src_addr, *hello_options,
+ PIM_OPTION_MASK_DR_PRIORITY, PIM_TLV_GET_DR_PRIORITY(tlv_curr),
+ *hello_option_dr_priority);
PIM_OPTION_SET(*hello_options, PIM_OPTION_MASK_DR_PRIORITY);
@@ -431,8 +429,8 @@ int pim_tlv_parse_generation_id(const char *ifname, struct in_addr src_addr,
return -1;
}
- check_tlv_redefinition_uint32_hex(__func__, label, ifname,
- src_addr, *hello_options,
+ check_tlv_redefinition_uint32_hex(__func__, label, ifname, src_addr,
+ *hello_options,
PIM_OPTION_MASK_GENERATION_ID,
PIM_TLV_GET_GENERATION_ID(tlv_curr),
*hello_option_generation_id);
@@ -601,8 +599,7 @@ int pim_parse_addr_source(struct prefix_sg *sg, uint8_t *flags,
if (type) {
zlog_warn(
"%s: unknown source address encoding type=%d: %02x%02x%02x%02x",
- __func__, type, buf[0], buf[1], buf[2],
- buf[3]);
+ __func__, type, buf[0], buf[1], buf[2], buf[3]);
return -2;
}
@@ -642,8 +639,7 @@ int pim_parse_addr_source(struct prefix_sg *sg, uint8_t *flags,
default: {
zlog_warn(
"%s: unknown source address encoding family=%d: %02x%02x%02x%02x",
- __func__, family, buf[0], buf[1], buf[2],
- buf[3]);
+ __func__, family, buf[0], buf[1], buf[2], buf[3]);
return -5;
}
}
@@ -711,7 +707,7 @@ int pim_tlv_parse_addr_list(const char *ifname, struct in_addr src_addr,
__func__,
*hello_option_addr_list
? ((int)listcount(
- *hello_option_addr_list))
+ *hello_option_addr_list))
: -1,
addr_str, src_str, ifname);
} break;
@@ -726,7 +722,7 @@ int pim_tlv_parse_addr_list(const char *ifname, struct in_addr src_addr,
__func__,
*hello_option_addr_list
? ((int)listcount(
- *hello_option_addr_list))
+ *hello_option_addr_list))
: -1,
src_str, ifname);
}
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index bb24c9bc8..ef65f097a 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -76,8 +76,7 @@ static void pim_upstream_remove_children(struct pim_instance *pim,
listnode_delete(up->sources, child);
if (PIM_UPSTREAM_FLAG_TEST_SRC_LHR(child->flags)) {
PIM_UPSTREAM_FLAG_UNSET_SRC_LHR(child->flags);
- child = pim_upstream_del(pim, child,
- __func__);
+ child = pim_upstream_del(pim, child, __func__);
}
if (child) {
child->parent = NULL;
@@ -272,8 +271,8 @@ void pim_upstream_send_join(struct pim_upstream *up)
{
if (!up->rpf.source_nexthop.interface) {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ zlog_debug("%s: up %s RPF is not present", __func__,
+ up->sg_str);
return;
}
@@ -281,8 +280,8 @@ void pim_upstream_send_join(struct pim_upstream *up)
char rpf_str[PREFIX_STRLEN];
pim_addr_dump("<rpf?>", &up->rpf.rpf_addr, rpf_str,
sizeof(rpf_str));
- zlog_debug("%s: RPF'%s=%s(%s) for Interface %s",
- __func__, up->sg_str, rpf_str,
+ zlog_debug("%s: RPF'%s=%s(%s) for Interface %s", __func__,
+ up->sg_str, rpf_str,
pim_upstream_state2str(up->join_state),
up->rpf.source_nexthop.interface->name);
if (pim_rpf_addr_is_inaddr_any(&up->rpf)) {
@@ -304,8 +303,8 @@ static int on_join_timer(struct thread *t)
if (!up->rpf.source_nexthop.interface) {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ zlog_debug("%s: up %s RPF is not present", __func__,
+ up->sg_str);
return 0;
}
@@ -355,8 +354,7 @@ void join_timer_start(struct pim_upstream *up)
if (PIM_DEBUG_PIM_EVENTS) {
zlog_debug(
"%s: starting %d sec timer for upstream (S,G)=%s",
- __func__, router->t_periodic,
- up->sg_str);
+ __func__, router->t_periodic, up->sg_str);
}
}
@@ -405,8 +403,8 @@ void pim_upstream_join_suppress(struct pim_upstream *up,
if (!up->rpf.source_nexthop.interface) {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ zlog_debug("%s: up %s RPF is not present", __func__,
+ up->sg_str);
return;
}
@@ -445,8 +443,8 @@ void pim_upstream_join_timer_decrease_to_t_override(const char *debug_label,
if (!up->rpf.source_nexthop.interface) {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ zlog_debug("%s: up %s RPF is not present", __func__,
+ up->sg_str);
return;
}
@@ -518,8 +516,8 @@ static int pim_upstream_could_register(struct pim_upstream *up)
pim_ifp = up->rpf.source_nexthop.interface->info;
else {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ zlog_debug("%s: up %s RPF is not present", __func__,
+ up->sg_str);
}
if (pim_ifp && PIM_I_am_DR(pim_ifp)
@@ -655,15 +653,15 @@ void pim_upstream_switch(struct pim_instance *pim, struct pim_upstream *up,
if (up->upstream_addr.s_addr == INADDR_ANY) {
if (PIM_DEBUG_PIM_EVENTS)
- zlog_debug("%s: RPF not configured for %s",
- __func__, up->sg_str);
+ zlog_debug("%s: RPF not configured for %s", __func__,
+ up->sg_str);
return;
}
if (!up->rpf.source_nexthop.interface) {
if (PIM_DEBUG_PIM_EVENTS)
- zlog_debug("%s: RP not reachable for %s",
- __func__, up->sg_str);
+ zlog_debug("%s: RP not reachable for %s", __func__,
+ up->sg_str);
return;
}
@@ -837,8 +835,7 @@ static struct pim_upstream *pim_upstream_new(struct pim_instance *pim,
up->join_state = PIM_UPSTREAM_NOTJOINED;
up->reg_state = PIM_REG_NOINFO;
up->state_transition = pim_time_monotonic_sec();
- up->channel_oil =
- pim_channel_oil_add(pim, &up->sg, __func__);
+ up->channel_oil = pim_channel_oil_add(pim, &up->sg, __func__);
up->sptbit = PIM_UPSTREAM_SPTBIT_FALSE;
up->rpf.source_nexthop.interface = NULL;
@@ -910,8 +907,8 @@ static struct pim_upstream *pim_upstream_new(struct pim_instance *pim,
if (PIM_DEBUG_PIM_TRACE) {
zlog_debug(
"%s: Created Upstream %s upstream_addr %s ref count %d increment",
- __func__, up->sg_str,
- inet_ntoa(up->upstream_addr), up->ref_count);
+ __func__, up->sg_str, inet_ntoa(up->upstream_addr),
+ up->ref_count);
}
return up;
@@ -995,8 +992,7 @@ void pim_upstream_ref(struct pim_upstream *up, int flags, const char *name)
++up->ref_count;
if (PIM_DEBUG_PIM_TRACE)
zlog_debug("%s(%s): upstream %s ref count %d increment",
- __func__, name, up->sg_str,
- up->ref_count);
+ __func__, name, up->sg_str, up->ref_count);
}
struct pim_upstream *pim_upstream_add(struct pim_instance *pim,
@@ -1026,9 +1022,8 @@ struct pim_upstream *pim_upstream_add(struct pim_instance *pim,
up->rpf.source_nexthop.interface->name : "Unknown" ,
found, up->ref_count);
} else
- zlog_debug("%s(%s): (%s) failure to create",
- __func__, name,
- pim_str_sg_dump(sg));
+ zlog_debug("%s(%s): (%s) failure to create", __func__,
+ name, pim_str_sg_dump(sg));
}
return up;
@@ -1232,8 +1227,7 @@ void pim_upstream_rpf_genid_changed(struct pim_instance *pim,
sizeof(rpf_addr_str));
zlog_debug(
"%s: matching neigh=%s against upstream (S,G)=%s[%s] joined=%d rpf_addr=%s",
- __func__, neigh_str, up->sg_str,
- pim->vrf->name,
+ __func__, neigh_str, up->sg_str, pim->vrf->name,
up->join_state == PIM_UPSTREAM_JOINED,
rpf_addr_str);
}
@@ -1567,8 +1561,8 @@ void pim_upstream_set_sptbit(struct pim_upstream *up,
// AND JoinDesired(S,G) == true
if (!pim_upstream_evaluate_join_desired(up->channel_oil->pim, up)) {
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: %s Join is not Desired",
- __func__, up->sg_str);
+ zlog_debug("%s: %s Join is not Desired", __func__,
+ up->sg_str);
return;
}
@@ -1666,7 +1660,8 @@ static int pim_upstream_register_stop_timer(struct thread *t)
char state_str[PIM_REG_STATE_STR_LEN];
zlog_debug("%s: (S,G)=%s[%s] upstream register stop timer %s",
__func__, up->sg_str, pim->vrf->name,
- pim_reg_state2str(up->reg_state, state_str, sizeof(state_str)));
+ pim_reg_state2str(up->reg_state, state_str,
+ sizeof(state_str)));
}
switch (up->reg_state) {
@@ -1683,7 +1678,7 @@ static int pim_upstream_register_stop_timer(struct thread *t)
if (!up->rpf.source_nexthop.interface) {
if (PIM_DEBUG_PIM_TRACE)
zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ __func__, up->sg_str);
return 0;
}
@@ -1751,8 +1746,8 @@ int pim_upstream_inherited_olist_decide(struct pim_instance *pim,
if (!up->rpf.source_nexthop.interface)
if (PIM_DEBUG_PIM_TRACE)
- zlog_debug("%s: up %s RPF is not present",
- __func__, up->sg_str);
+ zlog_debug("%s: up %s RPF is not present", __func__,
+ up->sg_str);
FOR_ALL_INTERFACES (pim->vrf, ifp) {
if (!ifp->info)
@@ -1843,8 +1838,8 @@ void pim_upstream_find_new_rpf(struct pim_instance *pim)
if (up->upstream_addr.s_addr == INADDR_ANY) {
if (PIM_DEBUG_PIM_TRACE)
zlog_debug(
- "%s: RP not configured for Upstream %s",
- __func__, up->sg_str);
+ "%s: RP not configured for Upstream %s",
+ __func__, up->sg_str);
continue;
}
@@ -1960,8 +1955,7 @@ static void pim_upstream_sg_running(void *arg)
if (!up->channel_oil->installed) {
if (PIM_DEBUG_PIM_TRACE)
zlog_debug("%s: %s%s is not installed in mroute",
- __func__, up->sg_str,
- pim->vrf->name);
+ __func__, up->sg_str, pim->vrf->name);
return;
}
@@ -1977,8 +1971,7 @@ static void pim_upstream_sg_running(void *arg)
if (PIM_DEBUG_PIM_TRACE)
zlog_debug(
"%s: Handling unscanned inherited_olist for %s[%s]",
- __func__, up->sg_str,
- pim->vrf->name);
+ __func__, up->sg_str, pim->vrf->name);
pim_upstream_inherited_olist_decide(pim, up);
up->channel_oil->oil_inherited_rescan = 0;
}
@@ -2007,9 +2000,8 @@ static void pim_upstream_sg_running(void *arg)
"source reference created on kat restart %s[%s]",
up->sg_str, pim->vrf->name);
- pim_upstream_ref(up,
- PIM_UPSTREAM_FLAG_MASK_SRC_STREAM,
- __func__);
+ pim_upstream_ref(up, PIM_UPSTREAM_FLAG_MASK_SRC_STREAM,
+ __func__);
PIM_UPSTREAM_FLAG_SET_SRC_STREAM(up->flags);
pim_upstream_fhr_kat_start(up);
}
diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c
index f5f770723..93e2f00f9 100644
--- a/pimd/pim_vxlan.c
+++ b/pimd/pim_vxlan.c
@@ -239,8 +239,7 @@ static void pim_vxlan_orig_mr_up_del(struct pim_vxlan_sg *vxlan_sg)
* origination mroutes active sources but just in
* case
*/
- up = pim_upstream_del(vxlan_sg->pim, up,
- __func__);
+ up = pim_upstream_del(vxlan_sg->pim, up, __func__);
}
/* if there are other references register the source
* for nht
@@ -353,8 +352,7 @@ static void pim_vxlan_orig_mr_up_add(struct pim_vxlan_sg *vxlan_sg)
pim->regiface->info);
} else {
up = pim_upstream_add(vxlan_sg->pim, &vxlan_sg->sg,
- vxlan_sg->iif, flags,
- __func__, NULL);
+ vxlan_sg->iif, flags, __func__, NULL);
vxlan_sg->up = up;
}
@@ -614,9 +612,8 @@ static void pim_vxlan_term_mr_up_add(struct pim_vxlan_sg *vxlan_sg)
/* enable MLAG designated-forwarder election on termination mroutes */
PIM_UPSTREAM_FLAG_SET_MLAG_VXLAN(flags);
- up = pim_upstream_add(vxlan_sg->pim, &vxlan_sg->sg,
- NULL /* iif */, flags,
- __func__, NULL);
+ up = pim_upstream_add(vxlan_sg->pim, &vxlan_sg->sg, NULL /* iif */,
+ flags, __func__, NULL);
vxlan_sg->up = up;
if (!up) {
@@ -648,8 +645,7 @@ static void pim_vxlan_term_mr_up_del(struct pim_vxlan_sg *vxlan_sg)
up->flags &= ~(PIM_UPSTREAM_FLAG_MASK_SRC_VXLAN_TERM |
PIM_UPSTREAM_FLAG_MASK_MLAG_VXLAN);
pim_mlag_up_local_del(vxlan_sg->pim, up);
- pim_upstream_del(vxlan_sg->pim, up,
- __func__);
+ pim_upstream_del(vxlan_sg->pim, up, __func__);
}
}
@@ -881,9 +877,8 @@ static void pim_vxlan_set_default_iif(struct pim_instance *pim,
old_iif = pim->vxlan.default_iif;
if (PIM_DEBUG_VXLAN)
zlog_debug("%s: vxlan default iif changed from %s to %s",
- __func__,
- old_iif ? old_iif->name : "-",
- ifp ? ifp->name : "-");
+ __func__, old_iif ? old_iif->name : "-",
+ ifp ? ifp->name : "-");
old_iif = pim_vxlan_orig_mr_iif_get(pim);
pim->vxlan.default_iif = ifp;
@@ -892,9 +887,9 @@ static void pim_vxlan_set_default_iif(struct pim_instance *pim,
return;
if (PIM_DEBUG_VXLAN)
- zlog_debug("%s: vxlan orig iif changed from %s to %s",
- __func__, old_iif ? old_iif->name : "-",
- ifp ? ifp->name : "-");
+ zlog_debug("%s: vxlan orig iif changed from %s to %s", __func__,
+ old_iif ? old_iif->name : "-",
+ ifp ? ifp->name : "-");
/* add/del upstream entries for the existing vxlan SG when the
* interface becomes available
@@ -973,8 +968,8 @@ static void pim_vxlan_set_peerlink_rif(struct pim_instance *pim,
old_iif = pim->vxlan.peerlink_rif;
if (PIM_DEBUG_VXLAN)
zlog_debug("%s: vxlan peerlink_rif changed from %s to %s",
- __func__, old_iif ? old_iif->name : "-",
- ifp ? ifp->name : "-");
+ __func__, old_iif ? old_iif->name : "-",
+ ifp ? ifp->name : "-");
old_iif = pim_vxlan_orig_mr_iif_get(pim);
old_oif = pim_vxlan_orig_mr_oif_get(pim);
@@ -984,9 +979,8 @@ static void pim_vxlan_set_peerlink_rif(struct pim_instance *pim,
if (old_iif != new_iif) {
if (PIM_DEBUG_VXLAN)
zlog_debug("%s: vxlan orig iif changed from %s to %s",
- __func__,
- old_iif ? old_iif->name : "-",
- new_iif ? new_iif->name : "-");
+ __func__, old_iif ? old_iif->name : "-",
+ new_iif ? new_iif->name : "-");
/* add/del upstream entries for the existing vxlan SG when the
* interface becomes available
@@ -1001,9 +995,8 @@ static void pim_vxlan_set_peerlink_rif(struct pim_instance *pim,
if (old_oif != new_oif) {
if (PIM_DEBUG_VXLAN)
zlog_debug("%s: vxlan orig oif changed from %s to %s",
- __func__,
- old_oif ? old_oif->name : "-",
- new_oif ? new_oif->name : "-");
+ __func__, old_oif ? old_oif->name : "-",
+ new_oif ? new_oif->name : "-");
if (pim->vxlan.sg_hash)
hash_iterate(pim->vxlan.sg_hash,
pim_vxlan_sg_peerlink_oif_update,
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index cfeceff3b..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",
- __func__,
- 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",
- __func__, 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");
@@ -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",
- __func__, 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,
- __func__);
+ __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,
- __func__);
+ pim_upstream_mroute_add(up->channel_oil, __func__);
}
/* FIXME can join_desired actually be changed by pim_rpf_update()
@@ -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",
- __func__);
+ 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",
- __func__);
+ 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",
- __func__, 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 ?",
+ 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, __func__);
+ 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 ",
- __func__,
- 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__, __func__,
- 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,
- __func__);
+ 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",
- __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);
+ "%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,
- __func__);
+ 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__,
- __func__,
- 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",
- __func__,
- 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;
}
@@ -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",
- __func__, 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));
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index 054e91507..fc486f499 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -138,8 +138,7 @@ void zclient_lookup_new(void)
zclient_lookup_sched_now(zlookup);
- zlog_notice("%s: zclient lookup socket initialized",
- __func__);
+ zlog_notice("%s: zclient lookup socket initialized", __func__);
}
static int zclient_read_nexthop(struct pim_instance *pim,
@@ -175,8 +174,7 @@ static int zclient_read_nexthop(struct pim_instance *pim,
&version, &vrf_id, &command);
if (err < 0) {
flog_err(EC_LIB_ZAPI_MISSMATCH,
- "%s: zclient_read_header() failed",
- __func__);
+ "%s: zclient_read_header() failed", __func__);
zclient_lookup_failed(zlookup);
return -1;
}
@@ -198,8 +196,7 @@ static int zclient_read_nexthop(struct pim_instance *pim,
pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str));
pim_inet4_dump("<raddr?>", raddr, raddr_str, sizeof(raddr_str));
zlog_warn("%s: address mismatch: addr=%s(%s) raddr=%s",
- __func__, addr_str, pim->vrf->name,
- raddr_str);
+ __func__, addr_str, pim->vrf->name, raddr_str);
/* warning only */
}
@@ -228,8 +225,8 @@ static int zclient_read_nexthop(struct pim_instance *pim,
sizeof(addr_str));
zlog_warn(
"%s: found too many nexthop ifindexes (%d > %d) for address %s(%s)",
- __func__, (num_ifindex + 1),
- tab_size, addr_str, pim->vrf->name);
+ __func__, (num_ifindex + 1), tab_size, addr_str,
+ pim->vrf->name);
return num_ifindex;
}
nexthop_tab[num_ifindex].protocol_distance = distance;
@@ -304,8 +301,8 @@ static int zclient_read_nexthop(struct pim_instance *pim,
sizeof(addr_str));
zlog_warn(
"%s: found non-ifindex nexthop type=%d for address %s(%s)",
- __func__, nexthop_type,
- addr_str, pim->vrf->name);
+ __func__, nexthop_type, addr_str,
+ pim->vrf->name);
}
break;
}
@@ -410,8 +407,8 @@ int zclient_lookup_nexthop(struct pim_instance *pim,
sizeof(addr_str));
zlog_debug(
"%s: lookup=%d/%d: could not find nexthop ifindex for address %s(%s)",
- __func__, lookup, max_lookup,
- addr_str, pim->vrf->name);
+ __func__, lookup, max_lookup, addr_str,
+ pim->vrf->name);
}
return -1;
}
@@ -448,9 +445,9 @@ int zclient_lookup_nexthop(struct pim_instance *pim,
sizeof(addr_str));
zlog_debug(
"%s: lookup=%d/%d: found non-recursive ifindex=%d for address %s(%s) dist=%d met=%d",
- __func__, lookup,
- max_lookup, first_ifindex,
- addr_str, pim->vrf->name,
+ __func__, lookup, max_lookup,
+ first_ifindex, addr_str,
+ pim->vrf->name,
nexthop_tab[0]
.protocol_distance,
nexthop_tab[0].route_metric);
@@ -477,8 +474,8 @@ int zclient_lookup_nexthop(struct pim_instance *pim,
sizeof(nexthop_str));
zlog_debug(
"%s: lookup=%d/%d: zebra returned recursive nexthop %s for address %s(%s) dist=%d met=%d",
- __func__, lookup, max_lookup,
- nexthop_str, addr_str, pim->vrf->name,
+ __func__, lookup, max_lookup, nexthop_str,
+ addr_str, pim->vrf->name,
nexthop_tab[0].protocol_distance,
nexthop_tab[0].route_metric);
}
@@ -493,8 +490,7 @@ int zclient_lookup_nexthop(struct pim_instance *pim,
pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str));
zlog_warn(
"%s: lookup=%d/%d: failure searching recursive nexthop ifindex for address %s(%s)",
- __func__, lookup, max_lookup, addr_str,
- pim->vrf->name);
+ __func__, lookup, max_lookup, addr_str, pim->vrf->name);
}
return -2;
@@ -566,8 +562,7 @@ int pim_zlookup_sg_statistics(struct channel_oil *c_oil)
&version, &vrf_id, &command);
if (err < 0) {
flog_err(EC_LIB_ZAPI_MISSMATCH,
- "%s: zclient_read_header() failed",
- __func__);
+ "%s: zclient_read_header() failed", __func__);
zclient_lookup_failed(zlookup);
return -1;
}
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 80d2ec151..a2af66fdc 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -115,8 +115,8 @@ void pim_init(void)
flog_err(
EC_LIB_SOCKET,
"%s %s: could not solve %s to group address: errno=%d: %s",
- __FILE__, __func__, PIM_ALL_PIM_ROUTERS,
- errno, safe_strerror(errno));
+ __FILE__, __func__, PIM_ALL_PIM_ROUTERS, errno,
+ safe_strerror(errno));
zassert(0);
return;
}
diff --git a/ripngd/ripng_routemap.c b/ripngd/ripng_routemap.c
index 838bb6abb..b5f80d2ab 100644
--- a/ripngd/ripng_routemap.c
+++ b/ripngd/ripng_routemap.c
@@ -237,9 +237,9 @@ static void *route_set_metric_compile(const char *arg)
return mod;
if (metric > RIPNG_METRIC_INFINITY) {
- zlog_info("%s: Metric specified: %ld is being converted into METRIC_INFINITY",
- __func__,
- metric);
+ zlog_info(
+ "%s: Metric specified: %ld is being converted into METRIC_INFINITY",
+ __func__, metric);
mod->metric = RIPNG_METRIC_INFINITY;
} else
mod->metric = metric;
diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c
index b2fb52549..5baa74fe9 100644
--- a/sharpd/sharp_zebra.c
+++ b/sharpd/sharp_zebra.c
@@ -318,8 +318,7 @@ void sharp_zebra_nexthop_watch(struct prefix *p, vrf_id_t vrf_id, bool import,
}
if (zclient_send_rnh(zclient, command, p, connected, vrf_id) < 0)
- zlog_warn("%s: Failure to send nexthop to zebra",
- __func__);
+ zlog_warn("%s: Failure to send nexthop to zebra", __func__);
}
static int sharp_debug_nexthops(struct zapi_route *api)
@@ -388,8 +387,7 @@ static int sharp_redistribute_route(ZAPI_CALLBACK_ARGS)
struct zapi_route api;
if (zapi_route_decode(zclient->ibuf, &api) < 0)
- zlog_warn("%s: Decode of redistribute failed: %d",
- __func__,
+ zlog_warn("%s: Decode of redistribute failed: %d", __func__,
ZEBRA_REDISTRIBUTE_ROUTE_ADD);
zlog_debug("%s: %pFX (%s)", zserv_command_string(cmd),
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index d4390b96c..3903a5a5c 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -287,8 +287,8 @@ static int static_route_leak(
if (vty)
vty_out(vty, "%% Malformed address\n");
else
- zlog_warn("%s: Malformed address: %s",
- __func__, dest_str);
+ zlog_warn("%s: Malformed address: %s", __func__,
+ dest_str);
return CMD_WARNING_CONFIG_FAILED;
}
@@ -302,8 +302,7 @@ static int static_route_leak(
vty_out(vty, "%% Malformed address\n");
else
zlog_warn("%s: Malformed address: %s",
- __func__,
- mask_str);
+ __func__, mask_str);
return CMD_WARNING_CONFIG_FAILED;
}
p.prefixlen = ip_masklen(mask);
@@ -351,10 +350,9 @@ static int static_route_leak(
"%% Table %s overlaps vrf table %u\n",
table_str, svrf->vrf->data.l.table_id);
else
- zlog_warn(
- "%s: Table %s overlaps vrf table %u",
- __func__,
- table_str, svrf->vrf->data.l.table_id);
+ zlog_warn("%s: Table %s overlaps vrf table %u",
+ __func__, table_str,
+ svrf->vrf->data.l.table_id);
return CMD_WARNING_CONFIG_FAILED;
}
}
@@ -416,8 +414,8 @@ static int static_route_leak(
else
zlog_warn(
"%s: Too many labels, Enter %d or fewer for %s",
- __func__,
- MPLS_MAX_LABELS, dest_str);
+ __func__, MPLS_MAX_LABELS,
+ dest_str);
break;
}
return CMD_WARNING_CONFIG_FAILED;
@@ -462,8 +460,7 @@ static int static_route_leak(
flag_str);
else
zlog_warn("%s: Malformed flag %s for %s",
- __func__, flag_str,
- dest_str);
+ __func__, flag_str, dest_str);
return CMD_WARNING_CONFIG_FAILED;
}
}
@@ -477,8 +474,7 @@ static int static_route_leak(
else
zlog_warn(
"%s: Malformed nexthop address %s for %s",
- __func__, gate_str,
- dest_str);
+ __func__, gate_str, dest_str);
return CMD_WARNING_CONFIG_FAILED;
}
gatep = &gate;
diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c
index d48a6b9e8..5cadf3436 100644
--- a/staticd/static_zebra.c
+++ b/staticd/static_zebra.c
@@ -126,8 +126,9 @@ static int route_notify_owner(ZAPI_CALLBACK_ARGS)
break;
case ZAPI_ROUTE_BETTER_ADMIN_WON:
static_nht_mark_state(&p, vrf_id, STATIC_NOT_INSTALLED);
- zlog_warn("%s: Route %s over-ridden by better route for table: %u",
- __func__, buf, table_id);
+ zlog_warn(
+ "%s: Route %s over-ridden by better route for table: %u",
+ __func__, buf, table_id);
break;
case ZAPI_ROUTE_INSTALLED:
static_nht_mark_state(&p, vrf_id, STATIC_INSTALLED);
@@ -335,8 +336,7 @@ void static_zebra_nht_register(struct route_node *rn,
}
if (zclient_send_rnh(zclient, cmd, &p, false, si->nh_vrf_id) < 0)
- zlog_warn("%s: Failure to send nexthop to zebra",
- __func__);
+ zlog_warn("%s: Failure to send nexthop to zebra", __func__);
}
extern void static_zebra_route_add(struct route_node *rn,
diff --git a/tests/bgpd/test_mpath.c b/tests/bgpd/test_mpath.c
index 2aa58df86..81dd4308e 100644
--- a/tests/bgpd/test_mpath.c
+++ b/tests/bgpd/test_mpath.c
@@ -52,8 +52,8 @@
#define EXPECT_TRUE(expr, res) \
if (!(expr)) { \
- printf("Test failure in %s line %u: %s\n", __func__, \
- __LINE__, #expr); \
+ printf("Test failure in %s line %u: %s\n", __func__, __LINE__, \
+ #expr); \
(res) = TEST_FAILED; \
}
diff --git a/zebra/connected.c b/zebra/connected.c
index 6bc977b71..5c713aa97 100644
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -210,9 +210,10 @@ void connected_up(struct interface *ifp, struct connected *ifc)
zvrf = zebra_vrf_lookup_by_id(ifp->vrf_id);
if (!zvrf) {
- flog_err(EC_ZEBRA_VRF_NOT_FOUND,
- "%s: Received Up for interface but no associated zvrf: %d",
- __func__, ifp->vrf_id);
+ flog_err(
+ EC_ZEBRA_VRF_NOT_FOUND,
+ "%s: Received Up for interface but no associated zvrf: %d",
+ __func__, ifp->vrf_id);
return;
}
if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_REAL))
@@ -355,9 +356,10 @@ void connected_down(struct interface *ifp, struct connected *ifc)
zvrf = zebra_vrf_lookup_by_id(ifp->vrf_id);
if (!zvrf) {
- flog_err(EC_ZEBRA_VRF_NOT_FOUND,
- "%s: Received Up for interface but no associated zvrf: %d",
- __func__, ifp->vrf_id);
+ flog_err(
+ EC_ZEBRA_VRF_NOT_FOUND,
+ "%s: Received Up for interface but no associated zvrf: %d",
+ __func__, ifp->vrf_id);
return;
}
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 38bcb632b..580efee40 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -616,10 +616,10 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifinfomsg));
if (len < 0) {
- zlog_err("%s: Message received from netlink is of a broken size: %d %zu",
- __func__,
- h->nlmsg_len,
- (size_t)NLMSG_LENGTH(sizeof(struct ifinfomsg)));
+ zlog_err(
+ "%s: Message received from netlink is of a broken size: %d %zu",
+ __func__, h->nlmsg_len,
+ (size_t)NLMSG_LENGTH(sizeof(struct ifinfomsg)));
return -1;
}
@@ -975,10 +975,10 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifaddrmsg));
if (len < 0) {
- zlog_err("%s: Message received from netlink is of a broken size: %d %zu",
- __func__,
- h->nlmsg_len,
- (size_t)NLMSG_LENGTH(sizeof(struct ifaddrmsg)));
+ zlog_err(
+ "%s: Message received from netlink is of a broken size: %d %zu",
+ __func__, h->nlmsg_len,
+ (size_t)NLMSG_LENGTH(sizeof(struct ifaddrmsg)));
return -1;
}
@@ -1176,9 +1176,10 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifinfomsg));
if (len < 0) {
- zlog_err("%s: Message received from netlink is of a broken size %d %zu",
- __func__, h->nlmsg_len,
- (size_t)NLMSG_LENGTH(sizeof(struct ifinfomsg)));
+ zlog_err(
+ "%s: Message received from netlink is of a broken size %d %zu",
+ __func__, h->nlmsg_len,
+ (size_t)NLMSG_LENGTH(sizeof(struct ifinfomsg)));
return -1;
}
diff --git a/zebra/interface.c b/zebra/interface.c
index 1a3d24657..59cbfc685 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -84,9 +84,8 @@ static int if_zebra_speed_update(struct thread *thread)
return 1;
if (new_speed != ifp->speed) {
- zlog_info("%s: %s old speed: %u new speed: %u",
- __func__, ifp->name, ifp->speed,
- new_speed);
+ zlog_info("%s: %s old speed: %u new speed: %u", __func__,
+ ifp->name, ifp->speed, new_speed);
ifp->speed = new_speed;
if_add_update(ifp);
changed = true;
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index d5b319a70..0d25798d3 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -697,8 +697,7 @@ static void netlink_parse_extended_ack(struct nlmsghdr *h)
* but noticing it for later.
*/
err_nlh = &err->msg;
- zlog_debug("%s: Received %s extended Ack",
- __func__,
+ zlog_debug("%s: Received %s extended Ack", __func__,
nl_msg_type_to_str(err_nlh->nlmsg_type));
}
}
diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index ace959e1f..32051a62b 100644
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -346,8 +346,7 @@ void zebra_redistribute_add(ZAPI_HANDLER_ARGS)
if (afi == 0 || afi >= AFI_MAX) {
flog_warn(EC_ZEBRA_REDISTRIBUTE_UNKNOWN_AF,
- "%s: Specified afi %d does not exist",
- __func__, afi);
+ "%s: Specified afi %d does not exist", __func__, afi);
return;
}
@@ -395,8 +394,7 @@ void zebra_redistribute_delete(ZAPI_HANDLER_ARGS)
if (afi == 0 || afi >= AFI_MAX) {
flog_warn(EC_ZEBRA_REDISTRIBUTE_UNKNOWN_AF,
- "%s: Specified afi %d does not exist",
- __func__, afi);
+ "%s: Specified afi %d does not exist", __func__, afi);
return;
}
@@ -429,8 +427,7 @@ void zebra_redistribute_default_add(ZAPI_HANDLER_ARGS)
if (afi == 0 || afi >= AFI_MAX) {
flog_warn(EC_ZEBRA_REDISTRIBUTE_UNKNOWN_AF,
- "%s: Specified afi %u does not exist",
- __func__, afi);
+ "%s: Specified afi %u does not exist", __func__, afi);
return;
}
@@ -449,8 +446,7 @@ void zebra_redistribute_default_delete(ZAPI_HANDLER_ARGS)
if (afi == 0 || afi >= AFI_MAX) {
flog_warn(EC_ZEBRA_REDISTRIBUTE_UNKNOWN_AF,
- "%s: Specified afi %u does not exist",
- __func__, afi);
+ "%s: Specified afi %u does not exist", __func__, afi);
return;
}
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index d50356f24..a417175da 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -557,9 +557,10 @@ static int netlink_route_change_read_unicast(struct nlmsghdr *h, ns_id_t ns_id,
len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct rtmsg));
if (len < 0) {
- zlog_err("%s: Message received from netlink is of a broken size %d %zu",
- __func__, h->nlmsg_len,
- (size_t)NLMSG_LENGTH(sizeof(struct rtmsg)));
+ zlog_err(
+ "%s: Message received from netlink is of a broken size %d %zu",
+ __func__, h->nlmsg_len,
+ (size_t)NLMSG_LENGTH(sizeof(struct rtmsg)));
return -1;
}
@@ -951,10 +952,10 @@ int netlink_route_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct rtmsg));
if (len < 0) {
- zlog_err("%s: Message received from netlink is of a broken size: %d %zu",
- __func__,
- h->nlmsg_len,
- (size_t)NLMSG_LENGTH(sizeof(struct rtmsg)));
+ zlog_err(
+ "%s: Message received from netlink is of a broken size: %d %zu",
+ __func__, h->nlmsg_len,
+ (size_t)NLMSG_LENGTH(sizeof(struct rtmsg)));
return -1;
}
@@ -2871,8 +2872,7 @@ static int netlink_request_specific_mac_in_bridge(struct zebra_ns *zns,
addattr32(&req.n, sizeof(req), NDA_MASTER, br_if->ifindex);
if (IS_ZEBRA_DEBUG_KERNEL)
- zlog_debug("%s: Tx family %s IF %s(%u) MAC %s vid %u",
- __func__,
+ zlog_debug("%s: Tx family %s IF %s(%u) MAC %s vid %u", __func__,
nl_family_to_str(req.ndm.ndm_family), br_if->name,
br_if->ifindex,
prefix_mac2str(mac, buf, sizeof(buf)), vid);
@@ -3303,10 +3303,8 @@ int netlink_neigh_read_specific_ip(struct ipaddr *ip,
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("%s: neigh request IF %s(%u) IP %s vrf_id %u",
- __func__, vlan_if->name,
- vlan_if->ifindex,
- ipaddr2str(ip, buf, sizeof(buf)),
- vlan_if->vrf_id);
+ __func__, vlan_if->name, vlan_if->ifindex,
+ ipaddr2str(ip, buf, sizeof(buf)), vlan_if->vrf_id);
ret = netlink_request_specific_neigh_in_vlan(zns, RTM_GETNEIGH, ip,
vlan_if->ifindex);
@@ -3330,9 +3328,10 @@ int netlink_neigh_change(struct nlmsghdr *h, ns_id_t ns_id)
/* Length validity. */
len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct ndmsg));
if (len < 0) {
- zlog_err("%s: Message received from netlink is of a broken size %d %zu",
- __func__, h->nlmsg_len,
- (size_t)NLMSG_LENGTH(sizeof(struct ndmsg)));
+ zlog_err(
+ "%s: Message received from netlink is of a broken size %d %zu",
+ __func__, h->nlmsg_len,
+ (size_t)NLMSG_LENGTH(sizeof(struct ndmsg)));
return -1;
}
diff --git a/zebra/rule_netlink.c b/zebra/rule_netlink.c
index e71449764..c9699c7d9 100644
--- a/zebra/rule_netlink.c
+++ b/zebra/rule_netlink.c
@@ -201,9 +201,10 @@ int netlink_rule_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct fib_rule_hdr));
if (len < 0) {
- zlog_err("%s: Message received from netlink is of a broken size: %d %zu",
- __func__, h->nlmsg_len,
- (size_t)NLMSG_LENGTH(sizeof(struct fib_rule_hdr)));
+ zlog_err(
+ "%s: Message received from netlink is of a broken size: %d %zu",
+ __func__, h->nlmsg_len,
+ (size_t)NLMSG_LENGTH(sizeof(struct fib_rule_hdr)));
return -1;
}
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index a8811bbbb..29d59b515 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -632,10 +632,11 @@ void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq)
if (IS_ZEBRA_DEBUG_NHT_DETAILED) {
char buf[PREFIX_STRLEN];
- zlog_debug("%s: %s Being examined for Nexthop Tracking Count: %zd",
- __func__,
- srcdest_rnode2str(rn, buf, sizeof(buf)),
- dest ? rnh_list_count(&dest->nht) : 0);
+ zlog_debug(
+ "%s: %s Being examined for Nexthop Tracking Count: %zd",
+ __func__,
+ srcdest_rnode2str(rn, buf, sizeof(buf)),
+ dest ? rnh_list_count(&dest->nht) : 0);
}
if (!dest) {
rn = rn->parent;
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 70090321e..35a4db306 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -111,8 +111,8 @@ static void zebra_rnh_remove_from_routing_table(struct rnh *rnh)
char buf[PREFIX_STRLEN];
char buf1[PREFIX_STRLEN];
- zlog_debug("%s: %u:%s removed from tracking on %s",
- __func__, rnh->vrf_id,
+ zlog_debug("%s: %u:%s removed from tracking on %s", __func__,
+ rnh->vrf_id,
prefix2str(&rnh->node->p, buf, sizeof(buf)),
srcdest_rnode2str(rn, buf1, sizeof(buf)));
}
@@ -137,8 +137,8 @@ static void zebra_rnh_store_in_routing_table(struct rnh *rnh)
char buf[PREFIX_STRLEN];
char buf1[PREFIX_STRLEN];
- zlog_debug("%s: %u:%s added for tracking on %s",
- __func__, rnh->vrf_id,
+ zlog_debug("%s: %u:%s added for tracking on %s", __func__,
+ rnh->vrf_id,
prefix2str(&rnh->node->p, buf, sizeof(buf)),
srcdest_rnode2str(rn, buf1, sizeof(buf)));
}
@@ -452,8 +452,8 @@ zebra_rnh_resolve_import_entry(struct zebra_vrf *zvrf, afi_t afi,
char buf[PREFIX_STRLEN];
char buf1[PREFIX_STRLEN];
- zlog_debug("%s: %u:%s Resolved Import Entry to %s",
- __func__, rnh->vrf_id,
+ zlog_debug("%s: %u:%s Resolved Import Entry to %s", __func__,
+ rnh->vrf_id,
prefix2str(&rnh->node->p, buf, sizeof(buf)),
srcdest_rnode2str(rn, buf1, sizeof(buf)));
}
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 5f59a6e76..caff99dbe 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -254,8 +254,8 @@ static int host_rb_entry_compare(const struct host_rb_entry *hle1,
return memcmp(&hle1->p.u.prefix6, &hle2->p.u.prefix6,
IPV6_MAX_BYTELEN);
} else {
- zlog_debug("%s: Unexpected family type: %d",
- __func__, hle1->p.family);
+ zlog_debug("%s: Unexpected family type: %d", __func__,
+ hle1->p.family);
return 0;
}
}
@@ -590,12 +590,12 @@ static void zebra_vxlan_dup_addr_detect_for_neigh(struct zebra_vrf *zvrf,
if (CHECK_FLAG(nbr->flags, ZEBRA_NEIGH_DUPLICATE)) {
if (IS_ZEBRA_DEBUG_VXLAN)
zlog_debug(
- "%s: duplicate addr MAC %s IP %s flags 0x%x skip installing, learn count %u recover time %u",
- __func__,
- prefix_mac2str(&nbr->emac, buf, sizeof(buf)),
- ipaddr2str(&nbr->ip, buf1, sizeof(buf1)),
- nbr->flags, nbr->dad_count,
- zvrf->dad_freeze_time);
+ "%s: duplicate addr MAC %s IP %s flags 0x%x skip installing, learn count %u recover time %u",
+ __func__,
+ prefix_mac2str(&nbr->emac, buf, sizeof(buf)),
+ ipaddr2str(&nbr->ip, buf1, sizeof(buf1)),
+ nbr->flags, nbr->dad_count,
+ zvrf->dad_freeze_time);
if (zvrf->dad_freeze)
*is_dup_detect = true;
@@ -681,10 +681,12 @@ static void zebra_vxlan_dup_addr_detect_for_neigh(struct zebra_vrf *zvrf,
if (IS_ZEBRA_DEBUG_VXLAN)
zlog_debug(
"%s: duplicate addr MAC %s IP %s flags 0x%x auto recovery time %u start",
- __func__,
- prefix_mac2str(&nbr->emac, buf, sizeof(buf)),
- ipaddr2str(&nbr->ip, buf1, sizeof(buf1)),
- nbr->flags, zvrf->dad_freeze_time);
+ __func__,
+ prefix_mac2str(&nbr->emac, buf,
+ sizeof(buf)),
+ ipaddr2str(&nbr->ip, buf1,
+ sizeof(buf1)),
+ nbr->flags, zvrf->dad_freeze_time);
thread_add_timer(zrouter.master,
zebra_vxlan_dad_ip_auto_recovery_exp,
@@ -3426,11 +3428,10 @@ static bool zvni_check_mac_del_from_db(struct mac_walk_ctx *wctx,
if (IS_ZEBRA_DEBUG_VXLAN) {
char buf[ETHER_ADDR_STRLEN];
- zlog_debug("%s: Del MAC %s flags 0x%x",
- __func__,
- prefix_mac2str(&mac->macaddr,
- buf, sizeof(buf)),
- mac->flags);
+ zlog_debug(
+ "%s: Del MAC %s flags 0x%x", __func__,
+ prefix_mac2str(&mac->macaddr, buf, sizeof(buf)),
+ mac->flags);
}
wctx->uninstall = 0;
@@ -5911,11 +5912,12 @@ static void process_remote_macip_del(vni_t vni,
CHECK_FLAG(mac->flags, ZEBRA_MAC_DUPLICATE) &&
CHECK_FLAG(mac->flags, ZEBRA_MAC_REMOTE)) {
if (IS_ZEBRA_DEBUG_VXLAN)
- zlog_debug("%s: MAC %s (flags 0x%x) is remote and duplicate, read kernel for local entry",
- __func__,
- prefix_mac2str(macaddr, buf,
- sizeof(buf)),
- mac->flags);
+ zlog_debug(
+ "%s: MAC %s (flags 0x%x) is remote and duplicate, read kernel for local entry",
+ __func__,
+ prefix_mac2str(macaddr, buf,
+ sizeof(buf)),
+ mac->flags);
macfdb_read_specific_mac(zns, zif->brslave_info.br_if,
macaddr, vxl->access_vlan);
}
@@ -6981,8 +6983,7 @@ int zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
if (IS_ZEBRA_DEBUG_VXLAN)
zlog_debug("%s: clear neigh %s in dup state, flags 0x%x seq %u",
- __func__, buf, nbr->flags,
- nbr->loc_seq);
+ __func__, buf, nbr->flags, nbr->loc_seq);
UNSET_FLAG(nbr->flags, ZEBRA_NEIGH_DUPLICATE);
nbr->dad_count = 0;
@@ -7075,10 +7076,8 @@ static void zvni_clear_dup_neigh_hash(struct hash_bucket *bucket, void *ctxt)
if (IS_ZEBRA_DEBUG_VXLAN) {
ipaddr2str(&nbr->ip, buf, sizeof(buf));
- zlog_debug(
- "%s: clear neigh %s dup state, flags 0x%x seq %u",
- __func__, buf,
- nbr->flags, nbr->loc_seq);
+ zlog_debug("%s: clear neigh %s dup state, flags 0x%x seq %u",
+ __func__, buf, nbr->flags, nbr->loc_seq);
}
UNSET_FLAG(nbr->flags, ZEBRA_NEIGH_DUPLICATE);
@@ -7513,9 +7512,10 @@ int zebra_vxlan_handle_kernel_neigh_del(struct interface *ifp,
zvni = zvni_from_svi(ifp, link_if);
if (!zvni) {
if (IS_ZEBRA_DEBUG_VXLAN)
- zlog_debug("%s: Del neighbor %s VNI is not present for interface %s",
- __func__,
- ipaddr2str(ip, buf, sizeof(buf)), ifp->name);
+ zlog_debug(
+ "%s: Del neighbor %s VNI is not present for interface %s",
+ __func__, ipaddr2str(ip, buf, sizeof(buf)),
+ ifp->name);
return 0;
}
@@ -7558,8 +7558,8 @@ int zebra_vxlan_handle_kernel_neigh_del(struct interface *ifp,
zvrf = vrf_info_lookup(zvni->vxlan_if->vrf_id);
if (!zvrf) {
- zlog_debug("%s: VNI %u vrf lookup failed.",
- __func__, zvni->vni);
+ zlog_debug("%s: VNI %u vrf lookup failed.", __func__,
+ zvni->vni);
return -1;
}
@@ -9178,12 +9178,12 @@ int zebra_vxlan_process_vrf_vni_cmd(struct zebra_vrf *zvrf, vni_t vni,
zl3vni->mac_vlan_if = zl3vni_map_to_mac_vlan_if(zl3vni);
if (IS_ZEBRA_DEBUG_VXLAN)
- zlog_debug("%s: l3vni %u svi_if %s mac_vlan_if %s",
- __func__, vni,
- zl3vni->svi_if ?
- zl3vni->svi_if->name : "NIL",
- zl3vni->mac_vlan_if ?
- zl3vni->mac_vlan_if->name : "NIL");
+ zlog_debug(
+ "%s: l3vni %u svi_if %s mac_vlan_if %s",
+ __func__, vni,
+ zl3vni->svi_if ? zl3vni->svi_if->name : "NIL",
+ zl3vni->mac_vlan_if ? zl3vni->mac_vlan_if->name
+ : "NIL");
/* formulate l2vni list */
hash_iterate(zvrf_evpn->vni_table, zvni_add_to_l3vni_list,
@@ -9736,12 +9736,12 @@ static int zebra_vxlan_dad_ip_auto_recovery_exp(struct thread *t)
return 0;
if (IS_ZEBRA_DEBUG_VXLAN)
- zlog_debug("%s: duplicate addr MAC %s IP %s flags 0x%x learn count %u vni %u auto recovery expired",
- __func__,
- prefix_mac2str(&nbr->emac, buf2, sizeof(buf2)),
- ipaddr2str(&nbr->ip, buf1, sizeof(buf1)),
- nbr->flags,
- nbr->dad_count, zvni->vni);
+ zlog_debug(
+ "%s: duplicate addr MAC %s IP %s flags 0x%x learn count %u vni %u auto recovery expired",
+ __func__,
+ prefix_mac2str(&nbr->emac, buf2, sizeof(buf2)),
+ ipaddr2str(&nbr->ip, buf1, sizeof(buf1)), nbr->flags,
+ nbr->dad_count, zvni->vni);
UNSET_FLAG(nbr->flags, ZEBRA_NEIGH_DUPLICATE);
nbr->dad_count = 0;
If you are a new contributor to FRR, please see our contributing guidelines.
Just keep the code cool. Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
💚 Basic BGPD CI results: SUCCESS, 0 tests failedResults table
For details, please contact louberger |
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10978/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warningsclang_check |
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10979/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warningsWarnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: clang_check |
qlyoung
approved these changes
Mar 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.