diff options
author | Philipp Tölke <toelke@in.tum.de> | 2011-10-26 08:55:51 +0000 |
---|---|---|
committer | Philipp Tölke <toelke@in.tum.de> | 2011-10-26 08:55:51 +0000 |
commit | 9c86d92fd5c9d82de31534475821f29c29a968dd (patch) | |
tree | eacf3a9b0e99f0a9984bb900c34381d1bb2736a6 /src/vpn | |
parent | 3c6ad720d7a3be6901f747c46a5700b9380c5993 (diff) | |
download | gnunet-9c86d92fd5c9d82de31534475821f29c29a968dd.tar.gz gnunet-9c86d92fd5c9d82de31534475821f29c29a968dd.zip |
bug
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-daemon-vpn-helper.c | 5 | ||||
-rw-r--r-- | src/vpn/gnunet-service-dns.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 | |||
278 | buf = pkt; | 278 | buf = pkt; |
279 | } | 279 | } |
280 | else | 280 | else |
281 | GNUNET_assert (0); | 281 | { |
282 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Wrong addrlen = %d\n", ans->pkt.addrlen); | ||
283 | GNUNET_assert(0); | ||
284 | } | ||
282 | 285 | ||
283 | GNUNET_CONTAINER_DLL_remove (answer_proc_head, answer_proc_tail, ans); | 286 | GNUNET_CONTAINER_DLL_remove (answer_proc_head, answer_proc_tail, ans); |
284 | GNUNET_free (ans); | 287 | 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 | |||
704 | 704 | ||
705 | memcpy(answer->pkt.from, query_states[id].remote_ip, query_states[id].addrlen); | 705 | memcpy(answer->pkt.from, query_states[id].remote_ip, query_states[id].addrlen); |
706 | memcpy(answer->pkt.to, query_states[id].local_ip, query_states[id].addrlen); | 706 | memcpy(answer->pkt.to, query_states[id].local_ip, query_states[id].addrlen); |
707 | answer->pkt.addrlen = query_states[id].addrlen; | ||
707 | 708 | ||
708 | answer->pkt.dst_port = query_states[id].local_port; | 709 | answer->pkt.dst_port = query_states[id].local_port; |
709 | 710 | ||
@@ -1291,6 +1292,7 @@ handle_response(struct dns_pkt* dns, struct sockaddr *addr, socklen_t addrlen, i | |||
1291 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "addrlen = %d\n", addrlen); | 1292 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "addrlen = %d\n", addrlen); |
1292 | GNUNET_assert(0); | 1293 | GNUNET_assert(0); |
1293 | } | 1294 | } |
1295 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "sending answer with addrlen = %d\n", addrlen); | ||
1294 | answer->pkt.dst_port = query_states[dns->s.id].local_port; | 1296 | answer->pkt.dst_port = query_states[dns->s.id].local_port; |
1295 | memcpy (answer->pkt.data, dns, r); | 1297 | memcpy (answer->pkt.data, dns, r); |
1296 | 1298 | ||