From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 17 Aug 2015 08:47:29 +0000 (+0200)
Subject: Set packet->proto
X-Git-Tag: release_3_0_10~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24d668df6a68d910a58be3a3e182d927c9b10495;p=thirdparty%2Ffreeradius-server.git

Set packet->proto
---

diff --git a/src/main/process.c b/src/main/process.c
index f9750adc769..aa90bd42334 100644
--- a/src/main/process.c
+++ b/src/main/process.c
@@ -1558,6 +1558,10 @@ int request_receive(TALLOC_CTX *ctx, rad_listen_t *listener, RADIUS_PACKET *pack
 	{
 		sock = listener->data;
 		sock->last_packet = now.tv_sec;
+
+#ifdef WITH_TCP
+		packet->proto = sock->proto;
+#endif
 	}
 
 	/*
@@ -2114,7 +2118,6 @@ static void remove_from_proxy_hash_nl(REQUEST *request, bool yank)
 	 *	the mutex.  This guarantees that when another thread
 	 *	grabs the mutex, the "not in hash" flag is correct.
 	 */
-	RDEBUG3("proxy: request is no longer in proxy hash");
 }
 
 static void remove_from_proxy_hash(REQUEST *request)
@@ -3473,6 +3476,9 @@ static void ping_home_server(void *ctx)
 			    home->num_sent_pings);
 	}
 
+#ifdef WITH_TCP
+	request->proxy->proto = home->proto;
+#endif
 	request->proxy->src_ipaddr = home->src_ipaddr;
 	request->proxy->dst_ipaddr = home->ipaddr;
 	request->proxy->dst_port = home->port;