-use GPLv3+ consistently

[oweals/gnunet.git] / src / gns / gnunet-gns-proxy.c

diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 4752422dd022becf6228bb6e33ae6760d004bb44..3a3678df1f5e039e25f18d37c56a0b99fc431989 100644 (file)
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     (C) 2012-2013 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
@@ -20,7 +20,7 @@
 /**
  * @author Martin Schanzenbach
  * @file src/gns/gnunet-gns-proxy.c
- * @brief HTTP(S) proxy that rewrites URIs and fakes certificats to make GADS work
+ * @brief HTTP(S) proxy that rewrites URIs and fakes certificats to make GNS work
  *        with legacy browsers
  */
 #include "platform.h"
@@ -1751,7 +1751,7 @@ process_leho_lookup (void *cls,
 
   for (i=0; i<rd_count; i++)
   {
-    if (rd[i].record_type != GNUNET_GNS_RECORD_LEHO)
+    if (rd[i].record_type != GNUNET_NAMESTORE_TYPE_LEHO)
       continue;
 
     memcpy (ctask->leho, rd[i].data, rd[i].data_size);
@@ -1849,7 +1849,7 @@ process_get_authority (void *cls,
   GNUNET_GNS_lookup_zone (gns_handle,
                           ctask->host,
                           local_gns_zone,
-                          GNUNET_GNS_RECORD_LEHO,
+                          GNUNET_NAMESTORE_TYPE_LEHO,
                           GNUNET_YES, //Only cached for performance
                           shorten_zonekey,
                           &process_leho_lookup,
@@ -2200,7 +2200,7 @@ run_httpd (struct MhdHttpList *hd)
   haveto = MHD_get_timeout (hd->daemon, &timeout);
 
   if (MHD_YES == haveto)
-    tv.rel_value = (uint64_t) timeout;
+    tv.rel_value_us = (uint64_t) timeout * 1000LL;
   else
     tv = GNUNET_TIME_UNIT_FOREVER_REL;
   GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
@@ -3219,7 +3219,7 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg)
   GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Using zone: %s!\n", &zonename);
-  GNUNET_CRYPTO_ecc_key_free(key);
+  GNUNET_free(key);
   GNUNET_free(keyfile);
   keyfile = NULL;
 
@@ -3247,7 +3247,7 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg)
     GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Using private zone: %s!\n", &zonename);
-    GNUNET_CRYPTO_ecc_key_free(key);
+    GNUNET_free(key);
     GNUNET_free(keyfile);
   }
   keyfile = NULL;
@@ -3276,7 +3276,7 @@ load_local_zone_key (const struct GNUNET_CONFIGURATION_Handle *cfg)
     GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Using shorten zone: %s!\n", &zonename);
-    GNUNET_CRYPTO_ecc_key_free(key);
+    GNUNET_free(key);
     GNUNET_free(keyfile);
   }