From 3a53b2dc4ffb0695c9cb7093838096eb465975cb Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 13 Dec 2024 11:21:26 -0500 Subject: [PATCH] zebra: Give a bit more data about zclient connection on errors When debugging a crash I noticed that sometimes we talked about a zclient connection in relation to the fd associated with it and sometimes we did not. Let's just always give the data associated with the fd. It will make it a bit easier for me to follow the transitions. Signed-off-by: Donald Sharp --- zebra/zserv.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/zebra/zserv.c b/zebra/zserv.c index d6c017d259e4..7ef358232991 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -184,10 +184,9 @@ void zserv_log_message(const char *errmsg, struct stream *msg, */ static void zserv_client_fail(struct zserv *client) { - flog_warn( - EC_ZEBRA_CLIENT_IO_ERROR, - "Client '%s' (session id %d) encountered an error and is shutting down.", - zebra_route_string(client->proto), client->session_id); + flog_warn(EC_ZEBRA_CLIENT_IO_ERROR, + "Client %d '%s' (session id %d) encountered an error and is shutting down.", + client->sock, zebra_route_string(client->proto), client->session_id); atomic_store_explicit(&client->pthread->running, false, memory_order_relaxed); @@ -468,8 +467,8 @@ static void zserv_read(struct event *thread) } if (IS_ZEBRA_DEBUG_PACKET) - zlog_debug("Read %d packets from client: %s. Current ibuf fifo count: %zu. Conf P2p %d", - p2p_avail - p2p, zebra_route_string(client->proto), + zlog_debug("Read %d packets from client: %s(%d). Current ibuf fifo count: %zu. Conf P2p %d", + p2p_avail - p2p, zebra_route_string(client->proto), client->sock, client_ibuf_fifo_cnt, p2p_orig); /* Reschedule ourselves since we have space in ibuf_fifo */