-introduce #define for + in GADS

git-svn-id: https://gnunet.org/svn/gnunet@25205 140774ce-b5e7-0310-ab8b-a85725594a96

6 files changed, 24 insertions, 18 deletions

diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 9d77cf9022..76534a10eb 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -433,7 +433,7 @@ process_auth_discovery_dht_result (void* cls,
     {
       for (i=0; i < num_records; i++)
       {
-        if ((strcmp (name, "+") == 0) &&
+        if ((strcmp (name, GNUNET_GNS_MASTERZONE_STR) == 0) &&
             (rd[i].record_type == GNUNET_GNS_RECORD_PSEU))
         {
           /* found pseu */
@@ -549,7 +549,7 @@ process_zone_to_name_discover (void *cls,
   {
     gph->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
                                     &gph->auth->zone,
-                                    "+",
+                                    GNUNET_GNS_MASTERZONE_STR,
                                     GNUNET_GNS_RECORD_PSEU,
                                     &process_auth_discovery_ns_result,
                                     gph);
@@ -2303,7 +2303,7 @@ process_delegation_result_dht (void* cls,
     /* Check for key revocation and delegate */
     rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
                                     &rh->authority,
-                                    "+",
+                                    GNUNET_GNS_MASTERZONE_STR,
                                     GNUNET_GNS_RECORD_REV,
                                     &process_pkey_revocation_result_ns,
                                     rh);
@@ -2444,7 +2444,7 @@ finish_lookup (struct ResolverHandle *rh,
     
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
                "GNS_POSTPROCESS: Postprocessing\n");
-    if (0 == strcmp(rh->name, "+"))
+    if (0 == strcmp(rh->name, GNUNET_GNS_MASTERZONE_STR))
       repl_string = rlh->name;
     else
       repl_string = rlh->name+strlen(rh->name)+1;
@@ -2604,7 +2604,7 @@ handle_record_ns (void* cls, struct ResolverHandle *rh,
     check_dht = GNUNET_NO;
   }
   
-  if ((0 != strcmp (rh->name, "+")) && (GNUNET_YES == is_srv (rh->name)))
+  if ((0 != strcmp (rh->name, GNUNET_GNS_MASTERZONE_STR)) && (GNUNET_YES == is_srv (rh->name)))
       check_dht = GNUNET_NO;
 
   if (GNUNET_YES == rh->only_cached)
@@ -3226,7 +3226,7 @@ process_delegation_result_ns (void* cls,
     /* Check for key revocation and delegate */
     rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
 							 &rh->authority,
-							 "+",
+							 GNUNET_GNS_MASTERZONE_STR,
 							 GNUNET_GNS_RECORD_REV,
 							 &process_pkey_revocation_result_ns,
 							 rh);
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c
index 2a109559fa..59d826cf9a 100644
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -343,7 +343,7 @@ setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
   rd.record_type = GNUNET_GNS_RECORD_PSEU;
 
 
-  GNUNET_NAMESTORE_record_create (nh[0], key, "+", &rd, &cont_ns, nh[0]);
+  GNUNET_NAMESTORE_record_create (nh[0], key, GNUNET_GNS_MASTERZONE_STR, &rd, &cont_ns, nh[0]);
 
   GNUNET_CRYPTO_rsa_key_free(key);
   GNUNET_free(keyfile);
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index 74f41398d0..c7d8cfc0fa 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.c
@@ -279,27 +279,27 @@ put_pseu_dht (void *cls, int success)
 
   sig = GNUNET_NAMESTORE_create_signature(alice_key,
                                            GNUNET_TIME_UNIT_FOREVER_ABS,
-                                           "+",
+                                           GNUNET_GNS_MASTERZONE_STR,
                                            &rd, 1);
 
   GNUNET_assert (NULL != sig);
 
   GNUNET_break (GNUNET_OK == GNUNET_NAMESTORE_verify_signature (&alice_pkey,
                                                                  GNUNET_TIME_UNIT_FOREVER_ABS,
-                                                                 "+",
+                                                                 GNUNET_GNS_MASTERZONE_STR,
                                                                  1,
                                                                  &rd,
                                                                  sig));
   rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd);
-  nrb = GNUNET_malloc(rd_payload_length + strlen("+") + 1
+  nrb = GNUNET_malloc(rd_payload_length + strlen(GNUNET_GNS_MASTERZONE_STR) + 1
                       + sizeof(struct GNSNameRecordBlock));
   nrb->signature = *sig;
   nrb->public_key = alice_pkey;
   nrb->rd_count = htonl(1);
-  memset(&nrb[1], 0, strlen("+") + 1);
-  strcpy((char*)&nrb[1], "+");
+  memset(&nrb[1], 0, strlen(GNUNET_GNS_MASTERZONE_STR) + 1);
+  strcpy((char*)&nrb[1], GNUNET_GNS_MASTERZONE_STR);
   nrb_data = (char*)&nrb[1];
-  nrb_data += strlen("+") + 1;
+  nrb_data += strlen(GNUNET_GNS_MASTERZONE_STR) + 1;
 
   if (-1 == GNUNET_NAMESTORE_records_serialize (1,
                                                 &rd,
@@ -316,7 +316,7 @@ put_pseu_dht (void *cls, int success)
     end_badly_now ();
     return;
   }
-  GNUNET_CRYPTO_short_hash("+", strlen("+"), &name_hash);
+  GNUNET_CRYPTO_short_hash(GNUNET_GNS_MASTERZONE_STR, strlen(GNUNET_GNS_MASTERZONE_STR), &name_hash);
   GNUNET_CRYPTO_short_hash(&alice_pkey,
                      sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
                      &zone_hash);
@@ -326,7 +326,7 @@ put_pseu_dht (void *cls, int success)
   GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
 
   rd_payload_length += sizeof(struct GNSNameRecordBlock) +
-    strlen("+") + 1;
+    strlen(GNUNET_GNS_MASTERZONE_STR) + 1;
 
   GNUNET_DHT_put (dht_handle, &xor_hash,
                   0,
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c
index 691d8c1240..a6bbd9ad18 100644
--- a/src/gns/test_gns_revocation.c
+++ b/src/gns/test_gns_revocation.c
@@ -257,7 +257,7 @@ do_check (void *cls,
 
   GNUNET_NAMESTORE_record_create (namestore_handle,
                                   bob_key,
-                                  "+",
+                                  GNUNET_GNS_MASTERZONE_STR,
                                   &rd,
                                   &commence_testing,
                                   NULL);
diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c
index 812a157dbd..d2ca08c754 100644
--- a/src/gns/test_gns_simple_mx_lookup.c
+++ b/src/gns/test_gns_simple_mx_lookup.c
@@ -265,12 +265,12 @@ do_check (void *cls,
   rd.record_type = GNUNET_GNS_RECORD_MX;
   sig = GNUNET_NAMESTORE_create_signature(bob_key,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
-                                          "+",
+                                          GNUNET_GNS_MASTERZONE_STR,
                                           &rd, 1);
   et.abs_value = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
-                               "+",
+                               GNUNET_GNS_MASTERZONE_STR,
                                et,
                                1,
                                &rd,
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index 73f5db5ac0..8d2fde3d65 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -40,6 +40,12 @@ extern "C"
 
 
 /**
+ * String we use to indicate the local master zone or a
+ * root entry in the current zone.
+ */
+#define GNUNET_GNS_MASTERZONE_STR "+"
+
+/**
  * Connection to the GNS service.
  */
 struct GNUNET_GNS_Handle;