social: relay msgs; psyc: slicer api; multicast: reset fragment_offset

2 files changed, 43 insertions, 40 deletions

diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c
index 75a94bcb7..38ec10e4d 100644
--- a/src/psyc/gnunet-service-psyc.c
+++ b/src/psyc/gnunet-service-psyc.c
@@ -1030,9 +1030,12 @@ client_send_mcast_req (struct Master *mst,
   pmsg->fragment_offset = req->fragment_offset;
   pmsg->flags = htonl (GNUNET_PSYC_MESSAGE_REQUEST);
   pmsg->slave_pub_key = req->member_pub_key;
-
   memcpy (&pmsg[1], &req[1], size - sizeof (*req));
+
   client_send_msg (chn, &pmsg->header);
+
+  /* FIXME: save req to PSYCstore so that it can be resent later to clients */
+
   GNUNET_free (pmsg);
 }
 
@@ -2057,12 +2060,14 @@ slave_transmit_notify (void *cls, size_t *data_size, void *data)
 static void
 master_transmit_message (struct Master *mst)
 {
-  if (NULL == mst->chn.tmit_head)
+  struct Channel *chn = &mst->chn;
+  struct TransmitMessage *tmit_msg = chn->tmit_head;
+  if (NULL == tmit_msg)
     return;
   if (NULL == mst->tmit_handle)
   {
     mst->tmit_handle
-      = GNUNET_MULTICAST_origin_to_all (mst->origin, mst->chn.tmit_head->id,
+      = GNUNET_MULTICAST_origin_to_all (mst->origin, tmit_msg->id,
                                         mst->max_group_generation,
                                         master_transmit_notify, mst);
   }
@@ -2167,12 +2172,18 @@ slave_queue_message (struct Slave *slv, struct TransmitMessage *tmit_msg)
 /**
  * Queue PSYC message parts for sending to multicast.
  *
- * @param chn           Channel to send to.
- * @param client       Client the message originates from.
- * @param data_size    Size of @a data.
- * @param data         Concatenated message parts.
- * @param first_ptype  First message part type in @a data.
- * @param last_ptype   Last message part type in @a data.
+ * @param chn
+ *        Channel to send to.
+ * @param client
+ *        Client the message originates from.
+ * @param data_size
+ *        Size of @a data.
+ * @param data
+ *        Concatenated message parts.
+ * @param first_ptype
+ *        First message part type in @a data.
+ * @param last_ptype
+ *        Last message part type in @a data.
  */
 static struct TransmitMessage *
 queue_message (struct Channel *chn,
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c
index d0380b21b..4aae5e122 100644
--- a/src/psyc/test_psyc.c
+++ b/src/psyc/test_psyc.c
@@ -203,34 +203,29 @@ end ()
 
 
 void
-master_message_cb (void *cls, uint64_t message_id, uint32_t flags,
-                   const struct GNUNET_PSYC_MessageHeader *msg)
+master_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg)
 {
   GNUNET_assert (NULL != msg);
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%d: Master got PSYC message fragment of size %u "
               "belonging to message ID %" PRIu64 " with flags %x\n",
-              test, ntohs (msg->header.size), message_id, flags);
+              test, ntohs (msg->header.size),
+              GNUNET_ntohll (msg->message_id), ntohl (msg->flags));
   // FIXME
 }
 
 
 void
-master_message_part_cb (void *cls,
-                        const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key,
-                        uint64_t message_id, uint32_t flags, uint64_t data_offset,
-                        const struct GNUNET_MessageHeader *msg)
+master_message_part_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg,
+                        const struct GNUNET_MessageHeader *pmsg)
 {
-  if (NULL == msg)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Test #%d: Error while master is receiving part of message #%" PRIu64 ".\n",
-                test, message_id);
-    return;
-  }
+  GNUNET_assert (NULL != msg && NULL != pmsg);
 
-  uint16_t type = ntohs (msg->type);
-  uint16_t size = ntohs (msg->size);
+  uint64_t message_id = GNUNET_ntohll (msg->message_id);
+  uint32_t flags = ntohl (msg->flags);
+
+  uint16_t type = ntohs (pmsg->type);
+  uint16_t size = ntohs (pmsg->size);
 
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%d: Master got message part of type %u and size %u "
@@ -278,33 +273,30 @@ master_message_part_cb (void *cls,
 
 
 void
-slave_message_cb (void *cls, uint64_t message_id, uint32_t flags,
-                  const struct GNUNET_PSYC_MessageHeader *msg)
+slave_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg)
 {
+  GNUNET_assert (NULL != msg);
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%d: Slave got PSYC message fragment of size %u "
               "belonging to message ID %" PRIu64 " with flags %x\n",
-              test, ntohs (msg->header.size), message_id, flags);
+              test, ntohs (msg->header.size),
+              GNUNET_ntohll (msg->message_id), ntohl (msg->flags));
   // FIXME
 }
 
 
 void
 slave_message_part_cb (void *cls,
-                       const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key,
-                       uint64_t message_id, uint32_t flags, uint64_t data_offset,
-                       const struct GNUNET_MessageHeader *msg)
+                       const struct GNUNET_PSYC_MessageHeader *msg,
+                       const struct GNUNET_MessageHeader *pmsg)
 {
-  if (NULL == msg)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Test #%d: Error while slave is receiving part of message #%" PRIu64 ".\n",
-                test, message_id);
-    return;
-  }
+  GNUNET_assert (NULL != msg && NULL != pmsg);
+
+  uint64_t message_id = GNUNET_ntohll (msg->message_id);
+  uint32_t flags = ntohl (msg->flags);
 
-  uint16_t type = ntohs (msg->type);
-  uint16_t size = ntohs (msg->size);
+  uint16_t type = ntohs (pmsg->type);
+  uint16_t size = ntohs (pmsg->size);
 
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Test #%d: Slave got message part of type %u and size %u "