From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 10 Feb 2023 13:07:08 +0000 (-0500)
Subject: just set "*leftover" always
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ea38b8726000a024b2737612c599874cdfbfe1;p=thirdparty%2Ffreeradius-server.git

just set "*leftover" always

no need to check for conditions, because the previous check
for "smaller than one packet" takes care of what we need.
---

diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index 36004764e5c..87e19910cd6 100644
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -165,14 +165,10 @@ static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *re
 	}
 
 	/*
-	 *	We've read more than one packet.  Tell the caller that
+	 *	We've read at least one packet.  Tell the caller that
 	 *	there's more data available, and return only one packet.
 	 */
-	if (in_buffer > packet_len) {
-		*leftover = in_buffer - packet_len;
-	} else {
-		*leftover = 0;
-	}
+	*leftover = in_buffer - packet_len;
 
 	/*
 	 *      If it's not a RADIUS packet, ignore it.
diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c
index 26c51369cd2..f732971068c 100644
--- a/src/listen/tacacs/proto_tacacs_tcp.c
+++ b/src/listen/tacacs/proto_tacacs_tcp.c
@@ -186,18 +186,10 @@ static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *re
 	}
 
 	/*
-	 *	We've read more than one packet.  Tell the caller that
+	 *	We've read at least one packet.  Tell the caller that
 	 *	there's more data available, and return only one packet.
 	 */
-	if (in_buffer > (size_t) packet_len) {
-		*leftover = in_buffer - packet_len;
-
-	/*
-	 *	We now have a complete packet, clear leftover.
-	 */
-	} else {
-		*leftover = 0;
-	}
+	*leftover = in_buffer - packet_len;
 
 	*recv_time_p = fr_time();
 	thread->stats.total_requests++;