fix

[oweals/gnunet.git] / src / gns / test_gns_simple_get_authority.c

diff --git a/src/gns/test_gns_simple_get_authority.c b/src/gns/test_gns_simple_get_authority.c
index f274d2cd42d369582824fae894211c372d92ee19..6a8184efdba12a977a182b41f977616f986d1fbb 100644 (file)
--- a/src/gns/test_gns_simple_get_authority.c
+++ b/src/gns/test_gns_simple_get_authority.c
@@ -99,6 +99,10 @@ process_auth_result(void* cls, const char* aname)
 {
   GNUNET_GNS_disconnect(gns_handle);
 
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "disconnecting from namestore\n");
+  GNUNET_NAMESTORE_disconnect (namestore_handle);
   ok = 0;
 
   if (aname == NULL)
@@ -136,10 +140,6 @@ commence_testing (void *cls, int32_t success, const char *emsg)
 {
   
   
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "disconnecting from namestore\n");
-  GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES);
   
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "connecting to gns\n");
@@ -236,7 +236,7 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
   struct GNUNET_NAMESTORE_RecordData rd;
   char* ip = TEST_IP;
   struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
-  rd.expiration = GNUNET_TIME_absolute_get_forever ();
+  rd.expiration_time = UINT64_MAX;
   GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
   
   GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
@@ -244,6 +244,7 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_GNS_RECORD_PKEY;
+  rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
   
   /* put bob into our zone */
   GNUNET_NAMESTORE_record_create (namestore_handle,
@@ -256,13 +257,13 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
   /* put alice into bobs zone */
   GNUNET_CRYPTO_short_hash(&alice_pkey, sizeof(alice_pkey), &alice_hash);
   rd.data = &alice_hash;
-  sig = GNUNET_NAMESTORE_create_signature(bob_key, GNUNET_TIME_absolute_get_forever(), TEST_AUTHORITY_ALICE,
+  sig = GNUNET_NAMESTORE_create_signature(bob_key, GNUNET_TIME_UNIT_FOREVER_ABS, TEST_AUTHORITY_ALICE,
                                           &rd, 1);
 
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
                                TEST_AUTHORITY_ALICE,
-                               GNUNET_TIME_absolute_get_forever(),
+                               GNUNET_TIME_UNIT_FOREVER_ABS,
                                1,
                                &rd,
                                sig,
@@ -274,13 +275,13 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
   rd.data_size = sizeof(struct in_addr);
   rd.data = web;
   rd.record_type = GNUNET_DNSPARSER_TYPE_A;
-  sig = GNUNET_NAMESTORE_create_signature(alice_key,GNUNET_TIME_absolute_get_forever(),  TEST_RECORD_NAME,
+  sig = GNUNET_NAMESTORE_create_signature(alice_key,GNUNET_TIME_UNIT_FOREVER_ABS,  TEST_RECORD_NAME,
                                           &rd, 1);
 
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &alice_pkey,
                                TEST_RECORD_NAME,
-                               GNUNET_TIME_absolute_get_forever(),
+                               GNUNET_TIME_UNIT_FOREVER_ABS,
                                1,
                                &rd,
                                sig,
@@ -292,13 +293,13 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
   rd.record_type = GNUNET_GNS_RECORD_PSEU;
   GNUNET_free(sig);
 
-  sig = GNUNET_NAMESTORE_create_signature(alice_key,GNUNET_TIME_absolute_get_forever(),  "",
+  sig = GNUNET_NAMESTORE_create_signature(alice_key,GNUNET_TIME_UNIT_FOREVER_ABS,  "",
                                           &rd, 1);
 
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &alice_pkey,
                                "",
-                               GNUNET_TIME_absolute_get_forever(),
+                               GNUNET_TIME_UNIT_FOREVER_ABS,
                                1,
                                &rd,
                                sig,
@@ -306,7 +307,9 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
                                NULL);
 
   GNUNET_free(sig);
-
+  GNUNET_CRYPTO_rsa_key_free (alice_key);
+  GNUNET_CRYPTO_rsa_key_free (bob_key);
+  GNUNET_CRYPTO_rsa_key_free (our_key);
 }
 
 static void