diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-04-23 12:42:00 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-04-23 12:42:00 +0200 |
commit | e1f46c052dca3cd7a390f18f97b10162fe537a15 (patch) | |
tree | daa43ca3b189b6f86425801dc94413a71a04a66c /src/namestore/gnunet-service-namestore.c | |
parent | ff4d7b51f37f61633766664647e9b148af1e4f0a (diff) | |
download | gnunet-e1f46c052dca3cd7a390f18f97b10162fe537a15.tar.gz gnunet-e1f46c052dca3cd7a390f18f97b10162fe537a15.zip |
move to @ for empty label, fix empty-label resolution bug in GNS API, install gnunet-zoneimport and add man page
Diffstat (limited to 'src/namestore/gnunet-service-namestore.c')
-rw-r--r-- | src/namestore/gnunet-service-namestore.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index 3a3291c07..3685c93af 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -362,13 +362,13 @@ client_connect_cb (void *cls, | |||
362 | 362 | ||
363 | 363 | ||
364 | /** | 364 | /** |
365 | * Function called with the records for the #GNUNET_GNS_MASTERZONE_STR | 365 | * Function called with the records for the #GNUNET_GNS_EMPTY_LABEL_AT |
366 | * label in the zone. Used to locate the #GNUNET_GNSRECORD_TYPE_NICK | 366 | * label in the zone. Used to locate the #GNUNET_GNSRECORD_TYPE_NICK |
367 | * record, which (if found) is then copied to @a cls for future use. | 367 | * record, which (if found) is then copied to @a cls for future use. |
368 | * | 368 | * |
369 | * @param cls a `struct GNUNET_GNSRECORD_Data **` for storing the nick (if found) | 369 | * @param cls a `struct GNUNET_GNSRECORD_Data **` for storing the nick (if found) |
370 | * @param private_key the private key of the zone (unused) | 370 | * @param private_key the private key of the zone (unused) |
371 | * @param label should be #GNUNET_GNS_MASTERZONE_STR | 371 | * @param label should be #GNUNET_GNS_EMPTY_LABEL_AT |
372 | * @param rd_count number of records in @a rd | 372 | * @param rd_count number of records in @a rd |
373 | * @param rd records stored under @a label in the zone | 373 | * @param rd records stored under @a label in the zone |
374 | */ | 374 | */ |
@@ -382,7 +382,7 @@ lookup_nick_it (void *cls, | |||
382 | struct GNUNET_GNSRECORD_Data **res = cls; | 382 | struct GNUNET_GNSRECORD_Data **res = cls; |
383 | 383 | ||
384 | (void) private_key; | 384 | (void) private_key; |
385 | if (0 != strcmp (label, GNUNET_GNS_MASTERZONE_STR)) | 385 | if (0 != strcmp (label, GNUNET_GNS_EMPTY_LABEL_AT)) |
386 | { | 386 | { |
387 | GNUNET_break (0); | 387 | GNUNET_break (0); |
388 | return; | 388 | return; |
@@ -423,7 +423,7 @@ get_nick_record (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone) | |||
423 | nick = NULL; | 423 | nick = NULL; |
424 | res = GSN_database->lookup_records (GSN_database->cls, | 424 | res = GSN_database->lookup_records (GSN_database->cls, |
425 | zone, | 425 | zone, |
426 | GNUNET_GNS_MASTERZONE_STR, | 426 | GNUNET_GNS_EMPTY_LABEL_AT, |
427 | &lookup_nick_it, | 427 | &lookup_nick_it, |
428 | &nick); | 428 | &nick); |
429 | if ( (GNUNET_OK != res) || | 429 | if ( (GNUNET_OK != res) || |
@@ -531,7 +531,7 @@ send_lookup_response (struct NamestoreClient *nc, | |||
531 | char *rd_ser; | 531 | char *rd_ser; |
532 | 532 | ||
533 | nick = get_nick_record (zone_key); | 533 | nick = get_nick_record (zone_key); |
534 | if ((NULL != nick) && (0 != strcmp(name, GNUNET_GNS_MASTERZONE_STR))) | 534 | if ((NULL != nick) && (0 != strcmp(name, GNUNET_GNS_EMPTY_LABEL_AT))) |
535 | { | 535 | { |
536 | nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE; | 536 | nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE; |
537 | merge_with_nick_records (nick, | 537 | merge_with_nick_records (nick, |
@@ -766,7 +766,7 @@ lookup_it (void *cls, | |||
766 | { | 766 | { |
767 | if ( (NULL != rlc->nick) && | 767 | if ( (NULL != rlc->nick) && |
768 | (0 != strcmp (label, | 768 | (0 != strcmp (label, |
769 | GNUNET_GNS_MASTERZONE_STR)) ) | 769 | GNUNET_GNS_EMPTY_LABEL_AT)) ) |
770 | { | 770 | { |
771 | /* Merge */ | 771 | /* Merge */ |
772 | rd_res = NULL; | 772 | rd_res = NULL; |
@@ -1043,12 +1043,12 @@ handle_record_store (void *cls, | |||
1043 | unsigned int rd_clean_off; | 1043 | unsigned int rd_clean_off; |
1044 | 1044 | ||
1045 | /* remove "NICK" records, unless this is for the | 1045 | /* remove "NICK" records, unless this is for the |
1046 | #GNUNET_GNS_MASTERZONE_STR label */ | 1046 | #GNUNET_GNS_EMPTY_LABEL_AT label */ |
1047 | rd_clean_off = 0; | 1047 | rd_clean_off = 0; |
1048 | for (unsigned int i=0;i<rd_count;i++) | 1048 | for (unsigned int i=0;i<rd_count;i++) |
1049 | { | 1049 | { |
1050 | rd_clean[rd_clean_off] = rd[i]; | 1050 | rd_clean[rd_clean_off] = rd[i]; |
1051 | if ( (0 == strcmp (GNUNET_GNS_MASTERZONE_STR, | 1051 | if ( (0 == strcmp (GNUNET_GNS_EMPTY_LABEL_AT, |
1052 | conv_name)) || | 1052 | conv_name)) || |
1053 | (GNUNET_GNSRECORD_TYPE_NICK != rd[i].record_type) ) | 1053 | (GNUNET_GNSRECORD_TYPE_NICK != rd[i].record_type) ) |
1054 | rd_clean_off++; | 1054 | rd_clean_off++; |