aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2012-09-27 12:39:27 +0000
committergrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2012-09-27 12:39:27 +0000
commit22b2a9d78b2d240d83a3af48ec9b1bf3fa4cdafc (patch)
tree334b68eb5471d097e19a3991fd22114e30cdc7db
parentd352a698993c0798f0710f8cd4d51f129ec9d5e7 (diff)
-fix double free, linker issue
git-svn-id: https://gnunet.org/svn/gnunet@24042 140774ce-b5e7-0310-ab8b-a85725594a96
-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 3b44e77246..193d18f8f0 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -121,7 +121,7 @@ gnunet_service_gns_LDADD = \
-lm \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/gns/libgnunetgns_common.la \
+ libgnunetgns_common.la \
$(top_builddir)/src/dns/libgnunetdns.la \
$(top_builddir)/src/dns/libgnunetdnsparser.la \
$(top_builddir)/src/dht/libgnunetdht.la \
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 2b11bb992f..de3ede6e23 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -220,6 +220,7 @@ do_timeout (void *cls,
GNUNET_free (request);
}
+
/**
* Iterator called on obtained result for a DNS
* lookup
@@ -468,20 +469,15 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
}
else
{
- /* FIXME: do traditional *DNS* lookup; note that
- gnunet-service-dns already has code to do this;
- factor into library to share! Why not use GNUNET_RESOLVER here?*/
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Calling DNS at %s\n", dns_ip);
GNUNET_DNSPARSER_free_packet (request->packet);
+ request->packet = NULL;
request->dns_lookup = GNUNET_DNSSTUB_resolve2 (dns_stub,
udp_msg,
udp_msg_size,
&dns_result_processor,
request);
-
-
-
}
GNUNET_free (name);
}