aboutsummaryrefslogtreecommitdiff
path: root/src/gns
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-09-27 12:39:27 +0000
committerChristian Grothoff <christian@grothoff.org>2012-09-27 12:39:27 +0000
commitc92349708a6f3f8f57d19355a6393f56cc78b3f5 (patch)
tree334b68eb5471d097e19a3991fd22114e30cdc7db /src/gns
parent6114cf9fdae76768d5bf4c4a73c8d23366a36403 (diff)
downloadgnunet-c92349708a6f3f8f57d19355a6393f56cc78b3f5.tar.gz
gnunet-c92349708a6f3f8f57d19355a6393f56cc78b3f5.zip
-fix double free, linker issue
Diffstat (limited to 'src/gns')
-rw-r--r--src/gns/Makefile.am2
-rw-r--r--src/gns/gnunet-dns2gns.c8
2 files changed, 3 insertions, 7 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 3b44e7724..193d18f8f 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -121,7 +121,7 @@ gnunet_service_gns_LDADD = \
121 -lm \ 121 -lm \
122 $(top_builddir)/src/statistics/libgnunetstatistics.la \ 122 $(top_builddir)/src/statistics/libgnunetstatistics.la \
123 $(top_builddir)/src/util/libgnunetutil.la \ 123 $(top_builddir)/src/util/libgnunetutil.la \
124 $(top_builddir)/src/gns/libgnunetgns_common.la \ 124 libgnunetgns_common.la \
125 $(top_builddir)/src/dns/libgnunetdns.la \ 125 $(top_builddir)/src/dns/libgnunetdns.la \
126 $(top_builddir)/src/dns/libgnunetdnsparser.la \ 126 $(top_builddir)/src/dns/libgnunetdnsparser.la \
127 $(top_builddir)/src/dht/libgnunetdht.la \ 127 $(top_builddir)/src/dht/libgnunetdht.la \
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 2b11bb992..de3ede6e2 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -220,6 +220,7 @@ do_timeout (void *cls,
220 GNUNET_free (request); 220 GNUNET_free (request);
221} 221}
222 222
223
223/** 224/**
224 * Iterator called on obtained result for a DNS 225 * Iterator called on obtained result for a DNS
225 * lookup 226 * lookup
@@ -468,20 +469,15 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
468 } 469 }
469 else 470 else
470 { 471 {
471 /* FIXME: do traditional *DNS* lookup; note that
472 gnunet-service-dns already has code to do this;
473 factor into library to share! Why not use GNUNET_RESOLVER here?*/
474 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 472 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
475 "Calling DNS at %s\n", dns_ip); 473 "Calling DNS at %s\n", dns_ip);
476 GNUNET_DNSPARSER_free_packet (request->packet); 474 GNUNET_DNSPARSER_free_packet (request->packet);
475 request->packet = NULL;
477 request->dns_lookup = GNUNET_DNSSTUB_resolve2 (dns_stub, 476 request->dns_lookup = GNUNET_DNSSTUB_resolve2 (dns_stub,
478 udp_msg, 477 udp_msg,
479 udp_msg_size, 478 udp_msg_size,
480 &dns_result_processor, 479 &dns_result_processor,
481 request); 480 request);
482
483
484
485 } 481 }
486 GNUNET_free (name); 482 GNUNET_free (name);
487} 483}