summaryrefslogtreecommitdiff
path: root/src/gns/gnunet-service-gns.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-16 20:21:27 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-16 20:21:27 +0000
commitaccfd6bd85274da2f19e7230c8da6b273cfb2ece (patch)
tree60966194963795ff07b4da94f4efb6c46d6a23cf /src/gns/gnunet-service-gns.c
parent3d670727232e79b7e49a1df7ba9260db4e5798a0 (diff)
downloadgnunet-accfd6bd85274da2f19e7230c8da6b273cfb2ece.tar.gz
gnunet-accfd6bd85274da2f19e7230c8da6b273cfb2ece.zip
-another renaming fest for GNUNET_NAMESTORE_ to GNUNET_GNSRECORD_ symbols that were moved
Diffstat (limited to 'src/gns/gnunet-service-gns.c')
-rw-r--r--src/gns/gnunet-service-gns.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index d3728ee00..ff574c3a1 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -321,14 +321,14 @@ put_gns_record (void *cls,
321 const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, 321 const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
322 const char *name, 322 const char *name,
323 unsigned int rd_count, 323 unsigned int rd_count,
324 const struct GNUNET_NAMESTORE_RecordData *rd) 324 const struct GNUNET_GNSRECORD_Data *rd)
325{ 325{
326 struct GNUNET_NAMESTORE_Block *block; 326 struct GNUNET_GNSRECORD_Block *block;
327 struct GNUNET_HashCode query; 327 struct GNUNET_HashCode query;
328 struct GNUNET_TIME_Absolute expire; 328 struct GNUNET_TIME_Absolute expire;
329 struct GNUNET_TIME_Absolute now; 329 struct GNUNET_TIME_Absolute now;
330 size_t block_size; 330 size_t block_size;
331 struct GNUNET_NAMESTORE_RecordData rd_public[rd_count]; 331 struct GNUNET_GNSRECORD_Data rd_public[rd_count];
332 unsigned int rd_public_count; 332 unsigned int rd_public_count;
333 unsigned int i; 333 unsigned int i;
334 334
@@ -387,13 +387,13 @@ put_gns_record (void *cls,
387 rd_public_count = 0; 387 rd_public_count = 0;
388 now = GNUNET_TIME_absolute_get (); 388 now = GNUNET_TIME_absolute_get ();
389 for (i=0;i<rd_count;i++) 389 for (i=0;i<rd_count;i++)
390 if (0 == (rd[i].flags & (GNUNET_NAMESTORE_RF_PRIVATE | 390 if (0 == (rd[i].flags & (GNUNET_GNSRECORD_RF_PRIVATE |
391 GNUNET_NAMESTORE_RF_PENDING))) 391 GNUNET_GNSRECORD_RF_PENDING)))
392 { 392 {
393 rd_public[rd_public_count] = rd[i]; 393 rd_public[rd_public_count] = rd[i];
394 if (0 != (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION)) 394 if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
395 { 395 {
396 rd_public[rd_public_count].flags &= ~GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION; 396 rd_public[rd_public_count].flags &= ~GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
397 rd_public[rd_public_count].expiration_time += now.abs_value_us; 397 rd_public[rd_public_count].expiration_time += now.abs_value_us;
398 } 398 }
399 rd_public_count++; 399 rd_public_count++;
@@ -406,9 +406,9 @@ put_gns_record (void *cls,
406 NULL); 406 NULL);
407 return; 407 return;
408 } 408 }
409 expire = GNUNET_NAMESTORE_record_get_expiration_time (rd_public_count, 409 expire = GNUNET_GNSRECORD_record_get_expiration_time (rd_public_count,
410 rd_public); 410 rd_public);
411 block = GNUNET_NAMESTORE_block_create (key, 411 block = GNUNET_GNSRECORD_block_create (key,
412 expire, 412 expire,
413 name, 413 name,
414 rd_public, 414 rd_public,
@@ -416,7 +416,7 @@ put_gns_record (void *cls,
416 block_size = ntohl (block->purpose.size) 416 block_size = ntohl (block->purpose.size)
417 + sizeof (struct GNUNET_CRYPTO_EcdsaSignature) 417 + sizeof (struct GNUNET_CRYPTO_EcdsaSignature)
418 + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); 418 + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
419 GNUNET_NAMESTORE_query_from_private_key (key, 419 GNUNET_GNSRECORD_query_from_private_key (key,
420 name, 420 name,
421 &query); 421 &query);
422 422
@@ -475,7 +475,7 @@ publish_zone_dht_start (void *cls,
475static void 475static void
476send_lookup_response (void* cls, 476send_lookup_response (void* cls,
477 uint32_t rd_count, 477 uint32_t rd_count,
478 const struct GNUNET_NAMESTORE_RecordData *rd) 478 const struct GNUNET_GNSRECORD_Data *rd)
479{ 479{
480 struct ClientLookupHandle *clh = cls; 480 struct ClientLookupHandle *clh = cls;
481 struct GNUNET_GNS_ClientLookupResultMessage *rmsg; 481 struct GNUNET_GNS_ClientLookupResultMessage *rmsg;
@@ -486,13 +486,13 @@ send_lookup_response (void* cls,
486 "LOOKUP_RESULT", 486 "LOOKUP_RESULT",
487 rd_count); 487 rd_count);
488 488
489 len = GNUNET_NAMESTORE_records_get_size (rd_count, rd); 489 len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
490 rmsg = GNUNET_malloc (len + sizeof (struct GNUNET_GNS_ClientLookupResultMessage)); 490 rmsg = GNUNET_malloc (len + sizeof (struct GNUNET_GNS_ClientLookupResultMessage));
491 rmsg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT); 491 rmsg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT);
492 rmsg->header.size = htons (len + sizeof(struct GNUNET_GNS_ClientLookupResultMessage)); 492 rmsg->header.size = htons (len + sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
493 rmsg->id = clh->request_id; 493 rmsg->id = clh->request_id;
494 rmsg->rd_count = htonl (rd_count); 494 rmsg->rd_count = htonl (rd_count);
495 GNUNET_NAMESTORE_records_serialize (rd_count, rd, len, 495 GNUNET_GNSRECORD_records_serialize (rd_count, rd, len,
496 (char*) &rmsg[1]); 496 (char*) &rmsg[1]);
497 GNUNET_SERVER_notification_context_unicast (nc, 497 GNUNET_SERVER_notification_context_unicast (nc,
498 clh->client, 498 clh->client,