5 files changed, 15 insertions, 8 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 8eb86ac11..4663c4c7b 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -374,12 +374,12 @@ struct GAS_Addresses_Handle
  *
  * Updates existing information and adds new information
  *
- * @param src source ATS information
- * @param ats_count number of ATS information
- * @param delta ats performance information which were updated
+ * @param dest destination address
+ * @param update source ATS information
+ * @param update_count number of ATS information
+ * @param delta_dest ats performance information which were updated
  *                              including previous value
  * @param delta_count number of ATS information in the delta
- * @param dest destination address
  * @return GNUNET_YES if address was address updated, GNUNET_NO otherwise
  */
 static unsigned int
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c
index dfede6c9b..b14a7af95 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.c
+++ b/src/ats/gnunet-service-ats_addresses_mlp.c
@@ -1040,6 +1040,7 @@ GAS_mlp_solve_problem (void *solver, struct GNUNET_CONTAINER_MultiHashMap * addr
  *
  * @param solver the solver Handle
  * @param addresses the address hashmap containing all addresses
+ * @param address the address to add
  * @param network network type of this address
  */
 void
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c
index 598c8ee20..de5bcfd0a 100644
--- a/src/ats/gnunet-service-ats_addresses_simplistic.c
+++ b/src/ats/gnunet-service-ats_addresses_simplistic.c
@@ -928,8 +928,8 @@ find_network (struct GAS_SIMPLISTIC_Handle *s, uint32_t type)
  * @param address the update address
  * @param session the new session (if changed otherwise current)
  * @param in_use the new address in use state (if changed otherwise current)
- * @param atsi the latest ATS information
- * @param atsi_count the atsi count
+ * @param prev_ats the latest ATS information
+ * @param prev_atsi_count the atsi count
  */
 void
 GAS_simplistic_address_update (void *solver,
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.h b/src/ats/gnunet-service-ats_addresses_simplistic.h
index a97351efa..98d28999f 100644
--- a/src/ats/gnunet-service-ats_addresses_simplistic.h
+++ b/src/ats/gnunet-service-ats_addresses_simplistic.h
@@ -102,8 +102,8 @@ GAS_simplistic_address_add (void *solver,
  * @param address the update address
  * @param session the new session (if changed otherwise current)
  * @param in_use the new address in use state (if changed otherwise current)
- * @param atsi the latest ATS information
- * @param atsi_count the atsi count
+ * @param prev_ats the latest ATS information
+ * @param prev_atsi_count the atsi count
  */
 void
 GAS_simplistic_address_update (void *solver,
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 90246827f..8b113f9ce 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -510,16 +510,22 @@ bind_address (const struct GNUNET_PeerIdentity *peer,
   GNUNET_assert (NULL != host);
   if (NULL == host->hello)
   {
+                GNUNET_break (0);
     host->hello = GNUNET_malloc (GNUNET_HELLO_size (hello));
     memcpy (host->hello, hello, GNUNET_HELLO_size (hello));
   }
   else
   {
+
+        if (GNUNET_HELLO_is_friend_only (host->hello) != GNUNET_HELLO_is_friend_only (hello))
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Merging public with friend only HELLO, result will be friend-only!\n");
     mrg = GNUNET_HELLO_merge (host->hello, hello);
     delta = GNUNET_HELLO_equals (mrg, host->hello, GNUNET_TIME_absolute_get ());
     if (delta.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value)
     {
       /* no differences, just ignore the update */
+        GNUNET_break (0);
       GNUNET_free (mrg);
       return;
     }