-fix for #688590: allow user to specify how to install nsslibs

[oweals/gnunet.git] / src / gns / gnunet-service-gns_interceptor.c

diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index f6d56d048db5834a698572670d47f90dea4797ac..0081bc833235eaedf49e8cb390b631a67869a20f 100644 (file)
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -40,13 +40,19 @@
  */
 struct InterceptLookupHandle
 {
-  /* the request handle to reply to */
+  /**
+   * the request handle to reply to 
+   */
   struct GNUNET_DNS_RequestHandle *request_handle;
   
-  /* the dns parser packet received */
+  /**
+   * the dns parser packet received 
+   */
   struct GNUNET_DNSPARSER_Packet *packet;
   
-  /* the query parsed from the packet */
+  /**
+   * the query parsed from the packet 
+   */
   struct GNUNET_DNSPARSER_Query *query;
 };
 
@@ -66,6 +72,12 @@ static struct GNUNET_CRYPTO_ShortHashCode our_zone;
  */
 static struct GNUNET_CRYPTO_RsaPrivateKey *our_key;
 
+/**
+ * Default timeout
+ */
+static struct GNUNET_TIME_Relative default_lookup_timeout;
+
+
 /**
  * Reply to dns request with the result from our lookup.
  *
@@ -77,7 +89,7 @@ static void
 reply_to_dns(void* cls, uint32_t rd_count,
              const struct GNUNET_NAMESTORE_RecordData *rd)
 {
-  int i;
+  uint32_t i;
   size_t len;
   int ret;
   char *buf;
@@ -115,12 +127,12 @@ reply_to_dns(void* cls, uint32_t rd_count,
       answer_records[i].type = rd[i].record_type;
       switch(rd[i].record_type)
       {
-       case GNUNET_GNS_RECORD_TYPE_NS:
-       case GNUNET_GNS_RECORD_TYPE_CNAME:
-       case GNUNET_GNS_RECORD_TYPE_PTR:
+       case GNUNET_GNS_RECORD_NS:
+       case GNUNET_GNS_RECORD_CNAME:
+       case GNUNET_GNS_RECORD_PTR:
          answer_records[i].data.hostname = (char*)rd[i].data;
          break;
-       case GNUNET_GNS_RECORD_TYPE_SOA:
+       case GNUNET_GNS_RECORD_SOA:
          answer_records[i].data.soa =
            (struct GNUNET_DNSPARSER_SoaRecord *)rd[i].data;
          break;
@@ -132,7 +144,8 @@ reply_to_dns(void* cls, uint32_t rd_count,
         answer_records[i].data.raw.data_len = rd[i].data_size;
         answer_records[i].data.raw.data = (char*)rd[i].data;
       }
-      answer_records[i].expiration_time = rd[i].expiration;
+      GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+      answer_records[i].expiration_time.abs_value = rd[i].expiration_time;
       answer_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
     }
     else
@@ -141,12 +154,12 @@ reply_to_dns(void* cls, uint32_t rd_count,
       additional_records[i].type = rd[i].record_type;
       switch(rd[i].record_type)
       {
-       case GNUNET_GNS_RECORD_TYPE_NS:
-       case GNUNET_GNS_RECORD_TYPE_CNAME:
-       case GNUNET_GNS_RECORD_TYPE_PTR:
+       case GNUNET_GNS_RECORD_NS:
+       case GNUNET_GNS_RECORD_CNAME:
+       case GNUNET_GNS_RECORD_PTR:
          additional_records[i].data.hostname = (char*)rd[i].data;
          break;
-       case GNUNET_GNS_RECORD_TYPE_SOA:
+       case GNUNET_GNS_RECORD_SOA:
          additional_records[i].data.soa =
            (struct GNUNET_DNSPARSER_SoaRecord *)rd[i].data;
          break;
@@ -158,7 +171,8 @@ reply_to_dns(void* cls, uint32_t rd_count,
         additional_records[i].data.raw.data_len = rd[i].data_size;
         additional_records[i].data.raw.data = (char*)rd[i].data;
       }
-      additional_records[i].expiration_time = rd[i].expiration;
+      GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+      additional_records[i].expiration_time.abs_value = rd[i].expiration_time;
       additional_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
     }
   }
@@ -238,9 +252,10 @@ start_resolution_for_dns(struct GNUNET_DNS_RequestHandle *request,
   ilh->request_handle = request;
   
   /* Start resolution in our zone */
-  gns_resolver_lookup_record(our_zone, q->type, q->name,
+  gns_resolver_lookup_record(our_zone, our_zone, q->type, q->name,
                              our_key,
-                             GNUNET_GNS_DEFAULT_LOOKUP_TIMEOUT,
+                             default_lookup_timeout,
+                             GNUNET_NO,
                              &reply_to_dns, ilh);
 }
 
@@ -298,18 +313,19 @@ handle_dns_request(void *cls,
 
   if (p->num_queries > 1)
   {
-    /* Note: We could also look for .gnunet */
+    /* 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 .gnunet/.zkey
+   * Check for .gads/.zkey
    */
   
   if ((is_gnunet_tld(p->queries[0].name) == GNUNET_YES) ||
-      (is_zkey_tld(p->queries[0].name) == GNUNET_YES))
+      (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);
   }
@@ -331,7 +347,7 @@ handle_dns_request(void *cls,
  * Initialized the interceptor
  *
  * @param zone the zone to work in
- * @param the prov key of the zone (can be null, needed for caching)
+ * @param key the prov key of the zone (can be null, needed for caching)
  * @param c the configuration
  * @return GNUNET_OK on success
  */
@@ -340,6 +356,8 @@ 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");
 
@@ -352,6 +370,17 @@ gns_interceptor_init(struct GNUNET_CRYPTO_ShortHashCode zone,
                                   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);
+  }
+
   if (NULL == dns_handle)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
@@ -362,4 +391,14 @@ gns_interceptor_init(struct GNUNET_CRYPTO_ShortHashCode zone,
   return GNUNET_YES;
 }
 
+/**
+ * Disconnect from interceptor
+ */
+void
+gns_interceptor_stop(void)
+{
+  if (dns_handle)
+    GNUNET_DNS_disconnect(dns_handle);
+}
+
 /* end of gns_interceptor.c */