-again moving towards DNS API sanity

2 files changed, 8 insertions, 11 deletions

diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c
index 68b703eba..7a1577365 100644
--- a/src/dns/dns_api.c
+++ b/src/dns/dns_api.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file vpn/gnunet-daemon-vpn-dns.c
+ * @file dns/dns_api.c
  * @brief
  * @author Philipp Toelke
  */
@@ -56,7 +56,7 @@ struct GNUNET_DNS_Handle
 
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-  GNUNET_SCHEDULER_Task process_answer_cb;
+  GNUNET_DNS_ResponseCallback process_answer_cb;
   
   void *process_answer_cb_cls;
 };
@@ -177,11 +177,8 @@ dns_answer_handler (void *cls,
 #endif
     return;
   }
-  void *pkt = GNUNET_malloc (ntohs (msg->size));
-
-  memcpy (pkt, msg, ntohs (msg->size));
-
-  GNUNET_SCHEDULER_add_now (h->process_answer_cb, pkt);
+  h->process_answer_cb (h->process_answer_cb_cls,
+                        (const struct answer_packet*) msg);
   GNUNET_CLIENT_receive (h->dns_connection, &dns_answer_handler, h,
                          GNUNET_TIME_UNIT_FOREVER_REL);
 }
@@ -192,7 +189,7 @@ dns_answer_handler (void *cls,
  */
 struct GNUNET_DNS_Handle *
 GNUNET_DNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    GNUNET_SCHEDULER_Task cb,
+                    GNUNET_DNS_ResponseCallback cb,
                     void *cb_cls)
 {
   struct GNUNET_DNS_Handle *h;
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 55c87b9c6..7d24e630f 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -386,7 +386,7 @@ mesh_send (void *cls, size_t size, void *buf)
 }
 
 
-void
+static void
 mesh_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
               const struct GNUNET_ATS_Information *atsi GNUNET_UNUSED)
 {
@@ -1212,7 +1212,7 @@ open_port ()
   return GNUNET_YES;
 }
 
-void
+static void
 handle_response (struct dns_pkt *dns, struct sockaddr *addr, socklen_t addrlen,
                  int r);
 
@@ -1320,7 +1320,7 @@ read_response (void *cls GNUNET_UNUSED,
                                  &read_response, NULL);
 }
 
-void
+static void
 handle_response (struct dns_pkt *dns, struct sockaddr *addr, socklen_t addrlen,
                  int r)
 {