psycutil: slicer callback args

2 files changed, 26 insertions, 8 deletions

diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c
index 04d506c12..828506c07 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -769,13 +769,15 @@ place_recv_relay_method (void *cls,
                          const struct GNUNET_PSYC_MessageMethod *meth,
                          uint64_t message_id,
                          uint32_t flags,
+                         uint64_t fragment_offset,
+                         uint32_t tmit_flags,
                          const struct GNUNET_CRYPTO_EcdsaPublicKey *nym_pub_key,
                          const char *method_name)
 {
   struct Host *hst = cls;
   struct Place *plc = &hst->plc;
 
-  // FIXME: relay message
+
 }
 
 
@@ -783,6 +785,8 @@ static void
 place_recv_relay_modifier (void *cls,
                            const struct GNUNET_MessageHeader *msg,
                            uint64_t message_id,
+                           uint32_t flags,
+                           uint64_t fragment_offset,
                            enum GNUNET_PSYC_Operator oper,
                            const char *name,
                            const void *value,
@@ -797,6 +801,8 @@ static void
 place_recv_relay_eom (void *cls,
                       const struct GNUNET_MessageHeader *msg,
                       uint64_t message_id,
+                      uint32_t flags,
+                      uint64_t fragment_offset,
                       uint8_t cancelled)
 {
 
@@ -807,7 +813,8 @@ static void
 place_recv_relay_data (void *cls,
                        const struct GNUNET_MessageHeader *msg,
                        uint64_t message_id,
-                       uint64_t data_offset,
+                       uint32_t flags,
+                       uint64_t fragment_offset,
                        const void *data,
                        uint16_t data_size)
 {
@@ -820,6 +827,8 @@ place_recv_save_method (void *cls,
                         const struct GNUNET_PSYC_MessageMethod *meth,
                         uint64_t message_id,
                         uint32_t flags,
+                        uint64_t fragment_offset,
+                        uint32_t tmit_flags,
                         const struct GNUNET_CRYPTO_EcdsaPublicKey *nym_pub_key,
                         const char *method_name)
 {
@@ -852,7 +861,8 @@ static void
 place_recv_save_data (void *cls,
                       const struct GNUNET_MessageHeader *msg,
                       uint64_t message_id,
-                      uint64_t data_offset,
+                      uint32_t flags,
+                      uint64_t fragment_offset,
                       const void *data,
                       uint16_t data_size)
 {
@@ -888,6 +898,8 @@ static void
 place_recv_save_eom (void *cls,
                      const struct GNUNET_MessageHeader *msg,
                      uint64_t message_id,
+                     uint32_t flags,
+                     uint64_t fragment_offset,
                      uint8_t cancelled)
 {
   struct Place *plc = cls;
@@ -1235,10 +1247,10 @@ host_enter (const struct HostEnterRequest *hreq, struct Host **ret_hst)
 
 
 const struct MsgProcRequest *
-relay_req_parse (const struct GNUNET_MessageHeader *msg,
-                 uint32_t *flags,
-                 const char **method_prefix,
-                 struct GNUNET_HashCode *method_hash)
+msg_proc_parse (const struct GNUNET_MessageHeader *msg,
+                uint32_t *flags,
+                const char **method_prefix,
+                struct GNUNET_HashCode *method_hash)
 {
   const struct MsgProcRequest *mpreq = (const struct MsgProcRequest *) msg;
   uint8_t method_size = ntohs (mpreq->header.size) - sizeof (*mpreq);
@@ -1275,7 +1287,7 @@ client_recv_msg_proc_set (void *cls, struct GNUNET_SERVER_Client *client,
   uint32_t flags = 0;
   struct GNUNET_HashCode method_hash;
   const struct MsgProcRequest *
-    mpreq = relay_req_parse (msg, &flags, &method_prefix, &method_hash);
+    mpreq = msg_proc_parse (msg, &flags, &method_prefix, &method_hash);
 
   if (NULL == mpreq) {
     GNUNET_break (0);
diff --git a/src/social/social_api.c b/src/social/social_api.c
index 428afd2b9..c23987145 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -401,6 +401,8 @@ host_recv_notice_place_leave_method (void *cls,
                                      const struct GNUNET_PSYC_MessageMethod *meth,
                                      uint64_t message_id,
                                      uint32_t flags,
+                                     uint64_t fragment_offset,
+                                     uint32_t tmit_flags,
                                      const struct GNUNET_CRYPTO_EcdsaPublicKey *nym_pub_key,
                                      const char *method_name)
 {
@@ -430,6 +432,8 @@ static void
 host_recv_notice_place_leave_modifier (void *cls,
                                        const struct GNUNET_MessageHeader *msg,
                                        uint64_t message_id,
+                                       uint32_t flags,
+                                       uint64_t fragment_offset,
                                        enum GNUNET_PSYC_Operator oper,
                                        const char *name,
                                        const void *value,
@@ -459,6 +463,8 @@ static void
 host_recv_notice_place_leave_eom (void *cls,
                                   const struct GNUNET_MessageHeader *msg,
                                   uint64_t message_id,
+                                  uint32_t flags,
+                                  uint64_t fragment_offset,
                                   uint8_t cancelled)
 {
   struct GNUNET_SOCIAL_Host *hst = cls;