From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 4 Mar 2020 16:08:25 +0000 (-0600)
Subject: rlm_radius_udp: More detailed error messages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aeb675037e266a11d7b3527d91bfec00ab1edcf;p=thirdparty%2Ffreeradius-server.git

rlm_radius_udp: More detailed error messages
---

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 0de2a6de352..c4d0d9c083c 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -602,6 +602,7 @@ static fr_connection_t *thread_conn_alloc(fr_trunk_connection_t *tconn, fr_event
 static void conn_discard(UNUSED fr_event_list_t *el, int fd, UNUSED int flags, void *uctx)
 {
 	fr_trunk_connection_t	*tconn = talloc_get_type_abort(uctx, fr_trunk_connection_t);
+	udp_handle_t		*h = talloc_get_type_abort(tconn->conn->h, udp_handle_t);
 	uint8_t			buffer[4096];
 	ssize_t			slen;
 
@@ -613,6 +614,8 @@ static void conn_discard(UNUSED fr_event_list_t *el, int fd, UNUSED int flags, v
 		case ECONNRESET:
 		case ENOTCONN:
 		case ETIMEDOUT:
+			ERROR("%s - %s failed draining socket: %s",
+			      __FUNCTION__, h->module_name, fr_syserror(errno));
 			fr_trunk_connection_signal_reconnect(tconn, FR_CONNECTION_FAILED);
 			break;
 
@@ -717,7 +720,7 @@ static void thread_conn_notify(fr_trunk_connection_t *tconn, fr_connection_t *co
 			       write_fn,
 			       conn_error,
 			       tconn) < 0) {
-		PERROR("%s - Failed inserting FD event", h->module_name);
+		PERROR("%s - %s failed inserting FD event", h->module_name, __FUNCTION__);
 
 		/*
 		 *	May free the connection!
@@ -759,7 +762,7 @@ static void thread_conn_notify_replicate(fr_trunk_connection_t *tconn, fr_connec
 			       write_fn,
 			       conn_error,
 			       tconn) < 0) {
-		PERROR("%s - Failed inserting FD event", h->module_name);
+		PERROR("%s - %s failed inserting FD event", h->module_name, __FUNCTION__);
 
 		/*
 		 *	May free the connection!
@@ -1917,7 +1920,8 @@ static void request_demux(fr_trunk_connection_t *tconn, fr_connection_t *conn, U
 		if (slen < 0) {
 			if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) return;
 
-			ERROR("%s - Failed reading from socket: %s", h->module_name, fr_syserror(errno));
+			ERROR("%s - %s failed reading response from socket: %s",
+			      __FUNCTION__, h->module_name, fr_syserror(errno));
 			fr_trunk_connection_signal_reconnect(tconn, FR_CONNECTION_FAILED);
 			return;
 		}