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

6 files changed, 61 insertions, 51 deletions

diff --git a/src/dhtu/plugin_dhtu_ip.c b/src/dhtu/plugin_dhtu_ip.c
index f80325cbc..8593a69ef 100644
--- a/src/dhtu/plugin_dhtu_ip.c
+++ b/src/dhtu/plugin_dhtu_ip.c
@@ -64,12 +64,12 @@ struct GNUNET_DHTU_Source
    * Address in URL form ("ip+udp://$IP:$PORT")
    */
   char *address;
-  
+
   /**
    * Hash of the IP address.
    */
   struct GNUNET_DHTU_Hash id;
-  
+
   /**
    * My actual address.
    */
@@ -79,12 +79,12 @@ struct GNUNET_DHTU_Source
    * Number of bytes in @a addr.
    */
   socklen_t addrlen;
-  
+
   /**
    * Last generation this address was observed.
    */
   unsigned int scan_generation;
-  
+
 };
 
 
@@ -104,12 +104,12 @@ struct GNUNET_DHTU_Target
    * Kept in a DLL.
    */
   struct GNUNET_DHTU_Target *prev;
-  
+
   /**
    * Application context for this target.
    */
   void *app_ctx;
-  
+
   /**
    * Hash of the IP address.
    */
@@ -124,7 +124,7 @@ struct GNUNET_DHTU_Target
    * Tail of preferences expressed for this target.
    */
   struct GNUNET_DHTU_PreferenceHandle *ph_tail;
-  
+
   /**
    * Target IP address.
    */
@@ -134,7 +134,7 @@ struct GNUNET_DHTU_Target
    * Number of bytes in @a addr.
    */
   socklen_t addrlen;
-  
+
   /**
    * Preference counter, length of the @a ph_head DLL.
    */
@@ -170,7 +170,7 @@ struct GNUNET_DHTU_PreferenceHandle
  */
 struct Plugin
 {
-  /** 
+  /**
    * Callbacks into the DHT.
    */
   struct GNUNET_DHTU_PluginEnvironment *env;
@@ -200,7 +200,7 @@ struct Plugin
    * Map from hashes of sockaddrs to targets.
    */
   struct GNUNET_CONTAINER_MultiHashMap *dsts;
-  
+
   /**
    * Task that scans for IP address changes.
    */
@@ -212,7 +212,7 @@ struct Plugin
   struct GNUNET_SCHEDULER_Task *read_task;
 
   /**
-   * Port we bind to. 
+   * Port we bind to.
    */
   char *port;
 
@@ -290,7 +290,7 @@ create_target (struct Plugin *plugin,
       GNUNET_CONTAINER_multihashmap_size (plugin->dsts))
   {
     struct GNUNET_HashCode key;
-    
+
     dst = NULL;
     for (struct GNUNET_DHTU_Target *pos = plugin->dst_head;
          NULL != pos;
@@ -316,7 +316,7 @@ create_target (struct Plugin *plugin,
     GNUNET_assert (NULL == dst->ph_head);
     GNUNET_free (dst);
   }
-  pk.size = htons (sizeof (pk));  
+  pk.size = htons (sizeof (pk));
   dst = GNUNET_new (struct GNUNET_DHTU_Target);
   dst->addrlen = addrlen;
   memcpy (&dst->addr,
@@ -391,10 +391,10 @@ find_target (struct Plugin *plugin,
                          addrlen);
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CONTAINER_multihashmap_put (
-                                                      plugin->dsts,
-                                                      &key,
-                                                      dst,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+                     plugin->dsts,
+                     &key,
+                     dst,
+                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   }
   else
   {
@@ -429,7 +429,7 @@ ip_try_connect (void *cls,
     .ai_flags = AI_NUMERICHOST | AI_NUMERICSERV
   };
   struct addrinfo *result = NULL;
-  
+
   if (0 !=
       strncmp (address,
                "ip+",
@@ -481,7 +481,7 @@ ip_try_connect (void *cls,
  * Request underlay to keep the connection to @a target alive if possible.
  * Hold may be called multiple times to express a strong preference to
  * keep a connection, say because a @a target is in multiple tables.
- * 
+ *
  * @param cls closure
  * @param target connection to keep alive
  */
@@ -503,7 +503,7 @@ ip_hold (void *cls,
 
 /**
  * Do no long request underlay to keep the connection alive.
- * 
+ *
  * @param cls closure
  * @param target connection to keep alive
  */
@@ -511,7 +511,7 @@ static void
 ip_drop (struct GNUNET_DHTU_PreferenceHandle *ph)
 {
   struct GNUNET_DHTU_Target *target = ph->target;
-  
+
   GNUNET_CONTAINER_DLL_remove (target->ph_head,
                                target->ph_tail,
                                ph);
@@ -532,7 +532,7 @@ ip_drop (struct GNUNET_DHTU_PreferenceHandle *ph)
  * @param msg_size number of bytes in @a msg
  * @param finished_cb function called once transmission is done
  *        (not called if @a target disconnects, then only the
- *         disconnect_cb is called). 
+ *         disconnect_cb is called).
  * @param finished_cb_cls closure for @a finished_cb
  */
 static void
@@ -568,7 +568,7 @@ create_source (struct Plugin *plugin,
                socklen_t addrlen)
 {
   struct GNUNET_DHTU_Source *src;
-  
+
   src = GNUNET_new (struct GNUNET_DHTU_Source);
   src->addrlen = addrlen;
   memcpy (&src->addr,
@@ -731,7 +731,7 @@ find_source (struct Plugin *plugin,
          (0 == memcmp (addr,
                        &src->addr,
                        addrlen)) )
-        return src;
+      return src;
   }
 
   return create_source (plugin,
@@ -788,7 +788,7 @@ read_cb (void *cls)
             cmsg->cmsg_len)
         {
           struct in_pktinfo pi;
-          
+
           memcpy (&pi,
                   CMSG_DATA (cmsg),
                   sizeof (pi));
@@ -797,7 +797,7 @@ read_cb (void *cls)
               .sin_family = AF_INET,
               .sin_addr = pi.ipi_addr
             };
-          
+
             src = find_source (plugin,
                                &sa,
                                sizeof (sa));
@@ -814,7 +814,7 @@ read_cb (void *cls)
             cmsg->cmsg_len)
         {
           struct in6_pktinfo pi;
-          
+
           memcpy (&pi,
                   CMSG_DATA (cmsg),
                   sizeof (pi));
@@ -824,7 +824,7 @@ read_cb (void *cls)
               .sin6_addr = pi.ipi6_addr,
               .sin6_scope_id = pi.ipi6_ifindex
             };
-          
+
             src = find_source (plugin,
                                &sa,
                                sizeof (sa));
@@ -833,7 +833,7 @@ read_cb (void *cls)
         }
         else
           GNUNET_break (0);
-      }   
+      }
     }
     dst = find_target (plugin,
                        &sa,
@@ -932,7 +932,8 @@ libgnunet_plugin_dhtu_ip_init (void *cls)
     GNUNET_free (plugin);
     return NULL;
   }
-  switch (af) {
+  switch (af)
+  {
   case AF_INET:
     {
       int on = 1;
@@ -956,7 +957,7 @@ libgnunet_plugin_dhtu_ip_init (void *cls)
 
       if (0 !=
           bind (sock,
-                &sa,
+                (const struct sockaddr *) &sa,
                 sizeof (sa)))
       {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
@@ -989,10 +990,10 @@ libgnunet_plugin_dhtu_ip_init (void *cls)
         .sin6_family = AF_INET6,
         .sin6_port = htons ((uint16_t) nport)
       };
-      
+
       if (0 !=
           bind (sock,
-                &sa,
+                (const struct sockaddr *) &sa,
                 sizeof (sa)))
       {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/include/platform.h b/src/include/platform.h
index e641b38eb..dfa30aeee 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -22,7 +22,7 @@
  * @author Nils Durner
  * @author Christian Grothoff
  *
- * @file
+ * @file gnunet/src/include/platform.h
  * Platform specific includes and defines.
  *
  * This file should never be included by installed
diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c
index 4e614526b..b06a591cf 100644
--- a/src/pq/pq_connect.c
+++ b/src/pq/pq_connect.c
@@ -294,7 +294,7 @@ GNUNET_PQ_reconnect_if_down (struct GNUNET_PQ_Context *db)
 void
 GNUNET_PQ_reconnect (struct GNUNET_PQ_Context *db)
 {
-  if (NULL != db->sc) 
+  if (NULL != db->sc)
     db->sc (db->sc_cls,
             -1);
   if (NULL != db->conn)
@@ -468,6 +468,8 @@ GNUNET_PQ_connect_with_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
 void
 GNUNET_PQ_disconnect (struct GNUNET_PQ_Context *db)
 {
+  if (NULL == db)
+    return;
   GNUNET_assert (0 ==
                  GNUNET_CONTAINER_multishortmap_size (db->channel_map));
   GNUNET_CONTAINER_multishortmap_destroy (db->channel_map);
diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index 1df1cd126..ffbb4d129 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -38,7 +38,7 @@ static int ret;
 /**
  * An event handler.
  */
-static struct GNUNET_PQ_EventHandler *eh;
+static struct GNUNET_DB_EventHandler *eh;
 
 /**
  * Timeout task.
@@ -129,7 +129,7 @@ run_queries (struct GNUNET_PQ_Context *db)
   uint64_t u64;
   uint64_t u642;
   uint64_t uzzz = 42;
-  
+
   priv = GNUNET_CRYPTO_rsa_private_key_create (1024);
   pub = GNUNET_CRYPTO_rsa_private_key_get_public (priv);
   memset (&hmsg, 42, sizeof(hmsg));
@@ -264,16 +264,16 @@ event_cb (void *cls,
 static int
 test_notify (struct GNUNET_PQ_Context *db)
 {
-  struct GNUNET_PQ_EventHeaderP e1 = {
+  struct GNUNET_DB_EventHeaderP e1 = {
     .size = htons (sizeof (e1)),
     .type = htons (1)
   };
-  struct GNUNET_PQ_EventHeaderP e2 = {
+  struct GNUNET_DB_EventHeaderP e2 = {
     .size = htons (sizeof (e2)),
     .type = htons (2)
   };
   unsigned int called = 0;
-  struct GNUNET_PQ_EventHandler *eh;
+  struct GNUNET_DB_EventHandler *eh;
 
   eh = GNUNET_PQ_event_listen (db,
                                &e1,
@@ -359,7 +359,7 @@ event_sched_cb (void *cls,
 static void
 sched_tests (void *cls)
 {
-  struct GNUNET_PQ_EventHeaderP es = {
+  struct GNUNET_DB_EventHeaderP es = {
     .size = htons (sizeof (es)),
     .type = htons (42)
   };
@@ -382,7 +382,7 @@ sched_tests (void *cls)
                           5);
 }
 
-             
+
 int
 main (int argc,
       const char *const argv[])
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 2d258bfc5..b01b897d8 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -1746,8 +1746,8 @@ full_sync_plausibility_check (struct Operation *op)
     {
       LOG (GNUNET_ERROR_TYPE_ERROR,
            "PROTOCOL VIOLATION: Received duplicate element in full receiving "
-           "mode of operation this is not allowed! Duplicates: %lu\n",
-           duplicates);
+           "mode of operation this is not allowed! Duplicates: %llu\n",
+           (unsigned long long) duplicates);
       GNUNET_break_op (0);
       fail_union_operation (op);
       return;
@@ -2184,10 +2184,10 @@ send_ibf (struct Operation *op,
                      buckets_in_message, &msg[1], msg->ibf_counter_bit_length);
     buckets_sent += buckets_in_message;
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "ibf chunk size %u, %lu/%u sent\n",
-         buckets_in_message,
-         buckets_sent,
-         ibf_size);
+         "ibf chunk size %u, %llu/%u sent\n",
+         (unsigned int) buckets_in_message,
+         (unsigned long long) buckets_sent,
+         (unsigned int) ibf_size);
     GNUNET_MQ_send (op->mq, ev);
   }
 
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 93bc03189..dff3c2e99 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -322,7 +322,9 @@ GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg)
     GNUNET_CONTAINER_DLL_remove (cfg->loaded_files_head,
                                  cfg->loaded_files_tail,
                                  cf);
+    GNUNET_free (cf);
   }
+  GNUNET_free (cfg->main_filename);
   GNUNET_free (cfg);
 }
 
@@ -336,7 +338,9 @@ GNUNET_CONFIGURATION_parse_and_run (const char *filename,
   enum GNUNET_GenericReturnValue ret;
 
   cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, filename))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_load (cfg,
+                                 filename))
   {
     GNUNET_break (0);
     GNUNET_CONFIGURATION_destroy (cfg);
@@ -620,7 +624,7 @@ handle_inline (struct GNUNET_CONFIGURATION_Handle *cfg,
   {
     fun_ret = GNUNET_OK;
   }
- cleanup:
+cleanup:
   cfg->current_nest_level = old_nest_level;
   if (NULL != other_cfg)
     GNUNET_CONFIGURATION_destroy (other_cfg);
@@ -2314,7 +2318,7 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
     if (fun_ret != GNUNET_OK)
       break;
   }
- cleanup:
+cleanup:
   if (files_context.files_length > 0)
   {
     for (size_t i = 0; i < files_context.files_length; i++)
@@ -2467,7 +2471,10 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
   }
   cfg->load_called = true;
   if (NULL != filename)
+  {
+    GNUNET_free (cfg->main_filename);
     cfg->main_filename = GNUNET_strdup (filename);
+  }
 
   base_config_varname = GNUNET_OS_project_data_get ()->base_config_varname;