From: Philipp Tölke <toelke@in.tum.de>
Date: Wed, 26 Oct 2011 08:55:51 +0000 (+0000)
Subject: bug
X-Git-Tag: initial-import-from-subversion-38251~16241
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c86d92fd5c9d82de31534475821f29c29a968dd;p=oweals%2Fgnunet.git

bug
---

diff --git a/src/vpn/gnunet-daemon-vpn-helper.c b/src/vpn/gnunet-daemon-vpn-helper.c
index 84f1105f6..c3cc4bc91 100644
--- a/src/vpn/gnunet-daemon-vpn-helper.c
+++ b/src/vpn/gnunet-daemon-vpn-helper.c
@@ -278,7 +278,10 @@ helper_write (void *cls
       buf = pkt;
     }
   else
-    GNUNET_assert (0);
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Wrong addrlen = %d\n", ans->pkt.addrlen);
+      GNUNET_assert(0);
+    }
 
   GNUNET_CONTAINER_DLL_remove (answer_proc_head, answer_proc_tail, ans);
   GNUNET_free (ans);
diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index 38ce3c147..fa8054452 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -704,6 +704,7 @@ receive_dht (void *cls, struct GNUNET_TIME_Absolute exp
 
   memcpy(answer->pkt.from, query_states[id].remote_ip, query_states[id].addrlen);
   memcpy(answer->pkt.to, query_states[id].local_ip, query_states[id].addrlen);
+  answer->pkt.addrlen = query_states[id].addrlen;
 
   answer->pkt.dst_port = query_states[id].local_port;
 
@@ -1291,6 +1292,7 @@ handle_response(struct dns_pkt* dns, struct sockaddr *addr, socklen_t addrlen, i
               GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "addrlen = %d\n", addrlen);
               GNUNET_assert(0);
             }
+          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "sending answer with addrlen = %d\n", addrlen);
           answer->pkt.dst_port = query_states[dns->s.id].local_port;
           memcpy (answer->pkt.data, dns, r);