Skip to content

Commit

Permalink
Sanitize some overly verbose logging ERR->{DBG,INFO}
Browse files Browse the repository at this point in the history
  • Loading branch information
pimvanpelt committed Aug 13, 2021
1 parent 72f55fd commit aab1119
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions lcpng_if_sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ lcp_itf_pair_walk_sync_state_cb (index_t lipi, void *ctx)
clib_setns (vif_ns_fd);
}

LCP_ITF_PAIR_DBG ("walk_sync_state: lip %U flags %u mtu %u sup-mtu %u",
LCP_ITF_PAIR_DBG ("walk_sync_state: %U flags %u mtu %u sup-mtu %u",
format_lcp_itf_pair, lip, sw->flags, sw->mtu[VNET_MTU_L3],
sup_sw->mtu[VNET_MTU_L3]);
lcp_itf_set_link_state (lip, (sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP));
Expand All @@ -79,7 +79,7 @@ lcp_itf_pair_walk_sync_state_cb (index_t lipi, void *ctx)
*/
if (sup_sw->mtu[VNET_MTU_L3] < sw->mtu[VNET_MTU_L3])
{
LCP_ITF_PAIR_ERR ("walk_sync_state: lip %U flags %u mtu %u sup-mtu %u: "
LCP_ITF_PAIR_ERR ("walk_sync_state: %U flags %u mtu %u sup-mtu %u: "
"clamping to sup-mtu to satisfy netlink",
format_lcp_itf_pair, lip, sw->flags,
sw->mtu[VNET_MTU_L3], sup_sw->mtu[VNET_MTU_L3]);
Expand Down Expand Up @@ -382,7 +382,7 @@ lcp_itf_ip4_add_del_interface_addr (ip4_main_t *im, uword opaque,
clib_setns (vif_ns_fd);
}

LCP_ITF_PAIR_ERR ("ip4_addr_%s: %U ip4 %U/%u", is_del ? "del" : "add",
LCP_ITF_PAIR_DBG ("ip4_addr_%s: %U ip4 %U/%u", is_del ? "del" : "add",
format_lcp_itf_pair, lip, format_ip4_address, address,
address_length);

Expand Down Expand Up @@ -427,7 +427,7 @@ lcp_itf_ip6_add_del_interface_addr (ip6_main_t *im, uword opaque,
if (vif_ns_fd != -1)
clib_setns (vif_ns_fd);
}
LCP_ITF_PAIR_ERR ("ip6_addr_%s: %U ip4 %U/%u", is_del ? "del" : "add",
LCP_ITF_PAIR_DBG ("ip6_addr_%s: %U ip4 %U/%u", is_del ? "del" : "add",
format_lcp_itf_pair, lip, format_ip6_address, address,
address_length);
if (is_del)
Expand Down
16 changes: 8 additions & 8 deletions lcpng_interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -637,23 +637,23 @@ lcp_itf_set_interface_addr (const lcp_itf_pair_t *lip)
clib_setns (vif_ns_fd);
}

/* Display any IP4 addressing info */
/* Sync any IP4 addressing info into LCP */
foreach_ip_interface_address (
lm4, ia, lip->lip_phy_sw_if_index, 1 /* honor unnumbered */, ({
ip4_address_t *r4 = ip_interface_address_get_address (lm4, ia);
LCP_ITF_PAIR_ERR ("set_interface_addr: %U add ip4 %U/%d",
format_lcp_itf_pair, lip, format_ip4_address, r4,
ia->address_length);
LCP_ITF_PAIR_INFO ("set_interface_addr: %U add ip4 %U/%d",
format_lcp_itf_pair, lip, format_ip4_address, r4,
ia->address_length);
vnet_netlink_add_ip4_addr (lip->lip_vif_index, r4, ia->address_length);
}));

/* Display any IP6 addressing info */
/* Sync any IP6 addressing info into LCP */
foreach_ip_interface_address (
lm6, ia, lip->lip_phy_sw_if_index, 1 /* honor unnumbered */, ({
ip6_address_t *r6 = ip_interface_address_get_address (lm6, ia);
LCP_ITF_PAIR_ERR ("set_interface_addr: %U add ip6 %U/%d",
format_lcp_itf_pair, lip, format_ip6_address, r6,
ia->address_length);
LCP_ITF_PAIR_INFO ("set_interface_addr: %U add ip6 %U/%d",
format_lcp_itf_pair, lip, format_ip6_address, r6,
ia->address_length);
vnet_netlink_add_ip6_addr (lip->lip_vif_index, r6, ia->address_length);
}));

Expand Down

0 comments on commit aab1119

Please sign in to comment.