Merge branch 'master' of ssh://gnunet.org/gnunet

8 files changed, 87 insertions, 64 deletions

diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index 2c30f0b68..ca255310c 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -894,7 +894,7 @@ get_distance (const struct GNUNET_HashCode *target,
               unsigned int bucket)
 {
   uint64_t lsb = 0;
-  
+
   for (unsigned int i = bucket + 1;
        (i < sizeof(struct GNUNET_HashCode) * 8) &&
        (i < bucket + 1 + 64);
@@ -997,14 +997,15 @@ select_peer (const struct GNUNET_HashCode *key,
     chosen = NULL;
     for (bc = 0; bc <= closest_bucket; bc++)
     {
-      pos = k_buckets[bc].head;
       count = 0;
-      while ( (pos != NULL) &&
-              (count < bucket_size) )
+      for (pos = k_buckets[bc].head;
+           (pos != NULL) &&
+           (count < bucket_size);
+           pos = pos->next)
       {
         unsigned int bucket;
         uint64_t dist;
-        
+
         bucket = GNUNET_CRYPTO_hash_matching_bits (key,
                                                    &pos->phash);
         dist = get_distance (key,
@@ -1037,7 +1038,6 @@ select_peer (const struct GNUNET_HashCode *key,
           chosen = NULL;
         }
         count++;
-        pos = pos->next;
       }
     }
     if (NULL == chosen)
diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h
index 63c45112d..e88e836f6 100644
--- a/src/include/gnunet_db_lib.h
+++ b/src/include/gnunet_db_lib.h
@@ -25,6 +25,7 @@
 #ifndef GNUNET_DB_LIB_H
 #define GNUNET_DB_LIB_H
 
+#include "gnunet_common.h"
 
 /**
  * Status code returned from functions running database commands.
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index 144ddb64a..92f696e08 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -556,7 +556,7 @@ struct GNUNET_JSON_PackSpec
    * Object to pack.
    */
   json_t *object;
-  
+
   /**
    * True if a NULL (or 0) argument is allowed. In this
    * case, if the argument is NULL the @e packer should
@@ -586,7 +586,8 @@ GNUNET_JSON_pack_ (struct GNUNET_JSON_PackSpec spec[]);
  * @return JSON object
  */
 #define GNUNET_JSON_PACK(...) \
-  GNUNET_JSON_pack_ ((struct GNUNET_JSON_PackSpec[]) {__VA_ARGS__, GNUNET_JSON_pack_end_ ()})
+  GNUNET_JSON_pack_ ((struct GNUNET_JSON_PackSpec[]) {__VA_ARGS__, \
+                                                      GNUNET_JSON_pack_end_ ()})
 
 
 /**
@@ -595,12 +596,12 @@ GNUNET_JSON_pack_ (struct GNUNET_JSON_PackSpec spec[]);
  * @return array terminator
  */
 struct GNUNET_JSON_PackSpec
-GNUNET_JSON_pack_end_(void);
+GNUNET_JSON_pack_end_ (void);
 
 
 /**
  * Modify packer instruction to allow NULL as a value.
- * 
+ *
  * @param in json pack specification to modify
  * @return json pack specification
  */
@@ -611,7 +612,7 @@ GNUNET_JSON_pack_allow_null (struct GNUNET_JSON_PackSpec in);
 /**
  * Generate packer instruction for a JSON field of type
  * bool.
- * 
+ *
  * @param name name of the field to add to the object
  * @param b boolean value
  * @return json pack specification
@@ -624,7 +625,7 @@ GNUNET_JSON_pack_bool (const char *name,
 /**
  * Generate packer instruction for a JSON field of type
  * string.
- * 
+ *
  * @param name name of the field to add to the object
  * @param s string value
  * @return json pack specification
@@ -636,9 +637,9 @@ GNUNET_JSON_pack_string (const char *name,
 
 /**
  * Generate packer instruction for a JSON field of type
- * unsigned integer. Note that the maximum allowed 
+ * unsigned integer. Note that the maximum allowed
  * value is still limited by JSON and not UINT64_MAX.
- * 
+ *
  * @param name name of the field to add to the object
  * @param num numeric value
  * @return json pack specification
@@ -651,21 +652,21 @@ GNUNET_JSON_pack_uint64 (const char *name,
 /**
  * Generate packer instruction for a JSON field of type
  * signed integer.
- * 
+ *
  * @param name name of the field to add to the object
  * @param num numeric value
  * @return json pack specification
  */
 struct GNUNET_JSON_PackSpec
 GNUNET_JSON_pack_int64 (const char *name,
-                         int64_t num);
+                        int64_t num);
 
 
 /**
  * Generate packer instruction for a JSON field of type
  * JSON object where the reference is taken over by
  * the packer.
- * 
+ *
  * @param name name of the field to add to the object
  * @param o object to steal
  * @return json pack specification
@@ -679,7 +680,7 @@ GNUNET_JSON_pack_object_steal (const char *name,
  * Generate packer instruction for a JSON field of type JSON object where the
  * reference counter is incremented by the packer.  Note that a deep copy is
  * not performed.
- * 
+ *
  * @param name name of the field to add to the object
  * @param o object to increment reference counter of
  * @return json pack specification
@@ -693,7 +694,7 @@ GNUNET_JSON_pack_object_incref (const char *name,
  * Generate packer instruction for a JSON field of type
  * JSON array where the reference is taken over by
  * the packer.
- * 
+ *
  * @param name name of the field to add to the object
  * @param a array to steal
  * @return json pack specification
@@ -707,7 +708,7 @@ GNUNET_JSON_pack_array_steal (const char *name,
  * Generate packer instruction for a JSON field of type JSON array where the
  * reference counter is incremented by the packer.  Note that a deep copy is
  * not performed.
- * 
+ *
  * @param name name of the field to add to the object
  * @param a array to increment reference counter of
  * @return json pack specification
@@ -720,7 +721,7 @@ GNUNET_JSON_pack_array_incref (const char *name,
 /**
  * Generate packer instruction for a JSON field of type
  * variable size binary blob.
- * 
+ *
  * @param name name of the field to add to the object
  * @param blob binary data to pack
  * @param blob_size number of bytes in @a blob
@@ -735,7 +736,7 @@ GNUNET_JSON_pack_data_varsize (const char *name,
 /**
  * Generate packer instruction for a JSON field where the
  * size is automatically determined from the argument.
- * 
+ *
  * @param name name of the field to add to the object
  * @param blob data to pack, must not be an array
  * @return json pack specification
@@ -749,7 +750,8 @@ GNUNET_JSON_pack_data_varsize (const char *name,
  * absolute time.
  *
  * @param name name of the field to add to the object
- * @param at absolute time to pack
+ * @param at absolute time to pack, a value of 0 is only
+ *        allowed with #GNUNET_JSON_pack_allow_null()!
  * @return json pack specification
  */
 struct GNUNET_JSON_PackSpec
@@ -762,7 +764,8 @@ GNUNET_JSON_pack_time_abs (const char *name,
  * absolute time in network byte order.
  *
  * @param name name of the field to add to the object
- * @param at absolute time to pack
+ * @param at absolute time to pack, a value of 0 is only
+ *        allowed with #GNUNET_JSON_pack_allow_null()!
  * @return json pack specification
  */
 struct GNUNET_JSON_PackSpec
@@ -799,7 +802,7 @@ GNUNET_JSON_pack_time_rel_nbo (const char *name,
 /**
  * Generate packer instruction for a JSON field of type
  * RSA public key.
- * 
+ *
  * @param name name of the field to add to the object
  * @param pk RSA public key
  * @return json pack specification
@@ -812,7 +815,7 @@ GNUNET_JSON_pack_rsa_public_key (const char *name,
 /**
  * Generate packer instruction for a JSON field of type
  * RSA signature.
- * 
+ *
  * @param name name of the field to add to the object
  * @param sig RSA signature
  * @return json pack specification
diff --git a/src/json/json_pack.c b/src/json/json_pack.c
index c61d3331f..92f8b4535 100644
--- a/src/json/json_pack.c
+++ b/src/json/json_pack.c
@@ -248,12 +248,20 @@ struct GNUNET_JSON_PackSpec
 GNUNET_JSON_pack_time_abs (const char *name,
                            struct GNUNET_TIME_Absolute at)
 {
-  json_t *json;
+  struct GNUNET_JSON_PackSpec ps = {
+    .field_name = name
+  };
 
-  json = GNUNET_JSON_from_time_abs (at);
-  GNUNET_assert (NULL != json);
-  return GNUNET_JSON_pack_object_steal (name,
-                                        json);
+  if (0 != at.abs_value_us)
+  {
+    ps.object = GNUNET_JSON_from_time_abs (at);
+    GNUNET_assert (NULL != ps.object);
+  }
+  else
+  {
+    ps.object = NULL;
+  }
+  return ps;
 }
 
 
diff --git a/src/pq/pq_event.c b/src/pq/pq_event.c
index bf845db18..e6c2d07fd 100644
--- a/src/pq/pq_event.c
+++ b/src/pq/pq_event.c
@@ -192,7 +192,11 @@ GNUNET_PQ_event_do_poll (struct GNUNET_PQ_Context *db)
 
   GNUNET_assert (0 ==
                  pthread_mutex_lock (&db->notify_lock));
-  PQconsumeInput (db->conn);
+  if (1 !=
+      PQconsumeInput (db->conn))
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to read from Postgres: %s\n",
+                PQerrorMessage (db->conn));
   while (NULL != (n = PQnotifies (db->conn)))
   {
     struct GNUNET_ShortHashCode sh;
@@ -264,7 +268,7 @@ do_scheduler_notify (void *cls)
   GNUNET_assert (NULL != db->rfd);
   GNUNET_PQ_event_do_poll (db);
   db->event_task
-    = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_ZERO,
+    = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                      db->rfd,
                                      &do_scheduler_notify,
                                      db);
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index a51e92b71..2d258bfc5 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -95,7 +95,7 @@
 #define SECURITY_LEVEL 80
 
 /**
- * Is the estimated probabily for a new round this values
+ * Is the estimated probability for a new round this values
  * is based on the bsc thesis of Elias Summermatter (2021)
  */
 
@@ -467,7 +467,7 @@ struct Operation
 
   /**
    * Set difference is multiplied with this factor
-   * to gennerate large enought IBF
+   * to gennerate large enough IBF
    */
   uint8_t ibf_bucket_number_factor;
 
@@ -780,7 +780,7 @@ struct perf_num_send_received_msg
 };
 
 /**
- *  Main struct to messure perfomance (data/rtts)
+ *  Main struct to measure performance (data/rtts)
  */
 struct per_store_struct
 {
@@ -828,7 +828,7 @@ enum MESSAGE_CONTROL_FLOW_STATE
   MSG_CFS_EXPECTED,
 
   /**
-   * Track that message has been recieved
+   * Track that message has been received
    */
   MSG_CFS_RECEIVED,
 };
@@ -843,20 +843,22 @@ enum MESSAGE_TYPE
    * Offer message type
    */
   OFFER_MESSAGE,
+
   /**
    * Demand message type
    */
   DEMAND_MESSAGE,
+
   /**
-   * Elemente message type
+   * Element message type
    */
   ELEMENT_MESSAGE,
 };
 
+
 /**
- * Struct to tracked messages in message controll flow
+ * Struct to tracked messages in message control flow
  */
-
 struct messageControlFlowElement
 {
   /**
@@ -875,50 +877,54 @@ struct messageControlFlowElement
 
 
 #if MEASURE_PERFORMANCE
+
 /**
- * Loads different configuration to do perform perfomance tests
- * @param op
+ * Loads different configuration to perform performance tests
+ *
+ * @param op operation handle
  */
 static void
 load_config (struct Operation *op)
 {
-
-  setu_cfg = GNUNET_CONFIGURATION_create ();
-  GNUNET_CONFIGURATION_load (setu_cfg,"perf_setu.conf");
-
-
   long long number;
   float fl;
-  GNUNET_CONFIGURATION_get_value_float (setu_cfg,"IBF", "BUCKET_NUMBER_FACTOR",
+
+  setu_cfg = GNUNET_CONFIGURATION_create ();
+  GNUNET_CONFIGURATION_load (setu_cfg,
+                             "perf_setu.conf");
+  GNUNET_CONFIGURATION_get_value_float (setu_cfg,
+                                        "IBF",
+                                        "BUCKET_NUMBER_FACTOR",
                                         &fl);
   op->ibf_bucket_number_factor = fl;
-
-  GNUNET_CONFIGURATION_get_value_number (setu_cfg,"IBF", "NUMBER_PER_BUCKET",
+  GNUNET_CONFIGURATION_get_value_number (setu_cfg,
+                                         "IBF",
+                                         "NUMBER_PER_BUCKET",
                                          &number);
   op->ibf_number_buckets_per_element = number;
-
-  GNUNET_CONFIGURATION_get_value_number (setu_cfg,"PERFORMANCE", "TRADEOFF",
+  GNUNET_CONFIGURATION_get_value_number (setu_cfg,
+                                         "PERFORMANCE",
+                                         "TRADEOFF",
                                          &number);
   op->rtt_bandwidth_tradeoff = number;
-
-
-  GNUNET_CONFIGURATION_get_value_number (setu_cfg,"BOUNDARIES", "UPPER_ELEMENT",
+  GNUNET_CONFIGURATION_get_value_number (setu_cfg,
+                                         "BOUNDARIES",
+                                         "UPPER_ELEMENT",
                                          &number);
   op->byzantine_upper_bound = number;
-
-
   op->peer_site = 0;
 }
 
 
 /**
- * Function to calculate total bytes used for performance messurement
+ * Function to calculate total bytes used for performance measurement
  * @param size
  * @param perf_num_send_received_msg
  * @return bytes used
  */
 static int
-sum_sent_received_bytes (uint64_t size, struct perf_num_send_received_msg
+sum_sent_received_bytes (uint64_t size,
+                         struct perf_num_send_received_msg
                          perf_num_send_received_msg)
 {
   return (size * perf_num_send_received_msg.sent)
@@ -942,7 +948,7 @@ calculate_perf_store ()
   int bytes_transmitted = 0;
 
   /**
-   *  Calculate RGNUNET_SETU_AcceptMessageRT of Fullsync normaly 1 or 1.5 depending
+   *  Calculate RGNUNET_SETU_AcceptMessageRT of Fullsync normally 1 or 1.5 depending
    */
   if ((perf_store.element_full.received != 0) ||
       (perf_store.element_full.sent != 0)
@@ -1840,7 +1846,7 @@ struct GetElementContext
   struct GNUNET_HashCode hash;
 
   /**
-   * Pointer to the key enty
+   * Pointer to the key entry
    */
   struct KeyEntry *k;
 };
diff --git a/src/setu/gnunet-service-setu_protocol.h b/src/setu/gnunet-service-setu_protocol.h
index d8f34f69c..c2a166e60 100644
--- a/src/setu/gnunet-service-setu_protocol.h
+++ b/src/setu/gnunet-service-setu_protocol.h
@@ -82,11 +82,13 @@ struct IBFMessage
   uint16_t salt GNUNET_PACKED;
 
   /**
-   * The bit lenght of the counter
+   * The bit length of the counter
    */
   uint16_t ibf_counter_bit_length;
   /* rest: buckets */
 };
+
+
 /**
 estimate_best_mode_of_operation (uint64_t avg_element_size,
 uint64_t local_set_size,
@@ -96,7 +98,6 @@ uint64_t est_set_diff_remote,
         **/
 
 
-
 struct InquiryMessage
 {
   /**
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index af84994f8..7f4d64f74 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -355,7 +355,7 @@ run (void *cls,
               set2);
   GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &app_id);
 
-  /* test if canceling an uncommited request works! */
+  /* test if canceling an uncommitted request works! */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Launching and instantly stopping set operation\n");
   my_oh = GNUNET_SETU_prepare (&local_id,