-core review

1 files changed, 81 insertions, 130 deletions

diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 0524b3def..f06bf0d7b 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -58,7 +58,7 @@ static char *auth_name;
 /**
  * raw output
  */
-static int raw = 0;
+static int raw;
 
 static enum GNUNET_GNS_RecordType rtype;
 
@@ -71,8 +71,6 @@ static struct GNUNET_GNS_ShortenRequest *shorten_request;
 /* Handle to get authority request */
 static struct GNUNET_GNS_GetAuthRequest *getauth_request;
 
-/* shutdown task */
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
 
 /**
  * Task run on shutdown.  Cleans up everything.
@@ -99,61 +97,61 @@ do_shutdown (void *cls,
 
 
 static void
-process_shorten_result(void* cls, const char* nshort)
+process_shorten_result (void* cls, const char* nshort)
 {
+  const char *original_name = cls;
+
   shorten_request = NULL;
   if (raw)
     printf("%s", nshort);
   else
-    printf("%s shortened to %s\n", (char*) cls, nshort);
-  GNUNET_SCHEDULER_cancel (shutdown_task);
-  GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    printf("%s shortened to %s\n", original_name, nshort);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
+
 static void
-process_lookup_result(void* cls, uint32_t rd_count,
-                      const struct GNUNET_NAMESTORE_RecordData *rd)
+process_lookup_result (void* cls, uint32_t rd_count,
+                       const struct GNUNET_NAMESTORE_RecordData *rd)
 {
-  int i;
-  char* name = (char*) cls;
+  const char* name = cls;
+  uint32_t i;
   const char* typename;
   char* string_val;
-  lookup_request = NULL;
-  
-  if (!raw) {
+
+  lookup_request = NULL; 
+  if (!raw) 
+  {
     if (rd_count == 0)
       printf("No results.\n");
     else
       printf("%s:\n", name);
   }
-
-
-
   for (i=0; i<rd_count; i++)
   {
     typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
-    string_val = GNUNET_NAMESTORE_value_to_string(rd[i].record_type,
-                                                  rd[i].data,
-                                                  rd[i].data_size);
+    string_val = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+                                                   rd[i].data,
+                                                   rd[i].data_size);
     if (raw)
-      printf("%s\n", string_val);
+      printf ("%s\n", string_val);
     else
-      printf("Got %s record: %s\n", typename, string_val);
-
+      printf ("Got `%s' record: %s\n", typename, string_val);
+    GNUNET_free_non_null (string_val);
   }
-  GNUNET_SCHEDULER_cancel (shutdown_task);
-  GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
+
 static void
-process_auth_result(void* cls, const char* auth)
+process_auth_result (void* cls, const char* auth)
 {
   getauth_request = NULL;
   printf ("%s\n", auth);
-  GNUNET_SCHEDULER_cancel (shutdown_task);
-  GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
+
 /**
  * Main function that will be run.
  *
@@ -177,124 +175,84 @@ run (void *cls, char *const *args, const char *cfgfile,
   struct GNUNET_CRYPTO_ShortHashCode *private_zone = NULL;
   struct GNUNET_CRYPTO_ShortHashCode *shorten_zone = NULL;
 
-  shorten_request = NULL;
-  lookup_request = NULL;
-  getauth_request = NULL;
-
+  gns = GNUNET_GNS_connect (cfg);
+  if (NULL == gns)
+  {
+    fprintf (stderr,
+             _("Failed to connect to GNS\n"));
+    return;
+  }
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
                                                            "ZONEKEY", &keyfile))
   {
-    if (!raw)
+    if (! raw)
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "No private key for root zone found, using default!\n");
-    zone = NULL;
   }
   else
   {
-    if (GNUNET_YES == GNUNET_DISK_file_test (keyfile))
-    {
-      key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
-      GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
-      GNUNET_CRYPTO_short_hash(&pkey,
-                         sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                         &user_zone);
-      zone = &user_zone;
-      GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
-      if (!raw)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Using zone: %s!\n", &zonename);
-      GNUNET_CRYPTO_rsa_key_free(key);
-    }
+    key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+    GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+    GNUNET_CRYPTO_short_hash (&pkey,
+                              sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                              &user_zone);
+    zone = &user_zone;
+    GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
+    if (!raw)
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Using zone: %s!\n", &zonename);
+    GNUNET_CRYPTO_rsa_key_free (key);  
     GNUNET_free(keyfile);
   }
   
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
-                                                   "SHORTEN_ZONEKEY", &keyfile))
+                                                            "SHORTEN_ZONEKEY", &keyfile))
   {
-    if (!raw)
+    if (! raw)
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "No shorten key found!\n");
-    shorten_key = NULL;
   }
   else
   {
-    if (GNUNET_YES == GNUNET_DISK_file_test (keyfile))
-    {
-      shorten_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
-      GNUNET_CRYPTO_rsa_key_get_public (shorten_key, &pkey);
-      shorten_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
-      GNUNET_CRYPTO_short_hash(&pkey,
-                         sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                         shorten_zone);
-      GNUNET_CRYPTO_short_hash_to_enc (shorten_zone, &zonename);
-      if (!raw)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Using shorten zone: %s!\n", &zonename);
-
-    }
-    GNUNET_free(keyfile);
+    shorten_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+    GNUNET_CRYPTO_rsa_key_get_public (shorten_key, &pkey);
+    shorten_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+    GNUNET_CRYPTO_short_hash(&pkey,
+                             sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                             shorten_zone);
+    GNUNET_CRYPTO_short_hash_to_enc (shorten_zone, &zonename);
+    if (! raw)
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Using shorten zone: %s!\n", &zonename);
+    GNUNET_free (keyfile);
   }
-  
-  
+    
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
                                                             "PRIVATE_ZONEKEY", &keyfile))
   {
-    if (!raw)
+    if (! raw)
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "No private zone key file name specified in configuration!\n");
-    private_key = NULL;
   }
   else
   {
-    if (GNUNET_YES == GNUNET_DISK_file_test (keyfile))
-    {
-      private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
-      GNUNET_CRYPTO_rsa_key_get_public (private_key, &pkey);
-      private_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
-      GNUNET_CRYPTO_short_hash(&pkey,
-                         sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                         private_zone);
-      GNUNET_CRYPTO_short_hash_to_enc (private_zone, &zonename);
-      if (!raw)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Using private zone: %s!\n", &zonename);
-    }
-    else
-    {
-      /* FIXME: shouldn't we just create the private key in this case? */
-      if (!raw)
-        fprintf (stderr,
-                 _("Key file `%s' for private zone does not exist!\n"),
-                 keyfile);
-
-    }
-    GNUNET_free(keyfile);
-    if (NULL != private_key)
-    {
-      GNUNET_CRYPTO_rsa_key_free (private_key);
-      private_key = NULL;
-    }
+    private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+    GNUNET_CRYPTO_rsa_key_get_public (private_key, &pkey);
+    private_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+    GNUNET_CRYPTO_short_hash(&pkey,
+                             sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                             private_zone);
+    GNUNET_CRYPTO_short_hash_to_enc (private_zone, &zonename);
+    if (! raw)
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Using private zone: %s!\n", &zonename);
   }
   
-  
-  gns = GNUNET_GNS_connect (cfg);
   if (NULL != lookup_type)
     rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
   else
     rtype = GNUNET_GNS_RECORD_A;
 
-  if (NULL == gns)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to connect to GNS\n"));
-    if (NULL != shorten_key)
-    {
-      GNUNET_CRYPTO_rsa_key_free (shorten_key);
-      shorten_key = NULL;
-    }
-    return;
-  }
-  
   if ((NULL != shorten_name) && (NULL != shorten_zone) && (NULL != private_zone))
   {
     shorten_request = GNUNET_GNS_shorten_zone (gns, shorten_name,
@@ -304,31 +262,25 @@ run (void *cls, char *const *args, const char *cfgfile,
                              &process_shorten_result,
                              shorten_name);
   }
-
   if (NULL != lookup_name)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Lookup\n");
     lookup_request = GNUNET_GNS_lookup_zone (gns, lookup_name,
-                            zone,
-                            rtype,
-                            GNUNET_NO, //Use DHT
-                            shorten_key,
-                            &process_lookup_result, lookup_name);
+                                             zone,
+                                             rtype,
+                                             GNUNET_NO, /* Use DHT */
+                                             shorten_key,
+                                             &process_lookup_result, lookup_name);
   }
-
   if (NULL != auth_name)
   {
-    getauth_request = GNUNET_GNS_get_authority(gns, auth_name,
-                                               &process_auth_result, auth_name);
+    getauth_request = GNUNET_GNS_get_authority (gns, auth_name,
+                                                &process_auth_result, auth_name);
   }
 
   if (NULL != shorten_key)
     GNUNET_CRYPTO_rsa_key_free (shorten_key);
-
   if (NULL != shorten_zone)
     GNUNET_free (shorten_zone);
-
   if (NULL != private_zone)
     GNUNET_free (private_zone);
   
@@ -336,15 +288,14 @@ run (void *cls, char *const *args, const char *cfgfile,
       (NULL == shorten_name) &&
       (NULL == lookup_name))
   {
-    if (!raw)
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 "Please specify lookup, shorten or authority operation!\n");
+    fprintf (stderr,
+             _("Please specify lookup, shorten or authority operation!\n"));
     GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     return;
   }
 
-  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                &do_shutdown, NULL);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                &do_shutdown, NULL);
 }