[GNUnet-SVN] r26784 - in gnunet/src: ats peerinfo

[gnunet]

Author: wachs
Date: 2013-04-05 16:43:13 +0200 (Fri, 05 Apr 2013)
New Revision: 26784

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
Log:
doxygen


Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2013-04-05 14:11:40 UTC 
(rev 26783)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2013-04-05 14:43:13 UTC 
(rev 26784)
@@ -374,12 +374,12 @@
  *
  * 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

Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2013-04-05 14:11:40 UTC 
(rev 26783)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2013-04-05 14:43:13 UTC 
(rev 26784)
@@ -1040,6 +1040,7 @@
  *
  * @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

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2013-04-05 
14:11:40 UTC (rev 26783)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2013-04-05 
14:43:13 UTC (rev 26784)
@@ -928,8 +928,8 @@
  * @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,

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h    2013-04-05 
14:11:40 UTC (rev 26783)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h    2013-04-05 
14:43:13 UTC (rev 26784)
@@ -102,8 +102,8 @@
  * @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,

Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2013-04-05 14:11:40 UTC 
(rev 26783)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2013-04-05 14:43:13 UTC 
(rev 26784)
@@ -510,16 +510,22 @@
   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;
     }