[GNUnet-SVN] r18404 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-11-30 15:45:27 +0100 (Wed, 30 Nov 2011)
New Revision: 18404

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/gnunet-service-transport_validation.c
   gnunet/src/transport/gnunet-service-transport_validation.h
Log:
some doxygen + refactoring of GST_validation_set_address_use


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-11-30 14:23:15 UTC 
(rev 18403)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-11-30 14:45:27 UTC 
(rev 18404)
@@ -118,7 +118,9 @@
  * We received some payload.  Prepare to pass it on to our clients.
  *
  * @param peer (claimed) identity of the other peer
- * @param message the message, never NULL
+ * @param address the address
+ * @param session session used
+ * @param msg the message to process
  * @param ats performance information
  * @param ats_count number of records in ats
  * @return how long the plugin should wait until receiving more data
@@ -369,6 +371,8 @@
  * @param session session to use (if available)
  * @param bandwidth_out assigned outbound bandwidth for the connection, 0 to 
disconnect from peer
  * @param bandwidth_in assigned inbound bandwidth for the connection, 0 to 
disconnect from peer
+ * @param ats ATS information
+ * @param number of ATS elements
  */
 static void
 ats_request_address_change (void *cls,

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-11-30 
14:23:15 UTC (rev 18403)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2011-11-30 
14:45:27 UTC (rev 18404)
@@ -894,7 +894,7 @@
     GNUNET_assert (NULL != n->address);
     if (n->address_state == USED)
     {
-      GST_validation_set_address_use (&n->id, n->address, n->session,
+      GST_validation_set_address_use (n->address, n->session,
                                       GNUNET_NO);
 
       GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_NO);
@@ -1245,7 +1245,7 @@
   case S_CONNECTED:
     if (n->address_state == FRESH)
     {
-      GST_validation_set_address_use (&n->id, cc->address, cc->session,
+      GST_validation_set_address_use (cc->address, cc->session,
                                       GNUNET_YES);
       GNUNET_ATS_address_update (GST_ats, cc->address, cc->session, NULL, 0);
       GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session, 
GNUNET_YES);
@@ -1265,7 +1265,7 @@
 
     if (n->address_state == FRESH)
     {
-      GST_validation_set_address_use (&n->id, cc->address, cc->session,
+      GST_validation_set_address_use (cc->address, cc->session,
                                       GNUNET_YES);
       GNUNET_ATS_address_update (GST_ats, cc->address, cc->session, NULL, 0);
       GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session, 
GNUNET_YES);
@@ -1431,7 +1431,7 @@
     GNUNET_assert (NULL != n->address);
     if (n->address_state == USED)
     {
-      GST_validation_set_address_use (&n->id, n->address, n->session,
+      GST_validation_set_address_use (n->address, n->session,
                                       GNUNET_NO);
       GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_NO);
       n->address_state = UNUSED;
@@ -1698,7 +1698,7 @@
   {
     if (n->address_state == USED)
     {
-      GST_validation_set_address_use (&n->id, n->address, n->session,
+      GST_validation_set_address_use (n->address, n->session,
                                       GNUNET_NO);
       GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_NO);
       n->address_state = UNUSED;
@@ -2334,7 +2334,7 @@
   GNUNET_assert (NULL != n->address);
   if (n->address_state == FRESH)
   {
-    GST_validation_set_address_use (&n->id, n->address, n->session, 
GNUNET_YES);
+    GST_validation_set_address_use (n->address, n->session, GNUNET_YES);
     GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES);
     n->address_state = USED;
   }
@@ -2421,7 +2421,7 @@
   GNUNET_assert (n->address != NULL);
   if (n->address_state == FRESH)
   {
-    GST_validation_set_address_use (&n->id, n->address, n->session, 
GNUNET_YES);
+    GST_validation_set_address_use (n->address, n->session, GNUNET_YES);
     GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES);
     n->address_state = USED;
   }

Modified: gnunet/src/transport/gnunet-service-transport_validation.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_validation.c  2011-11-30 
14:23:15 UTC (rev 18403)
+++ gnunet/src/transport/gnunet-service-transport_validation.c  2011-11-30 
14:45:27 UTC (rev 18404)
@@ -705,13 +705,12 @@
  *
  * @param cls the PONG message
  * @param public_key public key for the peer, never NULL
- * @param target peer this change is about, never NULL
  * @param valid_until is ZERO if we never validated the address,
  *                    otherwise a time up to when we consider it (or was) valid
  * @param validation_block  is FOREVER if the address is for an unsupported 
plugin (from PEERINFO)
  *                          is ZERO if the address is considered valid (no 
validation needed)
  *                          otherwise a time in the future if we're currently 
denying re-validation
- * @param adress target address
+ * @param address target address
  */
 static void
 multicast_pong (void *cls,
@@ -1165,15 +1164,15 @@
  * Based on this, the validation module will measure latency for the
  * address more or less often.
  *
- * @param sender peer FIXME: redundant!
  * @param address the address
+ * @param session the session
  * @param in_use GNUNET_YES if we are now using the address for a connection,
  *               GNUNET_NO if we are no longer using the address for a 
connection
  */
 void
-GST_validation_set_address_use (const struct GNUNET_PeerIdentity *sender,
-                                const struct GNUNET_HELLO_Address *address,
-                                struct Session *session, int in_use)
+GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
+                                struct Session *session,
+                                int in_use)
 {
   struct ValidationEntry *ve;
 
@@ -1189,7 +1188,7 @@
   if (ve->in_use == in_use)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "GST_validation_set_address_use: %s %s: ve->in_use %i <-> 
in_use %i\n",
-                GNUNET_i2s (sender), GST_plugins_a2s (address), ve->in_use,
+                GNUNET_i2s (&address->peer), GST_plugins_a2s (address), 
ve->in_use,
                 in_use);
   GNUNET_break (ve->in_use != in_use);  /* should be different... */
   ve->in_use = in_use;

Modified: gnunet/src/transport/gnunet-service-transport_validation.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_validation.h  2011-11-30 
14:23:15 UTC (rev 18403)
+++ gnunet/src/transport/gnunet-service-transport_validation.h  2011-11-30 
14:45:27 UTC (rev 18404)
@@ -51,15 +51,13 @@
  * Based on this, the validation module will measure latency for the
  * address more or less often.
  *
- * @param sender peer FIXME: redundant!
  * @param address the address
  * @param session session
  * @param in_use GNUNET_YES if we are now using the address for a connection,
  *               GNUNET_NO if we are no longer using the address for a 
connection
  */
 void
-GST_validation_set_address_use (const struct GNUNET_PeerIdentity *sender,
-                                const struct GNUNET_HELLO_Address *address,
+GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
                                 struct Session *session, int in_use);