struct GNUNET_CORE_RequestContext
{
-
/**
* Our connection to the service.
*/
*/
GNUNET_CORE_ConnectEventHandler peer_cb;
+ /**
+ * Peer to check for.
+ */
+ struct GNUNET_PeerIdentity *peer;
+
/**
* Closure for peer_cb.
*/
* @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;
-
+ uint32_t ats_count;
+ uint16_t msize;
/* Handle last message or error case, disconnect and clean up */
- if ( (msg == NULL) ||
- ((ntohs (msg->type) == GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT) &&
- (ntohs (msg->size) == sizeof (struct GNUNET_MessageHeader))) )
- {
- if (request_context->peer_cb != NULL)
- request_context->peer_cb (request_context->cb_cls,
- NULL, GNUNET_TIME_relative_get_zero(), 0);
- GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
- GNUNET_free (request_context);
- return;
- }
-
+ if ((msg == NULL) ||
+ ((ntohs (msg->type) == GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS_END) &&
+ (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_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) ||
- (ntohs (msg->size) != sizeof (struct ConnectNotifyMessage)) )
- {
- GNUNET_break (0);
- if (request_context->peer_cb != NULL)
- request_context->peer_cb (request_context->cb_cls,
- NULL, GNUNET_TIME_relative_get_zero(), 0);
- GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
- GNUNET_free (request_context);
- return;
- }
-
- /* Normal case */
+ 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_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_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_free (request_context);
+ return;
+ }
+ /* Normal case */
if (request_context->peer_cb != NULL)
- request_context->peer_cb (request_context->cb_cls,
- &connect_message->peer,
- GNUNET_TIME_relative_ntoh(connect_message->latency),
- ntohl (connect_message->distance));
-
- GNUNET_CLIENT_receive(request_context->client, &receive_info, request_context, GNUNET_TIME_relative_get_forever());
+ 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);
}
+
/**
* Function called to notify a client about the socket
* begin ready to queue more data. "buf" will be
* @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_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_iterate_peers (struct GNUNET_SCHEDULER_Handle *sched,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_CORE_iterate_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
GNUNET_CORE_ConnectEventHandler peer_cb,
void *cb_cls)
{
struct GNUNET_CORE_RequestContext *request_context;
struct GNUNET_CLIENT_Connection *client;
- client = GNUNET_CLIENT_connect (sched, "core", cfg);
+ client = GNUNET_CLIENT_connect ("core", cfg);
if (client == NULL)
return GNUNET_SYSERR;
request_context = GNUNET_malloc (sizeof (struct GNUNET_CORE_RequestContext));
request_context->peer_cb = peer_cb;
request_context->cb_cls = cb_cls;
- /*GNUNET_assert (GNUNET_OK == GNUNET_CLIENT_transmit_and_get_response (client,
- &request_message,
- GNUNET_TIME_relative_get_forever(),
- GNUNET_YES,
- &receive_info,
- request_context));*/
- 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());
+ request_context->th =
+ GNUNET_CLIENT_notify_transmit_ready (client,
+ sizeof (struct GNUNET_MessageHeader),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_YES, &transmit_request, NULL);
+
+ GNUNET_CLIENT_receive (client, &receive_info, request_context,
+ GNUNET_TIME_UNIT_FOREVER_REL);
return GNUNET_OK;
}
projects / oweals / gnunet.git / blobdiff