-remove test functions

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

diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index af5468ebab8bdcb2f858f993855b8cffdbbac5d4..934ebd2c16d91e38986dfd06c3e98fb37ef4d10f 100644 (file)
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -266,8 +266,8 @@ process_authority_dht_result(void* cls,
   {
     struct GNUNET_NAMESTORE_RecordData rd[num_records];
     
-    rd_data += strlen(name) + sizeof(struct GNSNameRecordBlock);
-    rd_size = size - strlen(name) - sizeof(struct GNSNameRecordBlock);
+    rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+    rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
   
     if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
                                                                rd_data,
@@ -427,8 +427,8 @@ process_name_dht_result(void* cls,
   {
     struct GNUNET_NAMESTORE_RecordData rd[num_records];
 
-    rd_data += strlen(name) + sizeof(struct GNSNameRecordBlock);
-    rd_size = size - strlen(name) - sizeof(struct GNSNameRecordBlock);
+    rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+    rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
   
     if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
                                                                rd_data,
@@ -504,6 +504,9 @@ resolve_name_dht(struct GNUNET_GNS_ResolverHandle *rh, const char* name)
   GNUNET_HashCode lookup_key;
   struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "A\n");
+
   GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
   GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
   GNUNET_CRYPTO_hash_to_enc (&lookup_key, &lookup_key_string);
@@ -606,30 +609,29 @@ process_authority_lookup(void* cls,
     if (rd[i].record_type != GNUNET_GNS_RECORD_PKEY)
       continue;
     
-      if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
-          == 0)
+    if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
+         == 0)
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "This pkey is expired.\n");
+      if (remaining_time.rel_value == 0)
       {
-        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "This pkey is expired.\n");
-        if (remaining_time.rel_value == 0)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                     "This dht entry is expired. Refreshing\n");
-          resolve_authority_dht(rh);
-        }
-
-        continue;
+        GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                   "This dht entry is expired. Refreshing\n");
+        resolve_authority_dht(rh);
       }
 
-      /**
-       * Resolve rest of query with new authority
-       */
-      GNUNET_assert(rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
-      GNUNET_CRYPTO_hash(rd[i].data,
-                         sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                         &rh->authority);
-      resolve_name(rh);
-      return;
-      
+      continue;
+    }
+
+    /**
+     * Resolve rest of query with new authority
+     */
+    GNUNET_assert(rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
+    GNUNET_CRYPTO_hash(rd[i].data,
+                       sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                       &rh->authority);
+    resolve_name(rh);
+    return;
   }
     
   /**
@@ -794,7 +796,7 @@ process_authoritative_result(void* cls,
       {
         GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
                    "trying dht...\n");
-        resolve_name_dht(rh, name);
+        resolve_name_dht(rh, rh->name);
         return;
       }
       else
@@ -1059,36 +1061,6 @@ handle_dns_request(void *cls,
 
 }
 
-/**
- * test function that stores some data in the namestore
- * This will also be replaced by a test progrm that
- * directl interfaces with the namestore
- */
-static void
-put_some_records(void)
-{
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Populating namestore\n");
-  /* put an A record into namestore FIXME use gnunet.org */
-  char* ipB = "5.6.7.8";
-
-  struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
-  struct GNUNET_NAMESTORE_RecordData rdb_web;
-
-  GNUNET_assert(1 == inet_pton (AF_INET, ipB, web));
-
-  rdb_web.data_size = sizeof(struct in_addr);
-  rdb_web.data = web;
-  rdb_web.record_type = GNUNET_DNSPARSER_TYPE_A;
-  rdb_web.expiration = GNUNET_TIME_absolute_get_forever ();
-  
-  GNUNET_NAMESTORE_record_create (namestore_handle,
-                                  zone_key,
-                                  "www",
-                                  &rdb_web,
-                                  NULL,
-                                  NULL);
-}
-
 /**
  * Method called periodicattluy that triggers
  * iteration over root zone
@@ -1177,12 +1149,17 @@ put_gns_record(void *cls,
   nrb_data = (char*)&nrb[1];
   nrb_data += strlen(name) + 1;
 
+  rd_payload_length += sizeof(struct GNSNameRecordBlock) +
+    strlen(name) + 1;
+
   if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
                                                 rd,
                                                 rd_payload_length,
                                                 nrb_data))
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Recor serialization failed!\n");
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
+    return;
+    //FIXME what to do
   }
 
 
@@ -1218,40 +1195,6 @@ put_gns_record(void *cls,
 
 }
 
-/**
- * Puts a single trusted entity into the
- * namestore. Will be replaced in a testcase
- * that directly interacts with a persistent
- * namestore.
- *
- * @param name name of entity
- * @param keyfile keyfile
- */
-static void
-put_trusted(char* name, char* keyfile)
-{
-  struct GNUNET_NAMESTORE_RecordData rd;
-  struct GNUNET_CRYPTO_RsaPrivateKey *key;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey;
-  pkey = GNUNET_malloc(sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
-
-  key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
-  GNUNET_CRYPTO_rsa_key_get_public (key, pkey);
-  rd.data = pkey;
-  rd.expiration = GNUNET_TIME_absolute_get_forever ();
-  rd.data_size = sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded);
-  rd.record_type = GNUNET_GNS_RECORD_PKEY;
-
-  GNUNET_NAMESTORE_record_create (namestore_handle,
-                                  zone_key,
-                                  name,
-                                  &rd,
-                                  NULL,
-                                  NULL);
-}
-
-
-
 /**
  * Periodically iterate over our zone and store everything in dht
  *
@@ -1298,7 +1241,6 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
 
   char* keyfile;
-  char* trusted_entities;
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "gns",