rescheduling sessions for udp

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

diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c
index 3b30d3e63a2bd1789f7ad6ff4799a66b65ab847a..e494d24a2ac2284745c69e6f50c470ce8e59bcb8 100644 (file)
--- a/src/dns/dnsstub.c
+++ b/src/dns/dnsstub.c
@@ -43,7 +43,7 @@
  */
 struct GNUNET_DNSSTUB_RequestSocket
 {
-  
+
   /**
    * UDP socket we use for this request for IPv4
    */
@@ -89,12 +89,12 @@ struct GNUNET_DNSSTUB_RequestSocket
 
 /**
  * Handle to the stub resolver.
- */ 
+ */
 struct GNUNET_DNSSTUB_Context
 {
 
   /**
-   * Array of all open sockets for DNS requests. 
+   * Array of all open sockets for DNS requests.
    */
   struct GNUNET_DNSSTUB_RequestSocket sockets[DNS_SOCKET_MAX];
 
@@ -138,7 +138,7 @@ cleanup_rs (struct GNUNET_DNSSTUB_RequestSocket *rs)
  *
  * @param af AF_INET or AF_INET6
  * @return GNUNET_OK on success
- */ 
+ */
 static struct GNUNET_NETWORK_Handle *
 open_socket (int af)
 {
@@ -168,11 +168,10 @@ open_socket (int af)
   }
   sa->sa_family = af;
   if (GNUNET_OK != GNUNET_NETWORK_socket_bind (ret,
-                                              sa, 
-                                              alen,
-                                               0))
+                                              sa,
+                                              alen))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                _("Could not bind to any port: %s\n"),
                STRERROR (errno));
     GNUNET_NETWORK_socket_close (ret);
@@ -195,7 +194,7 @@ read_response (void *cls,
 
 /**
  * Get a socket of the specified address family to send out a
- * UDP DNS request to the Internet.  
+ * UDP DNS request to the Internet.
  *
  * @param ctx the DNSSTUB context
  * @param af desired address family
@@ -208,7 +207,7 @@ get_request_socket (struct GNUNET_DNSSTUB_Context *ctx,
   struct GNUNET_DNSSTUB_RequestSocket *rs;
   struct GNUNET_NETWORK_FDSet *rset;
 
-  rs = &ctx->sockets[GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, 
+  rs = &ctx->sockets[GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
                                               DNS_SOCKET_MAX)];
   rs->timeout = GNUNET_TIME_relative_to_absolute (REQUEST_TIMEOUT);
   switch (af)
@@ -223,7 +222,7 @@ get_request_socket (struct GNUNET_DNSSTUB_Context *ctx,
     break;
   default:
     return NULL;
-  }  
+  }
   if (GNUNET_SCHEDULER_NO_TASK != rs->read_task)
   {
     GNUNET_SCHEDULER_cancel (rs->read_task);
@@ -286,7 +285,7 @@ GNUNET_DNSSTUB_resolve (struct GNUNET_DNSSTUB_Context *ctx,
   rs->addrlen = sa_len;
   rs->rc = rc;
   rs->rc_cls = rc_cls;
-  if (GNUNET_SYSERR == 
+  if (GNUNET_SYSERR ==
       GNUNET_NETWORK_socket_sendto (ret,
                                    request,
                                    request_len,
@@ -351,7 +350,7 @@ GNUNET_DNSSTUB_resolve2 (struct GNUNET_DNSSTUB_Context *ctx,
 #endif
     sa = (struct sockaddr *) &v6;
     af = AF_INET6;
-  }  
+  }
   else
   {
     GNUNET_break (0);
@@ -384,7 +383,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;
 
 }
@@ -420,13 +419,13 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs,
 #endif
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Receiving %d byte DNS reply\n",
-             len); 
+             len);
   {
     unsigned char buf[len] GNUNET_ALIGN;
 
     addrlen = sizeof (addr);
-    memset (&addr, 0, sizeof (addr));  
-    r = GNUNET_NETWORK_socket_recvfrom (dnsout, 
+    memset (&addr, 0, sizeof (addr));
+    r = GNUNET_NETWORK_socket_recvfrom (dnsout,
                                        buf, sizeof (buf),
                                        (struct sockaddr*) &addr, &addrlen);
     if (-1 == r)
@@ -437,7 +436,7 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs,
     }
     if (sizeof (struct GNUNET_TUN_DnsHeader) > r)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Received DNS response that is too small (%u bytes)"),
                  r);
       return GNUNET_NO;
@@ -446,11 +445,11 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs,
     if ( (addrlen != rs->addrlen) ||
         (0 != memcmp (&rs->addr,
                       &addr,
-                      addrlen)) ||      
-       (0 == GNUNET_TIME_absolute_get_remaining (rs->timeout).rel_value) )
+                      addrlen)) ||
+       (0 == GNUNET_TIME_absolute_get_remaining (rs->timeout).rel_value_us) )
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Request timeout or invalid sender address; ignoring reply\n"); 
+                 "Request timeout or invalid sender address; ignoring reply\n");
       return GNUNET_NO;
     }
     if (NULL != rs->rc)
@@ -458,7 +457,7 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs,
              rs,
              dns,
              r);
-  }  
+  }
   return GNUNET_OK;
 }
 
@@ -530,7 +529,7 @@ struct GNUNET_DNSSTUB_Context *
 GNUNET_DNSSTUB_start (const char *dns_ip)
 {
   struct GNUNET_DNSSTUB_Context *ctx;
-  
+
   ctx = GNUNET_malloc (sizeof (struct GNUNET_DNSSTUB_Context));
   if (NULL != dns_ip)
     ctx->dns_exit = GNUNET_strdup (dns_ip);