X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore_api_iterate_peers.c;h=7b28842fd58d9e52055e28208e8a0c9ab9ba8a58;hb=6d754e6c89fda8cb0da00c4152ffc6dcc707e6ce;hp=d1c3828bba74c1a89df33d29bee401e571249890;hpb=901d3f2df5795415ae833315b9f510597992da45;p=oweals%2Fgnunet.git

diff --git a/src/core/core_api_iterate_peers.c b/src/core/core_api_iterate_peers.c
index d1c3828bb..7b28842fd 100644
--- a/src/core/core_api_iterate_peers.c
+++ b/src/core/core_api_iterate_peers.c
@@ -31,7 +31,6 @@
 
 struct GNUNET_CORE_RequestContext
 {
-  
   /**
    * Our connection to the service.
    */
@@ -47,6 +46,11 @@ struct GNUNET_CORE_RequestContext
    */
   GNUNET_CORE_ConnectEventHandler peer_cb;
 
+  /**
+   * Peer to check for.
+   */
+  struct GNUNET_PeerIdentity *peer;
+
   /**
    * Closure for peer_cb.
    */
@@ -62,8 +66,7 @@ struct GNUNET_CORE_RequestContext
  * @param msg NULL on error or last entry
  */
 static void
-receive_info (void *cls,
-	      const struct GNUNET_MessageHeader *msg)
+receive_info (void *cls, const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_CORE_RequestContext *request_context = cls;
   const struct ConnectNotifyMessage *connect_message;
@@ -71,53 +74,49 @@ receive_info (void *cls,
   uint16_t msize;
 
   /* Handle last message or error case, disconnect and clean up */
-  msize = ntohs (msg->size);
-  if ( (msg == NULL) ||
+  if ((msg == NULL) ||
       ((ntohs (msg->type) == GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS_END) &&
-      (msize == sizeof (struct GNUNET_MessageHeader))) )
-    {
-      if (request_context->peer_cb != NULL)
-	request_context->peer_cb (request_context->cb_cls,
-                                  NULL, NULL);
-      GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
-      GNUNET_free (request_context);
-      return;
-    }
+       (ntohs (msg->size) == sizeof (struct GNUNET_MessageHeader))))
+  {
+    if (request_context->peer_cb != NULL)
+      request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
+    GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
+    GNUNET_free (request_context);
+    return;
+  }
 
+  msize = ntohs (msg->size);
   /* Handle incorrect message type or size, disconnect and clean up */
-  if ( (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT) ||
-       (msize < sizeof (struct ConnectNotifyMessage)) )
-    {
-      GNUNET_break (0);
-      if (request_context->peer_cb != NULL)
-        request_context->peer_cb (request_context->cb_cls,
-                                  NULL, NULL);
-      GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
-      GNUNET_free (request_context);
-      return;
-    }
+  if ((ntohs (msg->type) != GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT) ||
+      (msize < sizeof (struct ConnectNotifyMessage)))
+  {
+    GNUNET_break (0);
+    if (request_context->peer_cb != NULL)
+      request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
+    GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
+    GNUNET_free (request_context);
+    return;
+  }
   connect_message = (const struct ConnectNotifyMessage *) msg;
   ats_count = ntohl (connect_message->ats_count);
-  if ( (msize != sizeof (struct ConnectNotifyMessage) + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)) ||
-       (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR != ntohl ((&connect_message->ats)[ats_count].type)) )
-    {
-      GNUNET_break (0);
-      if (request_context->peer_cb != NULL)
-        request_context->peer_cb (request_context->cb_cls,
-                                  NULL, NULL);
-      GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
-      GNUNET_free (request_context);
-      return;
-    }
+  if (msize !=
+      sizeof (struct ConnectNotifyMessage) +
+      ats_count * sizeof (struct GNUNET_ATS_Information))
+  {
+    GNUNET_break (0);
+    if (request_context->peer_cb != NULL)
+      request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
+    GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
+    GNUNET_free (request_context);
+    return;
+  }
   /* Normal case */
   if (request_context->peer_cb != NULL)
-    request_context->peer_cb (request_context->cb_cls,
-                              &connect_message->peer,
-                              &connect_message->ats);
-  GNUNET_CLIENT_receive(request_context->client, 
-			&receive_info, 
-			request_context,
-			GNUNET_TIME_UNIT_FOREVER_REL);
+    request_context->peer_cb (request_context->cb_cls, &connect_message->peer,
+                              (const struct GNUNET_ATS_Information *)
+                              &connect_message[1], ats_count);
+  GNUNET_CLIENT_receive (request_context->client, &receive_info,
+                         request_context, GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 /**
@@ -132,26 +131,90 @@ receive_info (void *cls,
  * @return number of bytes written to buf
  */
 static size_t
-transmit_request(void *cls,
-                 size_t size, void *buf)
+transmit_request (void *cls, size_t size, void *buf)
 {
   struct GNUNET_MessageHeader *msg;
-  if ((size < sizeof(struct GNUNET_MessageHeader)) || (buf == NULL))
+  struct GNUNET_PeerIdentity *peer = cls;
+  int msize;
+
+  if (peer == NULL)
+    msize = sizeof (struct GNUNET_MessageHeader);
+  else
+    msize =
+        sizeof (struct GNUNET_MessageHeader) +
+        sizeof (struct GNUNET_PeerIdentity);
+
+  if ((size < msize) || (buf == NULL))
     return 0;
 
-  msg = (struct GNUNET_MessageHeader *)buf;
-  msg->size = htons (sizeof (struct GNUNET_MessageHeader));
-  msg->type = htons (GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS);
-  return sizeof(struct GNUNET_MessageHeader);
+  msg = (struct GNUNET_MessageHeader *) buf;
+  msg->size = htons (msize);
+  if (peer != NULL)
+  {
+    msg->type = htons (GNUNET_MESSAGE_TYPE_CORE_PEER_CONNECTED);
+    memcpy (&msg[1], peer, sizeof (struct GNUNET_PeerIdentity));
+  }
+  else
+    msg->type = htons (GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS);
+
+  return msize;
 }
 
 /**
- * Obtain statistics and/or change preferences for the given peer.
+ * Iterate over all currently connected peers.
+ * Calls peer_cb with each connected peer, and then
+ * once with NULL to indicate that all peers have
+ * been handled.
  *
- * @param sched scheduler to use
  * @param cfg configuration to use
+ * @param peer the specific peer to check for
  * @param peer_cb function to call with the peer information
  * @param cb_cls closure for peer_cb
+ *
+ * @return GNUNET_OK if iterating, GNUNET_SYSERR on error
+ */
+int
+GNUNET_CORE_is_peer_connected (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                               struct GNUNET_PeerIdentity *peer,
+                               GNUNET_CORE_ConnectEventHandler peer_cb,
+                               void *cb_cls)
+{
+  struct GNUNET_CORE_RequestContext *request_context;
+  struct GNUNET_CLIENT_Connection *client;
+
+  client = GNUNET_CLIENT_connect ("core", cfg);
+  if (client == NULL)
+    return GNUNET_SYSERR;
+  GNUNET_assert (peer != NULL);
+  request_context = GNUNET_malloc (sizeof (struct GNUNET_CORE_RequestContext));
+  request_context->client = client;
+  request_context->peer_cb = peer_cb;
+  request_context->cb_cls = cb_cls;
+  request_context->peer = peer;
+
+  request_context->th =
+      GNUNET_CLIENT_notify_transmit_ready (client,
+                                           sizeof (struct GNUNET_MessageHeader)
+                                           +
+                                           sizeof (struct GNUNET_PeerIdentity),
+                                           GNUNET_TIME_relative_get_forever (),
+                                           GNUNET_YES, &transmit_request, peer);
+  GNUNET_assert (request_context->th != NULL);
+  GNUNET_CLIENT_receive (client, &receive_info, request_context,
+                         GNUNET_TIME_relative_get_forever ());
+  return GNUNET_OK;
+}
+
+/**
+ * Iterate over all currently connected peers.
+ * Calls peer_cb with each connected peer, and then
+ * once with NULL to indicate that all peers have
+ * been handled.
+ *
+ * @param cfg configuration to use
+ * @param peer_cb function to call with the peer information
+ * @param cb_cls closure for peer_cb
+ *
  * @return GNUNET_OK if iterating, GNUNET_SYSERR on error
  */
 int
@@ -170,14 +233,14 @@ GNUNET_CORE_iterate_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
   request_context->peer_cb = peer_cb;
   request_context->cb_cls = cb_cls;
 
-  request_context->th = GNUNET_CLIENT_notify_transmit_ready(client,
-                                                            sizeof(struct GNUNET_MessageHeader),
-                                                            GNUNET_TIME_relative_get_forever(),
-                                                            GNUNET_YES,
-                                                            &transmit_request,
-                                                            NULL);
+  request_context->th =
+      GNUNET_CLIENT_notify_transmit_ready (client,
+                                           sizeof (struct GNUNET_MessageHeader),
+                                           GNUNET_TIME_relative_get_forever (),
+                                           GNUNET_YES, &transmit_request, NULL);
 
-  GNUNET_CLIENT_receive(client, &receive_info, request_context, GNUNET_TIME_relative_get_forever());
+  GNUNET_CLIENT_receive (client, &receive_info, request_context,
+                         GNUNET_TIME_relative_get_forever ());
   return GNUNET_OK;
 }