ipng/lcpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup: Clean logging, consistent capitalization, nouns, and macro names

Browse Source
This commit is contained in:
Pim van Pelt
2023-01-11 16:18:18 +00:00
parent 2a218983d6
commit e53d4376ab
6 changed files with 129 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lcpng_netlink.c
View File

@ -231,7 +231,7 @@ lcp_nl_dispatch (struct nl_object *obj, void *arg)
lcp_nl_route_del ((struct rtnl_route *) obj);
break;
default:
NL_WARN ("dispatch: ignored %U", format_nl_object, obj);
LCP_NL_WARN ("dispatch: Ignored %U", format_nl_object, obj);
break;
}
vlib_worker_thread_barrier_release (vlib_get_main ());
@ -267,20 +267,20 @@ lcp_nl_process_msgs (void)
vec_foreach (msg_info, nm->nl_ns.nl_msg_queue)
{
if ((err = nl_msg_parse (msg_info->msg, lcp_nl_dispatch, msg_info)) < 0)
NL_ERROR ("process_msgs: Unable to parse object: %s",
LCP_NL_ERROR ("process_msgs: Unable to parse object: %s",
nl_geterror (err));
nlmsg_free (msg_info->msg);
if (++n_msgs >= nm->batch_size)
{
NL_INFO ("process_msgs: batch_size %u reached, yielding",
LCP_NL_INFO ("process_msgs: batch_size %u reached, yielding",
nm->batch_size);
break;
}
usecs = (u64) (1e6 * (vlib_time_now (vlib_get_main ()) - start));
if (usecs >= 1e3 * nm->batch_work_ms)
{
NL_INFO ("process_msgs: batch_work_ms %u reached, yielding",
LCP_NL_INFO ("process_msgs: batch_work_ms %u reached, yielding",
nm->batch_work_ms);
break;
}
@ -294,13 +294,13 @@ lcp_nl_process_msgs (void)
{
if (vec_len (nm->nl_ns.nl_msg_queue))
{
NL_WARN ("process_msgs: Processed %u messages in %llu usecs, %u "
LCP_NL_WARN ("process_msgs: Processed %u messages in %llu usecs, %u "
"left in queue",
n_msgs, usecs, vec_len (nm->nl_ns.nl_msg_queue));
}
else
{
NL_DBG ("process_msgs: Processed %u messages in %llu usecs", n_msgs,
LCP_NL_DBG ("process_msgs: Processed %u messages in %llu usecs", n_msgs,
usecs);
}
}
@ -348,7 +348,7 @@ lcp_nl_process (vlib_main_t *vm, vlib_node_runtime_t *node,
break;
default:
NL_ERROR ("process: Unknown event type: %u", (u32) event_type);
LCP_NL_ERROR ("process: Unknown event type: %u", (u32) event_type);
}
vec_reset_length (event_data);
@ -399,13 +399,13 @@ lcp_nl_pair_add_cb (lcp_itf_pair_t *lip)
// In future work, this plugin should be able to maintain a list of
// namespaces to listen on, adding/deleting listeners dynamically, ie every
// time this callback is invoked.
NL_DBG ("pair_add_cb: %U refcnt %u", format_lcp_itf_pair, lip,
LCP_NL_DBG ("pair_add_cb: %U refcnt %u", format_lcp_itf_pair, lip,
nm->nl_ns.clib_file_lcp_refcnt);
if ((nm->nl_ns.clib_file_lcp_refcnt > 0) &&
vec_cmp(nm->nl_ns.netns_name, lip->lip_namespace))
{
NL_WARN ("pair_add_cb: Existing netlink listener for netns %v -- this "
LCP_NL_WARN ("pair_add_cb: Existing netlink listener for netns %v -- this "
"itf-pair is in netns %v, will not be listened!",
nm->nl_ns.netns_name, lip->lip_namespace);
return;
@ -414,7 +414,7 @@ lcp_nl_pair_add_cb (lcp_itf_pair_t *lip)
nm->nl_ns.clib_file_lcp_refcnt++;
if (nm->nl_ns.clib_file_index == ~0)
{
NL_INFO ("pair_add_cb: Adding netlink listener for netns %v",
LCP_NL_INFO ("pair_add_cb: Adding netlink listener for netns %v",
lip->lip_namespace);
lcp_nl_open_socket (lip->lip_namespace);
}
@ -426,13 +426,13 @@ lcp_nl_pair_del_cb (lcp_itf_pair_t *lip)
lcp_nl_main_t *nm = &lcp_nl_main;
// See NOTE in lcp_nl_pair_add_cb().
NL_DBG ("pair_del_cb: %U refcnt %u", format_lcp_itf_pair, lip,
LCP_NL_DBG ("pair_del_cb: %U refcnt %u", format_lcp_itf_pair, lip,
nm->nl_ns.clib_file_lcp_refcnt);
nm->nl_ns.clib_file_lcp_refcnt--;
if (nm->nl_ns.clib_file_lcp_refcnt == 0)
{
NL_INFO ("pair_del_cb: Removing netlink listener for netns %v",
LCP_NL_INFO ("pair_del_cb: Removing netlink listener for netns %v",
lip->lip_namespace);
lcp_nl_close_socket ();
return;
@ -457,7 +457,7 @@ lcp_nl_read_cb (clib_file_t *f)
;
if (err < 0 && err != -NLE_AGAIN)
{
NL_ERROR ("read_cb: Error reading netlink socket (fd %d): %s (%d)",
LCP_NL_ERROR ("read_cb: Error reading netlink socket (fd %d): %s (%d)",
f->file_descriptor, nl_geterror (err), err);
vlib_process_signal_event (vlib_get_main (), lcp_nl_process_node.index,
NL_EVENT_READ_ERR, 0);
@ -475,7 +475,7 @@ lcp_nl_read_cb (clib_file_t *f)
static clib_error_t *
lcp_nl_error_cb (clib_file_t *f)
{
NL_ERROR ("error_cb: Error polling netlink socket (fd %d)",
LCP_NL_ERROR ("error_cb: Error polling netlink socket (fd %d)",
f->file_descriptor);
/* notify process node */
@ -499,7 +499,7 @@ lcp_nl_close_socket (void)
if (f)
{
NL_DBG ("close_socket: Stopping poll of netlink fd %u",
LCP_NL_DBG ("close_socket: Stopping poll of netlink fd %u",
f->file_descriptor);
fm->file_update (f, UNIX_FILE_UPDATE_DELETE);
}
@ -509,7 +509,7 @@ lcp_nl_close_socket (void)
/* If we created a socket, close/free it */
if (nm->nl_ns.sk_route)
{
NL_DBG ("close_socket: Closing netlink socket %d",
LCP_NL_DBG ("close_socket: Closing netlink socket %d",
nl_socket_get_fd (nm->nl_ns.sk_route));
nl_socket_free (nm->nl_ns.sk_route);
nm->nl_ns.sk_route = NULL;
@ -562,7 +562,7 @@ lcp_nl_open_socket (u8 *ns)
nm->tx_buf_size);
if (err != 0)
{
NL_ERROR ("open_socket: Failed to set buffer size tx %u rx %u error %s",
LCP_NL_ERROR ("open_socket: Failed to set buffer size tx %u rx %u error %s",
nm->tx_buf_size, nm->rx_buf_size, nl_geterror (err));
}
@ -586,7 +586,7 @@ lcp_nl_open_socket (u8 *ns)
};
nm->nl_ns.clib_file_index = clib_file_add (&file_main, &rt_file);
NL_DBG ("open_socket: Added netlink file idx %u fd %u ns %s",
LCP_NL_DBG ("open_socket: Added netlink file idx %u fd %u netns %s",
nm->nl_ns.clib_file_index, rt_file.file_descriptor, ns);
}
else
@ -597,13 +597,13 @@ lcp_nl_open_socket (u8 *ns)
f->file_descriptor = nl_socket_get_fd (nm->nl_ns.sk_route);
fm->file_update (f, UNIX_FILE_UPDATE_ADD);
NL_DBG ("open_socket: Updated netlink file idx %u fd %u ns %s",
LCP_NL_DBG ("open_socket: Updated netlink file idx %u fd %u netns %s",
nm->nl_ns.clib_file_index, f->file_descriptor, ns);
}
nl_socket_modify_cb (nm->nl_ns.sk_route, NL_CB_VALID, NL_CB_CUSTOM,
lcp_nl_callback, NULL);
NL_NOTICE ("open_socket: Started poll of netlink fd %d ns %s",
LCP_NL_NOTICE ("open_socket: Started poll of netlink fd %d netns %s",
nl_socket_get_fd (nm->nl_ns.sk_route), nm->nl_ns.netns_name);
}