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

                        reporting dispatch failures. [RT #16315]

diff --git a/CHANGES b/CHANGES
index 92a7d3fc981caf06a9900d3e81f4a45f0f7339dc..69e45d5746442c3bf308413c0559b6451295fea7 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]
 
 2068.  [cleanup]       Lower incremental tuning message to debug 1.

diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index d02c9d6e605a849dfea2f0db53984fb3c124ae99..25e28943b0273d8c1aada931602d5c45763d417b 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.27 2005/04/29 00:22:52 marka Exp $ */
+/* $Id: tcpmsg.c,v 1.28 2006/08/10 01:38:15 marka Exp $ */
 
 /*! \file */
 
@@ -54,6 +54,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;
@@ -110,6 +111,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;
@@ -118,7 +120,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));