From: Alan T. DeKok Date: Mon, 13 Mar 2023 20:32:47 +0000 (-0400) Subject: clean up debug output X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcc1a828779b8897086d7a0e93fe8c5210124752;p=thirdparty%2Ffreeradius-server.git clean up debug output use BFD peer message as we don't really care about IP addresses and ports --- diff --git a/src/listen/bfd/proto_bfd_udp.c b/src/listen/bfd/proto_bfd_udp.c index 010d13e45cf..5ced20adcbb 100644 --- a/src/listen/bfd/proto_bfd_udp.c +++ b/src/listen/bfd/proto_bfd_udp.c @@ -46,6 +46,7 @@ typedef struct { typedef struct { CONF_SECTION *cs; //!< our configuration + char const *server_name; //!< virtual server name fr_ipaddr_t ipaddr; //!< IP address to listen on. @@ -172,10 +173,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time /* * Print out what we received. */ - DEBUG2("proto_bfd_udp - Received %s ID length %d on %s from %pV:%u", - fr_bfd_packet_names[packet->state], - (int) packet_len, thread->name, - fr_box_ipaddr(address->socket.inet.src_ipaddr), address->socket.inet.src_port); + DEBUG2("BFD %s peer %s received %s", client->shortname, inst->server_name, fr_bfd_packet_names[packet->state]); /* * Run the BFD state machine. Depending on that result, @@ -425,6 +423,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx) fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); + inst->server_name = cf_section_name2(server_cs); /* * Look up peer list. @@ -503,6 +502,7 @@ static void mod_event_list_set(fr_listen_t *li, fr_event_list_t *el, void *nr) peer->listen = li; peer->nr = (fr_network_t *) nr; peer->sockfd = thread->sockfd; + peer->server_name = inst->server_name; bfd_session_start(peer); } diff --git a/src/listen/bfd/session.c b/src/listen/bfd/session.c index 1437a89cb6a..0dd3e48889b 100644 --- a/src/listen/bfd/session.c +++ b/src/listen/bfd/session.c @@ -148,8 +148,8 @@ bfd_state_change_t bfd_session_process(bfd_session_t *session, bfd_packet_t *bfd * no session is found, the packet MUST be discarded. */ if ((bfd->your_disc != 0) && (bfd->your_disc != session->local_disc)) { - DEBUG("BFD %s packet has unexpected Your-Discriminator (got %08x, expected %08x", - session->client.shortname, bfd->your_disc, session->local_disc); + DEBUG("BFD %s peer %s packet has unexpected Your-Discriminator (got %08x, expected %08x", + session->server_name, session->client.shortname, bfd->your_disc, session->local_disc); return BFD_STATE_CHANGE_INVALID; } @@ -159,7 +159,8 @@ bfd_state_change_t bfd_session_process(bfd_session_t *session, bfd_packet_t *bfd */ if (bfd->auth_present && (session->auth_type == BFD_AUTH_RESERVED)) { - DEBUG("BFD %s packet asked to authenticate an unauthenticated session.", session->client.shortname); + DEBUG("BFD %s peer %s packet asked to authenticate an unauthenticated session.", + session->server_name, session->client.shortname); return BFD_STATE_CHANGE_INVALID; } @@ -169,7 +170,8 @@ bfd_state_change_t bfd_session_process(bfd_session_t *session, bfd_packet_t *bfd */ if (!bfd->auth_present && (session->auth_type != BFD_AUTH_RESERVED)) { - DEBUG("BFD %s packet failed to authenticate an authenticated session.", session->client.shortname); + DEBUG("BFD %s peer %s packet failed to authenticate an authenticated session.", + session->server_name, session->client.shortname); return BFD_STATE_CHANGE_INVALID; } @@ -179,12 +181,11 @@ bfd_state_change_t bfd_session_process(bfd_session_t *session, bfd_packet_t *bfd * (bfd.AuthType). This may cause the packet to be discarded. */ if (bfd->auth_present && !bfd_authenticate(session, bfd)) { - DEBUG("BFD %s authentication failed", session->client.shortname); + DEBUG("BFD %s peer %s authentication failed for packet", + session->server_name, session->client.shortname); return BFD_STATE_CHANGE_INVALID; } - DEBUG("BFD %s processing packet", session->client.shortname); - /* * Set bfd.RemoteDiscr to the value of My Discriminator. * @@ -272,8 +273,8 @@ bfd_state_change_t bfd_session_process(bfd_session_t *session, bfd_packet_t *bfd down: session->local_diag = BFD_NEIGHBOR_DOWN; - DEBUG("BFD %s State %s -> DOWN (neighbour %s)", - session->client.shortname, + DEBUG("BFD %s peer %s State %s -> DOWN (neighbour %s)", + session->server_name, session->client.shortname, fr_bfd_packet_names[session->session_state], fr_bfd_packet_names[bfd->state]); session->session_state = BFD_STATE_DOWN; @@ -285,15 +286,15 @@ bfd_state_change_t bfd_session_process(bfd_session_t *session, bfd_packet_t *bfd case BFD_STATE_DOWN: switch (bfd->state) { case BFD_STATE_DOWN: - DEBUG("BFD %s State DOWN -> INIT (neighbor DOWN)", - session->client.shortname); + DEBUG("BFD %s peer %s State DOWN -> INIT (neighbor DOWN)", + session->server_name, session->client.shortname); session->session_state = BFD_STATE_INIT; state_change = BFD_STATE_CHANGE_INIT; break; case BFD_STATE_INIT: - DEBUG("BFD %s State DOWN -> UP (neighbor INIT)", - session->client.shortname); + DEBUG("BFD %s peer State DOWN -> UP (neighbor INIT)", + session->server_name, session->client.shortname); session->session_state = BFD_STATE_UP; state_change = BFD_STATE_CHANGE_UP; break; @@ -307,8 +308,8 @@ bfd_state_change_t bfd_session_process(bfd_session_t *session, bfd_packet_t *bfd switch (bfd->state) { case BFD_STATE_INIT: case BFD_STATE_UP: - DEBUG("BFD %s State INIT -> UP", - session->client.shortname); + DEBUG("BFD %s peer %s State INIT -> UP", + session->server_name, session->client.shortname); session->session_state = BFD_STATE_UP; state_change = BFD_STATE_CHANGE_UP; break; @@ -358,7 +359,8 @@ bfd_state_change_t bfd_session_process(bfd_session_t *session, bfd_packet_t *bfd if (session->remote_demand_mode && (session->session_state == BFD_STATE_UP) && (session->remote_session_state == BFD_STATE_UP)) { - DEBUG("BFD %s demand mode UP / UP, stopping packets", session->client.shortname); + DEBUG("BFD %s peer %s demand mode UP / UP, stopping packets", + session->server_name, session->client.shortname); bfd_stop_control(session); } @@ -565,7 +567,8 @@ static int bfd_verify_md5(bfd_session_t *session, bfd_packet_t *bfd) memcpy(md5->digest, digest, sizeof(md5->digest)); /* pedantic */ if (rcode != 0) { - DEBUG("BFD %s MD5 Digest failed: **** RE-ENTER THE SECRET ON BOTH ENDS ****", session->client.shortname); + DEBUG("BFD %s peer %s MD5 Digest failed: **** RE-ENTER THE SECRET ON BOTH ENDS ****", + session->server_name, session->client.shortname); return 0; } @@ -604,7 +607,8 @@ static int bfd_verify_sha1(bfd_session_t *session, bfd_packet_t *bfd) memcpy(sha1->digest, digest, sizeof(sha1->digest)); /* pedantic */ if (rcode != 0) { - DEBUG("BFD %s SHA1 Digest failed: **** RE-ENTER THE SECRET ON BOTH ENDS ****", session->client.shortname); + DEBUG("BFD %s peer %s SHA1 Digest failed: **** RE-ENTER THE SECRET ON BOTH ENDS ****", + session->server_name, session->client.shortname); return 0; } @@ -698,8 +702,8 @@ static void bfd_control_packet_init(bfd_session_t *session, bfd_packet_t *bfd) (session->remote_session_state == BFD_STATE_UP)) { bfd->demand = true; - DEBUG("BFD %s demand mode UP / UP, sending ACK and done.", - session->client.shortname); + DEBUG("BFD %s peer %s demand mode UP / UP, sending ACK and done.", + session->server_name, session->client.shortname); bfd_stop_control(session); } else { bfd->demand = false; @@ -737,8 +741,8 @@ static void bfd_send_packet(UNUSED fr_event_list_t *el, UNUSED fr_time_t now, vo bfd_sign(session, &bfd); - DEBUG("BFD %s sending packet state %s", - session->client.shortname, fr_bfd_packet_names[session->session_state]); + DEBUG("BFD %s peer %s sending %s", + session->server_name, session->client.shortname, fr_bfd_packet_names[session->session_state]); session->last_sent = fr_time(); @@ -774,7 +778,6 @@ static void bfd_start_packets(bfd_session_t *session) * The other end doesn't want to receive control packets. So we stop sending them. */ if (!interval) return; - } /* @@ -885,7 +888,8 @@ static void bfd_detection_timeout(UNUSED fr_event_list_t *el, fr_time_t now, voi { bfd_session_t *session = ctx; - DEBUG("BFD %s Timeout state %s ****** ", session->client.shortname, + DEBUG("BFD %s peer %s TIMEOUT state %s", + session->server_name, session->client.shortname, fr_bfd_packet_names[session->session_state]); if (!session->demand_mode) { @@ -900,7 +904,8 @@ static void bfd_detection_timeout(UNUSED fr_event_list_t *el, fr_time_t now, voi } else if (!session->doing_poll) { start_poll: - DEBUG("BFD %s State -> DOWN (control expired)", session->client.shortname); + DEBUG("BFD %s peer %s State -> DOWN (control expired)", + session->server_name, session->client.shortname); session->session_state = BFD_STATE_DOWN; session->local_diag = BFD_CTRL_EXPIRED; bfd_trigger(session, BFD_STATE_CHANGE_TIMEOUT_DOWN); @@ -987,8 +992,8 @@ static void bfd_start_control(bfd_session_t *session) (session->session_state == BFD_STATE_UP) && (session->remote_session_state == BFD_STATE_UP) && !session->doing_poll) { - DEBUG("BFD %s warning: asked to start UP / UP ?", - session->client.shortname); + DEBUG("BFD %s peer %s warning: asked to start UP / UP ?", + session->server_name, session->client.shortname); fr_assert(0 == 1); bfd_stop_control(session); return; diff --git a/src/listen/bfd/session.h b/src/listen/bfd/session.h index 7bfab9b02ad..f44fb49264b 100644 --- a/src/listen/bfd/session.h +++ b/src/listen/bfd/session.h @@ -30,6 +30,8 @@ typedef struct { uint16_t port; //!< peer port where packets are sent to + char const *server_name; //!< our name + /* * Peers are defined globally to a virtual server. Each * peer can only have one session associated with it.