taking care of send msg size in the api

3 files changed, 21 insertions, 3 deletions

diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 937eee17f..4020118c9 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -38,8 +38,6 @@
 
 // TODO modify @brief in every file
 
-// TODO take care that messages are not longer than 64k
-
 // TODO check for overflows
 
 // TODO align message structs
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index 13f488351..d7e3fc4ed 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -228,10 +228,29 @@ GNUNET_RPS_request_peers (struct GNUNET_RPS_Handle *h, uint32_t n,
 GNUNET_RPS_seed_ids (struct GNUNET_RPS_Handle *h, uint64_t n,
                      const struct GNUNET_PeerIdentity * ids)
 {
+  uint32_t size_needed;
+  uint32_t tmp_num_peers;
   struct GNUNET_MQ_Envelope *ev;
   struct GNUNET_RPS_CS_SeedMessage *msg;
 
-  // FIXME was not able to find MAX size we are allowed to send
+  size_needed = sizeof (struct GNUNET_RPS_CS_SeedMessage) +
+                n * sizeof (struct GNUNET_PeerIdentity);
+
+  while (GNUNET_SERVER_MAX_MESSAGE_SIZE < size_needed)
+  {
+    tmp_num_peers = (GNUNET_SERVER_MAX_MESSAGE_SIZE -
+        sizeof (struct GNUNET_RPS_CS_SeedMessage)) /
+      sizeof (struct GNUNET_PeerIdentity);
+    n -= tmp_num_peers;
+    size_needed = sizeof (struct GNUNET_RPS_CS_SeedMessage) +
+                  n * sizeof (struct GNUNET_PeerIdentity);
+
+    ev = GNUNET_MQ_msg_extra (msg, tmp_num_peers * sizeof (struct GNUNET_PeerIdentity),
+        GNUNET_MESSAGE_TYPE_RPS_CS_SEED);
+    msg->num_peers = GNUNET_htonll (tmp_num_peers);
+    memcpy (&msg[1], ids, tmp_num_peers * sizeof (struct GNUNET_PeerIdentity));
+    GNUNET_MQ_send (h->mq, ev);
+  }
 
   ev = GNUNET_MQ_msg_extra (msg, n * sizeof (struct GNUNET_PeerIdentity),
                             GNUNET_MESSAGE_TYPE_RPS_CS_SEED);
diff --git a/src/rps/test_rps_multipeer.c b/src/rps/test_rps_multipeer.c
index f45558a1b..2a55eb49b 100644
--- a/src/rps/test_rps_multipeer.c
+++ b/src/rps/test_rps_multipeer.c
@@ -207,6 +207,7 @@ rps_connect_complete_cb (void *cls,
                                 request_peers, peer);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10),
                                 seed_peers, peer);
+  // TODO test seeding > GNUNET_SERVER_MAX_MESSAGE_SIZE peers
 }