From: Mark Andrews <marka@isc.org>
Date: Thu, 10 Aug 2006 01:43:04 +0000 (+0000)
Subject: 2070.   [bug]           The remote address was not always displayed when
X-Git-Tag: v9.3.3rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e36de3b8407d61d439cef771878dc9cad4cf0a3;p=thirdparty%2Fbind9.git

2070.   [bug]           The remote address was not always displayed when
                        reporting dispatch failures. [RT #16315]
---

diff --git a/CHANGES b/CHANGES
index e0036d8dc37..fb898552a68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2070.	[bug]		The remote address was not always displayed when
+			reporting dispatch failures. [RT #16315]
+
 2069.	[bug]		Cross compiling was not working. [RT #16330]
 
 
diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index 4400a3a58f7..1a77a14c9c1 100644
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcpmsg.c,v 1.24.206.1 2004/03/06 08:13:46 marka Exp $ */
+/* $Id: tcpmsg.c,v 1.24.206.2 2006/08/10 01:43:04 marka Exp $ */
 
 #include <config.h>
 
@@ -52,6 +52,7 @@ recv_length(isc_task_t *task, isc_event_t *ev_in) {
 	INSIST(VALID_TCPMSG(tcpmsg));
 
 	dev = &tcpmsg->event;
+	tcpmsg->address = ev->address;
 
 	if (ev->result != ISC_R_SUCCESS) {
 		tcpmsg->result = ev->result;
@@ -108,6 +109,7 @@ recv_message(isc_task_t *task, isc_event_t *ev_in) {
 	INSIST(VALID_TCPMSG(tcpmsg));
 
 	dev = &tcpmsg->event;
+	tcpmsg->address = ev->address;
 
 	if (ev->result != ISC_R_SUCCESS) {
 		tcpmsg->result = ev->result;
@@ -116,7 +118,6 @@ recv_message(isc_task_t *task, isc_event_t *ev_in) {
 
 	tcpmsg->result = ISC_R_SUCCESS;
 	isc_buffer_add(&tcpmsg->buffer, ev->n);
-	tcpmsg->address = ev->address;
 
 	XDEBUG(("Received %d bytes (of %d)\n", ev->n, tcpmsg->size));