fixing iteration code to handle ATS structs

diff --git a/src/core/core_api_iterate_peers.c b/src/core/core_api_iterate_peers.c
index 6577683633983eb474eda6339d7477dd43e29676..d1c3828bba74c1a89df33d29bee401e571249890 100644 (file)
--- a/src/core/core_api_iterate_peers.c
+++ b/src/core/core_api_iterate_peers.c
@@ -67,12 +67,14 @@ receive_info (void *cls,
 {
   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 */
+  msize = ntohs (msg->size);
   if ( (msg == NULL) ||
-      ((ntohs (msg->type) == GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT) &&
-      (ntohs (msg->size) == sizeof (struct GNUNET_MessageHeader))) )
+      ((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,
@@ -84,7 +86,7 @@ receive_info (void *cls,
 
   /* 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)) )
+       (msize < sizeof (struct ConnectNotifyMessage)) )
     {
       GNUNET_break (0);
       if (request_context->peer_cb != NULL)
@@ -94,15 +96,28 @@ receive_info (void *cls,
       GNUNET_free (request_context);
       return;
     }
-
-  /* Normal case */
   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;
+    }
+  /* Normal case */
   if (request_context->peer_cb != NULL)
     request_context->peer_cb (request_context->cb_cls,
                               &connect_message->peer,
-                              NULL);
-
-  GNUNET_CLIENT_receive(request_context->client, &receive_info, request_context, GNUNET_TIME_relative_get_forever());
+                              &connect_message->ats);
+  GNUNET_CLIENT_receive(request_context->client, 
+                       &receive_info, 
+                       request_context,
+                       GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 /**

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 36bcebc2e90a4fefb10c1b83b67ca09dd27eede4..f27ed134a2eaed15639d83d45e5ec5993b3f2a71 100644 (file)
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -1452,7 +1452,7 @@ handle_client_iterate_peers (void *cls,
       n = n->next;
     }
   done_msg.size = htons (sizeof (struct GNUNET_MessageHeader));
-  done_msg.type = htons (GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT);
+  done_msg.type = htons (GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS_END);
   GNUNET_SERVER_transmit_context_append_message (tc, &done_msg);
   GNUNET_SERVER_transmit_context_run (tc,
                                       GNUNET_TIME_UNIT_FOREVER_REL);

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 5f54cddeca1770b4ac5edbe7bdb3b8575fb4b853..96e7094568ac73098766c76648aaae17c7978a7b 100644 (file)
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -382,6 +382,11 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS 78
 
+/**
+ * Last reply from core to request for peer iteration from CORE service.
+ */
+#define GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS_END 79
+
 /**
  * Session key exchange between peers.
  */