Merge branch 'master' into getopt

[oweals/gnunet.git] / src / dns / dnsstub.c

diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c
index e494d24a2ac2284745c69e6f50c470ce8e59bcb8..68cd55275085ed85a70f8824e7f88b4d6af79798 100644 (file)
--- a/src/dns/dnsstub.c
+++ b/src/dns/dnsstub.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file dns/dnsstub.c
@@ -24,6 +24,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_tun_lib.h"
 #include "gnunet_dnsstub_lib.h"
 
 /**
@@ -60,14 +61,14 @@ struct GNUNET_DNSSTUB_RequestSocket
   GNUNET_DNSSTUB_ResultCallback rc;
 
   /**
-   * Closure for 'rc'.
+   * Closure for @e rc.
    */
   void *rc_cls;
 
   /**
    * Task for reading from dnsout4 and dnsout6.
    */
-  GNUNET_SCHEDULER_TaskIdentifier read_task;
+  struct GNUNET_SCHEDULER_Task * read_task;
 
   /**
    * When should this request time out?
@@ -80,7 +81,7 @@ struct GNUNET_DNSSTUB_RequestSocket
   struct sockaddr_storage addr;
 
   /**
-   * Number of bytes in 'addr'.
+   * Number of bytes in @e addr.
    */
   socklen_t addrlen;
 
@@ -100,7 +101,7 @@ struct GNUNET_DNSSTUB_Context
 
   /**
    * IP address to use for the DNS server if we are a DNS exit service
-   * (for VPN via mesh); otherwise NULL.
+   * (for VPN via cadet); otherwise NULL.
    */
   char *dns_exit;
 };
@@ -108,7 +109,7 @@ struct GNUNET_DNSSTUB_Context
 
 
 /**
- * We're done with a GNUNET_DNSSTUB_RequestSocket, close it for now.
+ * We're done with a `struct GNUNET_DNSSTUB_RequestSocket`, close it for now.
  *
  * @param rs request socket to clean up
  */
@@ -125,10 +126,10 @@ cleanup_rs (struct GNUNET_DNSSTUB_RequestSocket *rs)
     GNUNET_NETWORK_socket_close (rs->dnsout6);
     rs->dnsout6 = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != rs->read_task)
+  if (NULL != rs->read_task)
   {
     GNUNET_SCHEDULER_cancel (rs->read_task);
-    rs->read_task = GNUNET_SCHEDULER_NO_TASK;
+    rs->read_task = NULL;
   }
 }
 
@@ -137,7 +138,7 @@ cleanup_rs (struct GNUNET_DNSSTUB_RequestSocket *rs)
  * Open source port for sending DNS requests
  *
  * @param af AF_INET or AF_INET6
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
  */
 static struct GNUNET_NETWORK_Handle *
 open_socket (int af)
@@ -185,11 +186,9 @@ open_socket (int af)
  * Read a DNS response from the (unhindered) UDP-Socket
  *
  * @param cls socket to read from
- * @param tc scheduler context (must be shutdown or read ready)
  */
 static void
-read_response (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc);
+read_response (void *cls);
 
 
 /**
@@ -223,10 +222,10 @@ get_request_socket (struct GNUNET_DNSSTUB_Context *ctx,
   default:
     return NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != rs->read_task)
+  if (NULL != rs->read_task)
   {
     GNUNET_SCHEDULER_cancel (rs->read_task);
-    rs->read_task = GNUNET_SCHEDULER_NO_TASK;
+    rs->read_task = NULL;
   }
   if ( (NULL == rs->dnsout4) &&
        (NULL == rs->dnsout6) )
@@ -279,7 +278,7 @@ GNUNET_DNSSTUB_resolve (struct GNUNET_DNSSTUB_Context *ctx,
   else
     ret = rs->dnsout6;
   GNUNET_assert (NULL != ret);
-  memcpy (&rs->addr,
+  GNUNET_memcpy (&rs->addr,
          sa,
          sa_len);
   rs->addrlen = sa_len;
@@ -369,7 +368,7 @@ GNUNET_DNSSTUB_resolve2 (struct GNUNET_DNSSTUB_Context *ctx,
                ctx->dns_exit);
     return NULL;
   }
-  memcpy (&rs->addr,
+  GNUNET_memcpy (&rs->addr,
          sa,
          salen);
   rs->addrlen = salen;
@@ -383,9 +382,7 @@ GNUNET_DNSSTUB_resolve2 (struct GNUNET_DNSSTUB_Context *ctx,
                _("Failed to send DNS request to %s\n"),
                GNUNET_a2s (sa, salen));
   rs->timeout = GNUNET_TIME_relative_to_absolute (REQUEST_TIMEOUT);
-
   return rs;
-
 }
 
 
@@ -395,7 +392,7 @@ GNUNET_DNSSTUB_resolve2 (struct GNUNET_DNSSTUB_Context *ctx,
  *
  * @param rs request socket with callback details
  * @param dnsout socket to read from
- * @return GNUNET_OK on success, GNUNET_NO on drop, GNUNET_SYSERR on IO-errors (closed socket)
+ * @return #GNUNET_OK on success, #GNUNET_NO on drop, #GNUNET_SYSERR on IO-errors (closed socket)
  */
 static int
 do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs,
@@ -438,14 +435,15 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Received DNS response that is too small (%u bytes)"),
-                 r);
+                 (unsigned int) r);
       return GNUNET_NO;
     }
     dns = (struct GNUNET_TUN_DnsHeader *) buf;
     if ( (addrlen != rs->addrlen) ||
-        (0 != memcmp (&rs->addr,
-                      &addr,
-                      addrlen)) ||
+        (GNUNET_YES !=
+          GNUNET_TUN_sockaddr_cmp ((struct sockaddr *) &rs->addr,
+                                   (struct sockaddr *) &addr,
+                                   GNUNET_YES)) ||
        (0 == GNUNET_TIME_absolute_get_remaining (rs->timeout).rel_value_us) )
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -466,19 +464,19 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs,
  * Read a DNS response from the (unhindered) UDP-Socket
  *
  * @param cls socket to read from
- * @param tc scheduler context (must be shutdown or read ready)
  */
 static void
-read_response (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+read_response (void *cls)
 {
   struct GNUNET_DNSSTUB_RequestSocket *rs = cls;
   struct GNUNET_NETWORK_FDSet *rset;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
-  rs->read_task = GNUNET_SCHEDULER_NO_TASK;
+  rs->read_task = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
   {
-    /* timeout or shutdown */
+    /* timeout */
     cleanup_rs (rs);
     return;
   }
@@ -530,7 +528,7 @@ GNUNET_DNSSTUB_start (const char *dns_ip)
 {
   struct GNUNET_DNSSTUB_Context *ctx;
 
-  ctx = GNUNET_malloc (sizeof (struct GNUNET_DNSSTUB_Context));
+  ctx = GNUNET_new (struct GNUNET_DNSSTUB_Context);
   if (NULL != dns_ip)
     ctx->dns_exit = GNUNET_strdup (dns_ip);
   return ctx;