[GNUnet-SVN] r21894 - gnunet/src/gns

[gnunet]

Author: schanzen
Date: 2012-06-11 18:07:12 +0200 (Mon, 11 Jun 2012)
New Revision: 21894

Modified:
   gnunet/src/gns/gnunet-service-gns_resolver.c
   gnunet/src/gns/test_gns_dht_delegated_lookup.c
   gnunet/src/gns/test_gns_dht_threepeer.c
   gnunet/src/gns/test_gns_max_queries.c
   gnunet/src/gns/test_gns_pseu_shorten.c
   gnunet/src/gns/test_gns_simple_delegated_lookup.c
   gnunet/src/gns/test_gns_simple_lookup.c
   gnunet/src/gns/test_gns_simple_mx_lookup.c
   gnunet/src/gns/test_gns_simple_zkey_lookup.c
Log:
-test fixed, modified shorten

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2012-06-11 15:50:40 UTC 
(rev 21893)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2012-06-11 16:07:12 UTC 
(rev 21894)
@@ -80,7 +80,32 @@
  */
 static unsigned long long rid = 0;
 
+
 /**
+ * Determine if this name is canonical.
+ * i.e.
+ * a.b.gnunet  = not canonical
+ * a           = canonical
+ *
+ * @param name the name to test
+ * @return 1 if canonical
+ */
+static int
+is_canonical(char* name)
+{
+  uint32_t len = strlen(name);
+  int i;
+
+  for (i=0; i<len; i++)
+  {
+    if (*(name+i) == '.')
+      return 0;
+  }
+  return 1;
+}
+
+
+/**
  * Namestore calls this function if we have record for this name.
  * (or with rd_count=0 to indicate no matches)
  *
@@ -1228,7 +1253,7 @@
                                      auth);
 
         /** try to import pkey if private key available */
-        if (rh->priv_key)
+        if (rh->priv_key && is_canonical (rh->name))
           process_discovered_authority(name, auth->zone,
                                        rh->authority_chain_tail->zone,
                                        rh->priv_key);
@@ -1536,29 +1561,6 @@
 
 
 /**
- * Determine if this name is canonical.
- * i.e.
- * a.b.gnunet  = not canonical
- * a           = canonical
- *
- * @param name the name to test
- * @return 1 if canonical
- */
-static int
-is_canonical(char* name)
-{
-  uint32_t len = strlen(name);
-  int i;
-
-  for (i=0; i<len; i++)
-  {
-    if (*(name+i) == '.')
-      return 0;
-  }
-  return 1;
-}
-
-/**
  * Move one level up in the domain hierarchy and return the
  * passed top level domain.
  *
@@ -2001,7 +2003,7 @@
     /** try to import pkey if private key available
      * TODO: Only import last one?
      */
-    if (rh->priv_key && (name != NULL))
+    if (rh->priv_key && (name != NULL) && is_canonical (rh->name))
       process_discovered_authority((char*)name, auth->zone,
                                    rh->authority_chain_tail->zone,
                                    rh->priv_key);

Modified: gnunet/src/gns/test_gns_dht_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_dht_delegated_lookup.c      2012-06-11 15:50:40 UTC 
(rev 21893)
+++ gnunet/src/gns/test_gns_dht_delegated_lookup.c      2012-06-11 16:07:12 UTC 
(rev 21894)
@@ -163,6 +163,7 @@
   }
 
   GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+                    GNUNET_NO,
                     &on_lookup_result, TEST_DOMAIN);
 }
 

Modified: gnunet/src/gns/test_gns_dht_threepeer.c
===================================================================
--- gnunet/src/gns/test_gns_dht_threepeer.c     2012-06-11 15:50:40 UTC (rev 
21893)
+++ gnunet/src/gns/test_gns_dht_threepeer.c     2012-06-11 16:07:12 UTC (rev 
21894)
@@ -204,6 +204,7 @@
   gh = GNUNET_GNS_connect(alice_cfg);
 
   GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+                    GNUNET_NO,
                     &on_lookup_result, TEST_DOMAIN);
   die_task =
     GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, "from lookup");

Modified: gnunet/src/gns/test_gns_max_queries.c
===================================================================
--- gnunet/src/gns/test_gns_max_queries.c       2012-06-11 15:50:40 UTC (rev 
21893)
+++ gnunet/src/gns/test_gns_max_queries.c       2012-06-11 16:07:12 UTC (rev 
21894)
@@ -179,10 +179,12 @@
                     MAX_DNS_NAME_LENGTH,
                     "www.doesnotexist-%d.bob.gnunet", i);
     GNUNET_GNS_lookup(gns_handle, lookup_name, GNUNET_GNS_RECORD_TYPE_A,
+                      GNUNET_NO,
                       &on_lookup_result_dummy, NULL);
   }
 
   GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+                    GNUNET_NO,
                     &on_lookup_result, TEST_DOMAIN);
 }
 

Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c      2012-06-11 15:50:40 UTC (rev 
21893)
+++ gnunet/src/gns/test_gns_pseu_shorten.c      2012-06-11 16:07:12 UTC (rev 
21894)
@@ -237,6 +237,7 @@
   GNUNET_GNS_lookup_zone (gns_handle, TEST_DOMAIN,
                           &our_zone, &our_zone,
                           GNUNET_GNS_RECORD_TYPE_A,
+                          GNUNET_NO,
                     &on_lookup_result, TEST_DOMAIN);
 }
 

Modified: gnunet/src/gns/test_gns_simple_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_delegated_lookup.c   2012-06-11 15:50:40 UTC 
(rev 21893)
+++ gnunet/src/gns/test_gns_simple_delegated_lookup.c   2012-06-11 16:07:12 UTC 
(rev 21894)
@@ -164,6 +164,7 @@
   }
 
   GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+                    GNUNET_NO,
                     &on_lookup_result, TEST_DOMAIN);
 }
 

Modified: gnunet/src/gns/test_gns_simple_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.c     2012-06-11 15:50:40 UTC (rev 
21893)
+++ gnunet/src/gns/test_gns_simple_lookup.c     2012-06-11 16:07:12 UTC (rev 
21894)
@@ -149,6 +149,7 @@
   }
 
   GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+                    GNUNET_YES,
                     &on_lookup_result, TEST_DOMAIN);
 }
 

Modified: gnunet/src/gns/test_gns_simple_mx_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_mx_lookup.c  2012-06-11 15:50:40 UTC (rev 
21893)
+++ gnunet/src/gns/test_gns_simple_mx_lookup.c  2012-06-11 16:07:12 UTC (rev 
21894)
@@ -181,6 +181,7 @@
   }
 
   GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_MX,
+                    GNUNET_NO,
                     &on_lookup_result, TEST_DOMAIN);
 }
 

Modified: gnunet/src/gns/test_gns_simple_zkey_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_zkey_lookup.c        2012-06-11 15:50:40 UTC 
(rev 21893)
+++ gnunet/src/gns/test_gns_simple_zkey_lookup.c        2012-06-11 16:07:12 UTC 
(rev 21894)
@@ -168,6 +168,7 @@
   strcpy(pos, GNUNET_GNS_TLD_ZKEY);
 
   GNUNET_GNS_lookup(gns_handle, name, GNUNET_GNS_RECORD_TYPE_A,
+                    GNUNET_NO,
                     &on_lookup_result, NULL);
 }