-code cleanup

[oweals/gnunet.git] / src / core / core_api_iterate_peers.c

diff --git a/src/core/core_api_iterate_peers.c b/src/core/core_api_iterate_peers.c
index 1bad9a768f2551aa545b2d2b6f5ef77d157a13ff..7b28842fd58d9e52055e28208e8a0c9ab9ba8a58 100644 (file)
--- a/src/core/core_api_iterate_peers.c
+++ b/src/core/core_api_iterate_peers.c
@@ -79,7 +79,7 @@ receive_info (void *cls, const struct GNUNET_MessageHeader *msg)
        (ntohs (msg->size) == sizeof (struct GNUNET_MessageHeader))))
   {
     if (request_context->peer_cb != NULL)
-      request_context->peer_cb (request_context->cb_cls, NULL, 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;
@@ -92,32 +92,30 @@ receive_info (void *cls, const struct GNUNET_MessageHeader *msg)
   {
     GNUNET_break (0);
     if (request_context->peer_cb != NULL)
-      request_context->peer_cb (request_context->cb_cls, NULL, 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)))
+  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);
+      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->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);
 }
 
@@ -194,16 +192,13 @@ GNUNET_CORE_is_peer_connected (const struct GNUNET_CONFIGURATION_Handle *cfg,
   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);
+  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 ());
@@ -238,13 +233,11 @@ 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 ());