2070. [bug] The remote address was not always displayed when

                        reporting dispatch failures. [RT #16315]

diff --git a/CHANGES b/CHANGES
index adcf224175e6bfc3e352341e4e75662ddd059bd8..ef536a798ddd1a792650e5622d0af3d18e27acbd 100644 (file)
--- 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 4d456bea7ef77fe94ec7e69f81929f49c67ac491..f196f1449a53817bae80db4809554d0cd16a7f33 100644 (file)
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcpmsg.c,v 1.24.2.1 2004/03/09 06:11:08 marka Exp $ */
+/* $Id: tcpmsg.c,v 1.24.2.2 2006/08/10 01:42:33 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));