[GNUnet-SVN] r31194 - in gnunet/src: include testbed transport

[gnunet]

Author: grothoff
Date: 2013-12-09 00:14:40 +0100 (Mon, 09 Dec 2013)
New Revision: 31194

Modified:
   gnunet/src/include/gnunet_transport_service.h
   gnunet/src/testbed/gnunet-service-testbed_connectionpool.c
   gnunet/src/testbed/gnunet-service-testbed_connectionpool.h
   gnunet/src/testbed/gnunet-service-testbed_oc.c
   gnunet/src/transport/transport_api.c
Log:
API cleanup, rename GNUNET_TRANSPORT_check_neighbour_connected to 
GNUNET_TRANSPORT_check_peer_connected

Modified: gnunet/src/include/gnunet_transport_service.h
===================================================================
--- gnunet/src/include/gnunet_transport_service.h       2013-12-08 23:11:15 UTC 
(rev 31193)
+++ gnunet/src/include/gnunet_transport_service.h       2013-12-08 23:14:40 UTC 
(rev 31194)
@@ -265,16 +265,15 @@
 
 
 /**
-  * Checks if a neighbour is connected
-  *
-  * @param handle connection to transport service
-  * @param peer the peer to check
-  * @return GNUNET_YES or GNUNET_NO
-  *
-  */
+ * Checks if a given peer is connected to us
+ *
+ * @param handle connection to transport service
+ * @param peer the peer to check
+ * @return #GNUNET_YES (connected) or #GNUNET_NO (disconnected)
+ */
 int
-GNUNET_TRANSPORT_check_neighbour_connected (struct GNUNET_TRANSPORT_Handle 
*handle,
-                                                               const struct 
GNUNET_PeerIdentity *peer);
+GNUNET_TRANSPORT_check_peer_connected (struct GNUNET_TRANSPORT_Handle *handle,
+                                            const struct GNUNET_PeerIdentity 
*peer);
 
 
 /**

Modified: gnunet/src/testbed/gnunet-service-testbed_connectionpool.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_connectionpool.c  2013-12-08 
23:11:15 UTC (rev 31193)
+++ gnunet/src/testbed/gnunet-service-testbed_connectionpool.c  2013-12-08 
23:14:40 UTC (rev 31194)
@@ -734,7 +734,7 @@
  *
  * @note @a connect_notify_cb will not be called if @a target is
  * already connected @a service level. Use
- * GNUNET_TRANSPORT_check_neighbour_connected() or a similar function from the
+ * GNUNET_TRANSPORT_check_peer_connected() or a similar function from the
  * respective @a service's API to check if the target peer is already 
connected or
  * not. @a connect_notify_cb will be called only once or never (in case @a 
target
  * cannot be connected or is already connected).

Modified: gnunet/src/testbed/gnunet-service-testbed_connectionpool.h
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_connectionpool.h  2013-12-08 
23:11:15 UTC (rev 31193)
+++ gnunet/src/testbed/gnunet-service-testbed_connectionpool.h  2013-12-08 
23:14:40 UTC (rev 31194)
@@ -111,7 +111,7 @@
  *
  * @note @a connect_notify_cb will not be called if @a target is
  * already connected @a service level. Use
- * GNUNET_TRANSPORT_check_neighbour_connected() or a similar function from the
+ * GNUNET_TRANSPORT_check_peer_connected() or a similar function from the
  * respective @a service's API to check if the target peer is already 
connected or
  * not. @a connect_notify_cb will be called only once or never (in case @a 
target
  * cannot be connected or is already connected).

Modified: gnunet/src/testbed/gnunet-service-testbed_oc.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_oc.c      2013-12-08 23:11:15 UTC 
(rev 31193)
+++ gnunet/src/testbed/gnunet-service-testbed_oc.c      2013-12-08 23:14:40 UTC 
(rev 31194)
@@ -1669,7 +1669,7 @@
   rocc->tcc.th_ = th;
   rocc->tcc.pid = &rocc->a_id;
   if (GNUNET_YES ==
-      GNUNET_TRANSPORT_check_neighbour_connected (rocc->tcc.th_, 
rocc->tcc.pid))
+      GNUNET_TRANSPORT_check_peer_connected (rocc->tcc.th_, rocc->tcc.pid))
   {
     LOG_DEBUG ("0x%llx: Target peer %4s already connected to local peer: %u\n",
                rocc->op_id, GNUNET_i2s (&rocc->a_id), rocc->peer->id);

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2013-12-08 23:11:15 UTC (rev 
31193)
+++ gnunet/src/transport/transport_api.c        2013-12-08 23:14:40 UTC (rev 
31194)
@@ -1031,7 +1031,8 @@
     h->client = NULL;
   }
   /* Forget about all neighbours that we used to be connected to */
-  GNUNET_CONTAINER_multipeermap_iterate (h->neighbours, &neighbour_delete, h);
+  GNUNET_CONTAINER_multipeermap_iterate (h->neighbours,
+                                         &neighbour_delete, h);
   if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel (h->quota_task);
@@ -1374,8 +1375,15 @@
 }
 
 
+/**
+ * Checks if a given peer is connected to us
+ *
+ * @param handle connection to transport service
+ * @param peer the peer to check
+ * @return #GNUNET_YES (connected) or #GNUNET_NO (disconnected)
+ */
 int
-GNUNET_TRANSPORT_check_neighbour_connected (struct GNUNET_TRANSPORT_Handle 
*handle,
+GNUNET_TRANSPORT_check_peer_connected (struct GNUNET_TRANSPORT_Handle *handle,
                                            const struct GNUNET_PeerIdentity 
*peer)
 {
   if (GNUNET_YES ==