-bugfixes, code cleanup

1 files changed, 61 insertions, 73 deletions

diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index 0081bc833..9c1c3a666 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -17,9 +17,7 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
- *
  * @file gns/gnunet-service-gns_interceptor.c
  * @brief GNUnet GNS interceptor logic
  * @author Martin Schanzenbach
@@ -86,8 +84,8 @@ static struct GNUNET_TIME_Relative default_lookup_timeout;
  * @param rd the record data
  */
 static void
-reply_to_dns(void* cls, uint32_t rd_count,
-             const struct GNUNET_NAMESTORE_RecordData *rd)
+reply_to_dns (void* cls, uint32_t rd_count,
+              const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   uint32_t i;
   size_t len;
@@ -199,23 +197,25 @@ reply_to_dns(void* cls, uint32_t rd_count,
                                1024, /* FIXME magic from dns redirector */
                                &buf,
                                &len);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Built DNS response! (ret=%d,len=%d)\n", ret, len);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Built DNS response! (ret=%d,len=%d)\n",
+              ret, len);
   if (ret == GNUNET_OK)
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-               "Answering DNS request\n");
-    GNUNET_DNS_request_answer(ilh->request_handle,
-                              len,
-                              buf);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Answering DNS request\n");
+    GNUNET_DNS_request_answer (ilh->request_handle,
+                               len,
+                               buf);
 
-    GNUNET_free(buf);
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Answered DNS request\n");
+    GNUNET_free (buf);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Answered DNS request\n");
   }
   else
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-               "Error building DNS response! (ret=%d)", ret);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Error building DNS response! (ret=%d)", ret);
   }
   
   packet->num_answers = 0;
@@ -236,8 +236,8 @@ reply_to_dns(void* cls, uint32_t rd_count,
  * @param q the DNS query we received parsed from p
  */
 static void
-start_resolution_for_dns(struct GNUNET_DNS_RequestHandle *request,
-                          struct GNUNET_DNSPARSER_Packet *p,
+start_resolution_for_dns (struct GNUNET_DNS_RequestHandle *request,
+                          struct GNUNET_DNSPARSER_Packet *p,
                           struct GNUNET_DNSPARSER_Query *q)
 {
   struct InterceptLookupHandle* ilh;
@@ -245,7 +245,6 @@ start_resolution_for_dns(struct GNUNET_DNS_RequestHandle *request,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting resolution for %s (type=%d)!\n",
               q->name, q->type);
-  
   ilh = GNUNET_malloc(sizeof(struct InterceptLookupHandle));
   ilh->packet = p;
   ilh->query = q;
@@ -260,7 +259,6 @@ start_resolution_for_dns(struct GNUNET_DNS_RequestHandle *request,
 }
 
 
-
 /**
  * The DNS request handler
  * Called for every incoming DNS request.
@@ -271,17 +269,16 @@ start_resolution_for_dns(struct GNUNET_DNS_RequestHandle *request,
  * @param request udp payload of the DNS request
  */
 static void
-handle_dns_request(void *cls,
-                   struct GNUNET_DNS_RequestHandle *rh,
-                   size_t request_length,
-                   const char *request)
+handle_dns_request (void *cls,
+                    struct GNUNET_DNS_RequestHandle *rh,
+                    size_t request_length,
+                    const char *request)
 {
   struct GNUNET_DNSPARSER_Packet *p;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hijacked a DNS request...processing\n");
-  p = GNUNET_DNSPARSER_parse (request, request_length);
-  
-  if (NULL == p)
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+              "Hijacked a DNS request...processing\n");
+  if (NULL == (p = GNUNET_DNSPARSER_parse (request, request_length)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Received malformed DNS packet, leaving it untouched\n");
@@ -302,7 +299,7 @@ handle_dns_request(void *cls,
    * The way it is implemented here now is buggy and will lead to erratic
    * behaviour (if multiple queries are present).
    */
-  if (p->num_queries == 0)
+  if (0 == p->num_queries)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "No Queries in DNS packet... forwarding\n");
@@ -311,14 +308,6 @@ handle_dns_request(void *cls,
     return;
   }
 
-  if (p->num_queries > 1)
-  {
-    /* Note: We could also look for .gads */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                ">1 queriy in DNS packet... odd. We only process #1\n");
-  }
-
-  
   /**
    * Check for .gads/.zkey
    */
@@ -327,19 +316,23 @@ handle_dns_request(void *cls,
       (is_zkey_tld(p->queries[0].name) == GNUNET_YES) ||
       (strcmp(p->queries[0].name, GNUNET_GNS_TLD) == 0))
   {
-    start_resolution_for_dns(rh, p, p->queries);
-  }
-  else
-  {
-    /**
-     * This request does not concern us. Forward to real DNS.
-     */
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-               "Request for %s is forwarded to DNS\n", p->queries[0].name);
-    GNUNET_DNS_request_forward (rh);
-    GNUNET_DNSPARSER_free_packet (p);
+    if (p->num_queries > 1)
+    {
+      /* Note: We could also look for .gads */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  ">1 queriy in DNS packet... odd. We only process #1\n");
+    }
+    start_resolution_for_dns (rh, p, p->queries);
+    return;
   }
-
+  /**
+   * This request does not concern us. Forward to real DNS.
+   */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Request for %s is forwarded to DNS\n", 
+              p->queries[0].name);
+  GNUNET_DNS_request_forward (rh);
+  GNUNET_DNSPARSER_free_packet (p);
 }
 
 
@@ -352,53 +345,48 @@ handle_dns_request(void *cls,
  * @return GNUNET_OK on success
  */
 int
-gns_interceptor_init(struct GNUNET_CRYPTO_ShortHashCode zone,
-                     struct GNUNET_CRYPTO_RsaPrivateKey *key,
-                     const struct GNUNET_CONFIGURATION_Handle *c)
+gns_interceptor_init (struct GNUNET_CRYPTO_ShortHashCode zone,
+                      struct GNUNET_CRYPTO_RsaPrivateKey *key,
+                      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  unsigned long long default_lookup_timeout_secs = 0;
-
   GNUNET_log(GNUNET_ERROR_TYPE_INFO,
              "DNS hijacking enabled... connecting to service.\n");
-
   our_zone = zone;
   our_key = key;
   /**
    * Do gnunet dns init here
    */
-  dns_handle = GNUNET_DNS_connect(c,
-                                  GNUNET_DNS_FLAG_PRE_RESOLUTION,
-                                  &handle_dns_request, /* rh */
-                                  NULL); /* Closure */
-
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number(c, "gns",
-                                            "DEFAULT_LOOKUP_TIMEOUT",
-                                            &default_lookup_timeout_secs))
-  {
-    default_lookup_timeout = GNUNET_TIME_relative_multiply(
-                                                  GNUNET_TIME_UNIT_SECONDS,
-                                                  default_lookup_timeout_secs);
-  }
-
+  dns_handle = GNUNET_DNS_connect (c,
+                                   GNUNET_DNS_FLAG_PRE_RESOLUTION,
+                                   &handle_dns_request, /* rh */
+                                   NULL); /* Closure */
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (c, "gns",
+                                           "DEFAULT_LOOKUP_TIMEOUT",
+                                           &default_lookup_timeout))
+    default_lookup_timeout = GNUNET_TIME_UNIT_ZERO;
   if (NULL == dns_handle)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
              "Failed to connect to the dnsservice!\n");
     return GNUNET_SYSERR;
   }
-
   return GNUNET_YES;
 }
 
+
 /**
  * Disconnect from interceptor
  */
 void
-gns_interceptor_stop(void)
+gns_interceptor_stop ()
 {
-  if (dns_handle)
+  if (NULL != dns_handle)
+  {
     GNUNET_DNS_disconnect(dns_handle);
+    dns_handle = NULL;
+  }
 }
 
 /* end of gns_interceptor.c */