From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 8 Aug 2015 17:00:23 +0000 (+0200)
Subject: Initialize packet->proto as required
X-Git-Tag: release_3_0_10~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a730e4957333c91abdf1dd074a3aa634571be98c;p=thirdparty%2Ffreeradius-server.git

Initialize packet->proto as required
---

diff --git a/src/lib/packet.c b/src/lib/packet.c
index 4fc5763962d..a8e506eb804 100644
--- a/src/lib/packet.c
+++ b/src/lib/packet.c
@@ -117,6 +117,9 @@ void fr_request_from_reply(RADIUS_PACKET *request,
 {
 	request->sockfd = reply->sockfd;
 	request->id = reply->id;
+#ifdef WITH_TCP
+	request->proto = reply->proto;
+#endif
 	request->src_port = reply->dst_port;
 	request->dst_port = reply->src_port;
 	request->src_ipaddr = reply->dst_ipaddr;
@@ -554,6 +557,9 @@ RADIUS_PACKET **fr_packet_list_find_byreply(fr_packet_list_t *pl,
 	my_request.dst_ipaddr = reply->src_ipaddr;
 	my_request.dst_port = reply->src_port;
 
+#ifdef WITH_TCP
+	my_request.proto = reply->proto;
+#endif
 	request = &my_request;
 
 	return rbtree_finddata(pl->tree, &request);
@@ -927,6 +933,9 @@ RADIUS_PACKET *fr_packet_list_recv(fr_packet_list_t *pl, fd_set *set)
 		 */
 
 		pl->last_recv = start;
+#ifdef WITH_TCP
+		packet->proto = pl->sockets[start].proto;
+#endif
 		return packet;
 	} while (start != pl->last_recv);