- fixes, intendation

[oweals/gnunet.git] / src / gns / gnunet-service-gns.c

diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index d2e5cda85de83e2b67667730472590d837e3a95a..092da35774af09e7abca1657e552efbfede50beb 100644 (file)
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2011-2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -218,7 +218,7 @@ static struct GNUNET_TIME_Relative zone_publish_time_window;
 /**
  * zone publish task
  */
-static GNUNET_SCHEDULER_TaskIdentifier zone_publish_task;
+static struct GNUNET_SCHEDULER_Task * zone_publish_task;
 
 /**
  * #GNUNET_YES if zone has never been published before
@@ -281,10 +281,10 @@ shutdown_task (void *cls,
     GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
     statistics = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != zone_publish_task)
+  if (NULL != zone_publish_task)
   {
     GNUNET_SCHEDULER_cancel (zone_publish_task);
-    zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+    zone_publish_task = NULL;
   }
   if (NULL != namestore_iter)
   {
@@ -329,7 +329,7 @@ static void
 publish_zone_dht_next (void *cls,
                        const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+  zone_publish_task = NULL;
   GNUNET_NAMESTORE_zone_iterator_next (namestore_iter);
 }
 
@@ -416,8 +416,7 @@ convert_records_for_export (const struct GNUNET_GNSRECORD_Data *rd,
   rd_public_count = 0;
   now = GNUNET_TIME_absolute_get ();
   for (i=0;i<rd_count;i++)
-    if (0 == (rd[i].flags & (GNUNET_GNSRECORD_RF_PRIVATE |
-                            GNUNET_GNSRECORD_RF_PENDING)))
+    if (0 == (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE))
     {
       rd_public[rd_public_count] = rd[i];
       if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
@@ -469,6 +468,8 @@ perform_dht_put (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
                                         label,
                                         rd_public,
                                         rd_public_count);
+  if (NULL == block)
+    return NULL; /* whoops */
   block_size = ntohl (block->purpose.size)
     + sizeof (struct GNUNET_CRYPTO_EcdsaSignature)
     + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
@@ -476,7 +477,9 @@ perform_dht_put (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
                                           label,
                                           &query);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Storing record in DHT with expiration `%s' under key %s\n",
+              "Storing %u record(s) for label `%s' in DHT with expiration `%s' under key %s\n",
+              rd_public_count,
+              label,
               GNUNET_STRINGS_absolute_time_to_string (expire),
               GNUNET_h2s (&query));
   ret = GNUNET_DHT_put (dht_handle, &query,
@@ -499,21 +502,21 @@ perform_dht_put (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
  *
  * @param cls the closure (NULL)
  * @param key the private key of the authority (ours)
- * @param name the name of the records, NULL once the iteration is done
+ * @param label the name of the records, NULL once the iteration is done
  * @param rd_count the number of records in @a rd
  * @param rd the record data
  */
 static void
 put_gns_record (void *cls,
                 const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
-                const char *name,
+                const char *label,
                 unsigned int rd_count,
                 const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GNUNET_GNSRECORD_Data rd_public[rd_count];
   unsigned int rd_public_count;
 
-  if (NULL == name)
+  if (NULL == label)
   {
     /* we're done with one iteration, calculate when to do the next one */
     namestore_iter = NULL;
@@ -532,12 +535,14 @@ put_gns_record (void *cls,
     }
     else
     {
-      zone_publish_time_window
-        = GNUNET_TIME_relative_min (GNUNET_TIME_relative_divide (min_relative_record_time,
-                                                                 4),
-                                    zone_publish_time_window_default);
+      /* If records are present, next publication is based on the minimum
+       * relative expiration time of the records published divided by 4
+       */
+      zone_publish_time_window = GNUNET_TIME_relative_min (
+          GNUNET_TIME_relative_divide (min_relative_record_time, 4),
+          zone_publish_time_window_default);
       put_interval = GNUNET_TIME_relative_divide (zone_publish_time_window,
-                                                 num_public_records);
+          num_public_records);
     }
     /* reset for next iteration */
     min_relative_record_time = GNUNET_TIME_UNIT_FOREVER_REL;
@@ -582,7 +587,7 @@ put_gns_record (void *cls,
   }
 
   active_put = perform_dht_put (key,
-                                name,
+                                label,
                                 rd_public,
                                 rd_public_count,
                                 NULL);
@@ -595,7 +600,7 @@ put_gns_record (void *cls,
 
 
 /**
- * Periodically iterate over our zone and store everything in dht
+ * Periodically iterate over all zones and store everything in DHT
  *
  * @param cls NULL
  * @param tc task context
@@ -604,16 +609,15 @@ static void
 publish_zone_dht_start (void *cls,
                        const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+  zone_publish_task = NULL;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Starting DHT zone update!\n");
   /* start counting again */
   num_public_records = 0;
   namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
-                                                         NULL, /* All zones */
-                                                         &put_gns_record,
-                                                         NULL);
+      NULL, /* All zones */
+      &put_gns_record, NULL );
 }
 
 
@@ -786,7 +790,7 @@ handle_lookup (void *cls,
                                     ntohl (sh_msg->type),
                                     name,
                                     key,
-                                    ntohl (sh_msg->only_cached),
+                                    (enum GNUNET_GNS_LocalOptions) ntohs (sh_msg->options),
                                     &send_lookup_response, clh);
   GNUNET_STATISTICS_update (statistics,
                             "Lookup attempts",