new API for shorten key

1 files changed, 21 insertions, 21 deletions

diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 5e2280111..8f8fbe41b 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -60,8 +60,8 @@ struct ClientShortenHandle
   /* request type */
   enum GNUNET_GNS_RecordType type;
 
-  /* optional zone private key used for lookup */
-  struct GNUNET_CRYPTO_RsaPrivateKey *zone_key;
+  /* optional zone private key used for shorten */
+  struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key;
   
   /* name to shorten */
   char* name;
@@ -100,8 +100,8 @@ struct ClientLookupHandle
   /* request type */
   enum GNUNET_GNS_RecordType type;
 
-  /* optional zone private key used for lookup */
-  struct GNUNET_CRYPTO_RsaPrivateKey *zone_key;
+  /* optional zone private key used for shorten */
+  struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key;
 
   /* the name to look up */
   char* name; //Needed?
@@ -425,13 +425,13 @@ update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 /**
- * Lookup the private key for the zone
+ * Lookup the shorten key for the zone
  *
  * @param zone the zone we want a private key for
  * @return NULL of not found else the key
  */
 struct GNUNET_CRYPTO_RsaPrivateKey*
-lookup_private_key(struct GNUNET_CRYPTO_ShortHashCode *zone)
+lookup_shorten_key(struct GNUNET_CRYPTO_ShortHashCode *short_zone)
 {
   char* keydir;
   struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename;
@@ -439,7 +439,7 @@ lookup_private_key(struct GNUNET_CRYPTO_ShortHashCode *zone)
   struct GNUNET_CRYPTO_RsaPrivateKey *key = NULL;
   
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Looking for private key\n");
+              "Looking for shorten zonekey\n");
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (GNS_cfg,
                                                             "namestore",
@@ -453,10 +453,10 @@ lookup_private_key(struct GNUNET_CRYPTO_ShortHashCode *zone)
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Zonefile directory is %s\n", keydir);
 
-  GNUNET_CRYPTO_short_hash_to_enc (zone, &zonename);
+  GNUNET_CRYPTO_short_hash_to_enc (short_zone, &zonename);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Zonefile is %s.zkey\n", &zonename);
+              "Zonefile for shorten is %s.zkey\n", &zonename);
 
   GNUNET_asprintf(&location, "%s%s%s.zkey", keydir,
                   DIR_SEPARATOR_STR, &zonename);
@@ -513,7 +513,7 @@ send_shorten_response(void* cls, const char* name)
   
   GNUNET_free(rmsg);
   GNUNET_free_non_null(csh->name);
-  GNUNET_free_non_null(csh->zone_key);
+  GNUNET_free_non_null(csh->shorten_key);
   GNUNET_free(csh);
 
 }
@@ -561,7 +561,7 @@ static void handle_shorten(void *cls,
   csh = GNUNET_malloc(sizeof(struct ClientShortenHandle));
   csh->client = client;
   csh->unique_id = sh_msg->id;
-  csh->zone_key = NULL;
+  csh->shorten_key = NULL;
   
   GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
 
@@ -600,12 +600,12 @@ static void handle_shorten(void *cls,
   /* Start shortening */
   if (GNUNET_YES == auto_import_pkey)
   {
-    if (1 == ntohl(sh_msg->use_default_zone))
-      key = zone_key;
+    if (0 == ntohl(sh_msg->use_shorten_zone))
+      key = NULL;
     else
     {
-      key = lookup_private_key(&sh_msg->zone);
-      csh->zone_key = key;
+      key = lookup_shorten_key(&sh_msg->shorten_zone);
+      csh->shorten_key = key;
     }
     gns_resolver_shorten_name(zone, zone, name, key,
                               &send_shorten_response, csh);
@@ -796,8 +796,8 @@ send_lookup_response(void* cls,
   GNUNET_free(rmsg);
   GNUNET_free(clh->name);
   
-  if (NULL != clh->zone_key)
-    GNUNET_free(clh->zone_key);
+  if (NULL != clh->shorten_key)
+    GNUNET_free(clh->shorten_key);
 
   GNUNET_free(clh);
 
@@ -855,7 +855,7 @@ handle_lookup(void *cls,
   strcpy(clh->name, name);
   clh->unique_id = sh_msg->id;
   clh->type = ntohl(sh_msg->type);
-  clh->zone_key = NULL;
+  clh->shorten_key = NULL;
   
   if (strlen (name) > MAX_DNS_NAME_LENGTH) {
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -872,12 +872,12 @@ handle_lookup(void *cls,
   
   if (GNUNET_YES == auto_import_pkey)
   {
-    if (1 == ntohl(sh_msg->use_default_zone))
+    if (1 == ntohl(sh_msg->use_shorten_zone))
       key = zone_key;
     else
     {
-      key = lookup_private_key(&zone);
-      clh->zone_key = key;
+      key = lookup_shorten_key(&sh_msg->shorten_zone);
+      clh->shorten_key = key;
     }
     
     gns_resolver_lookup_record(zone, zone, clh->type, name,