[GNUnet-SVN] r36376 - in gnunet/src: include multicast

[gnunet]

Author: tg
Date: 2015-09-26 19:10:24 +0200 (Sat, 26 Sep 2015)
New Revision: 36376

Modified:
   gnunet/src/include/gnunet_multicast_service.h
   gnunet/src/multicast/gnunet-service-multicast.c
   gnunet/src/multicast/multicast_api.c
   gnunet/src/multicast/test_multicast.c
Log:
multicast: removed replay cancellation as responses are limited

Modified: gnunet/src/include/gnunet_multicast_service.h
===================================================================
--- gnunet/src/include/gnunet_multicast_service.h       2015-09-26 17:10:17 UTC 
(rev 36375)
+++ gnunet/src/include/gnunet_multicast_service.h       2015-09-26 17:10:24 UTC 
(rev 36376)
@@ -377,19 +377,6 @@
 
 
 /**
- * Function called with the result of an asynchronous operation.
- *
- * @see GNUNET_MULTICAST_replay_fragment()
- *
- * @param result
- *        Result of the operation.
- */
-typedef void
-(*GNUNET_MULTICAST_ResultCallback) (void *cls,
-                                    int result);
-
-
-/**
  * Opaque handle to a replay request from the multicast service.
  */
 struct GNUNET_MULTICAST_ReplayHandle;
@@ -775,10 +762,6 @@
  * @param flags
  *        Additional flags for the replay request.
  *        It is used and defined by GNUNET_MULTICAST_ReplayFragmentCallback
- * @param result_cb
- *        Function to call when the replayed message fragment arrives.
- * @param result_cls
- *        Closure for @a result_cb.
  *
  * @return Replay request handle, NULL on error.
  */
@@ -785,9 +768,7 @@
 struct GNUNET_MULTICAST_MemberReplayHandle *
 GNUNET_MULTICAST_member_replay_fragment (struct GNUNET_MULTICAST_Member 
*member,
                                          uint64_t fragment_id,
-                                         uint64_t flags,
-                                         GNUNET_MULTICAST_ResultCallback 
result_cb,
-                                         void *result_cb_cls);
+                                         uint64_t flags);
 
 
 /**
@@ -805,10 +786,6 @@
  * @param flags
  *        Additional flags for the replay request.
  *        It is used & defined by GNUNET_MULTICAST_ReplayMessageCallback
- * @param result_cb
- *        Function to call for each replayed message fragment.
- * @param result_cls
- *        Closure for @a result_cb.
  *
  * @return Replay request handle, NULL on error.
  */
@@ -816,9 +793,7 @@
 GNUNET_MULTICAST_member_replay_message (struct GNUNET_MULTICAST_Member *member,
                                         uint64_t message_id,
                                         uint64_t fragment_offset,
-                                        uint64_t flags,
-                                        GNUNET_MULTICAST_ResultCallback 
result_cb,
-                                        void *result_cb_cls);
+                                        uint64_t flags);
 
 
 /**

Modified: gnunet/src/multicast/gnunet-service-multicast.c
===================================================================
--- gnunet/src/multicast/gnunet-service-multicast.c     2015-09-26 17:10:17 UTC 
(rev 36375)
+++ gnunet/src/multicast/gnunet-service-multicast.c     2015-09-26 17:10:24 UTC 
(rev 36376)
@@ -1373,17 +1373,6 @@
 
 
 /**
- * Incoming replay request from a client.
- */
-static void
-client_recv_replay_request_cancel (void *cls, struct GNUNET_SERVER_Client 
*client,
-                                   const struct GNUNET_MessageHeader *m)
-{
-  struct Group *grp = GNUNET_SERVER_client_get_user_context (client, struct 
Group);
-}
-
-
-/**
  * A new client connected.
  */
 static void
@@ -1416,9 +1405,6 @@
   { client_recv_replay_request, NULL,
     GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST, 0 },
 
-  { client_recv_replay_request_cancel, NULL,
-    GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST_CANCEL, 0 },
-
   { client_recv_replay_response, NULL,
     GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_RESPONSE, 0 },
 
@@ -1722,19 +1708,6 @@
 
 
 /**
- * Incoming multicast replay request cancellation from CADET.
- */
-int
-cadet_recv_replay_request_cancel (void *cls,
-                                  struct GNUNET_CADET_Channel *channel,
-                                  void **ctx,
-                                  const struct GNUNET_MessageHeader *m)
-{
-
-}
-
-
-/**
  * Incoming multicast replay response from CADET.
  */
 int
@@ -1767,9 +1740,6 @@
   { cadet_recv_replay_request,
     GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST, 0 },
 
-  { cadet_recv_replay_request_cancel,
-    GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST_CANCEL, 0 },
-
   { cadet_recv_replay_response,
     GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_RESPONSE, 0 },
 

Modified: gnunet/src/multicast/multicast_api.c
===================================================================
--- gnunet/src/multicast/multicast_api.c        2015-09-26 17:10:17 UTC (rev 
36375)
+++ gnunet/src/multicast/multicast_api.c        2015-09-26 17:10:24 UTC (rev 
36376)
@@ -182,9 +182,6 @@
  */
 struct GNUNET_MULTICAST_MemberReplayHandle
 {
-
-  GNUNET_MULTICAST_ResultCallback result_cb;
-  void *result_cls;
 };
 
 
@@ -1051,10 +1048,6 @@
  * @param flags
  *        Additional flags for the replay request.
  *        It is used and defined by GNUNET_MULTICAST_ReplayFragmentCallback
- * @param result_cb
- *        Function to call when the replayed message fragment arrives.
- * @param result_cls
- *        Closure for @a result_cb.
  *
  * @return Replay request handle.
  */
@@ -1061,9 +1054,7 @@
 struct GNUNET_MULTICAST_MemberReplayHandle *
 GNUNET_MULTICAST_member_replay_fragment (struct GNUNET_MULTICAST_Member *mem,
                                          uint64_t fragment_id,
-                                         uint64_t flags,
-                                         GNUNET_MULTICAST_ResultCallback 
result_cb,
-                                         void *result_cls)
+                                         uint64_t flags)
 {
   member_replay_request (mem, fragment_id, 0, 0, flags);
 }
@@ -1084,10 +1075,6 @@
  * @param flags
  *        Additional flags for the replay request.
  *        It is used & defined by GNUNET_MULTICAST_ReplayMessageCallback
- * @param result_cb
- *        Function to call for each replayed message fragment.
- * @param result_cls
- *        Closure for @a result_cb.
  *
  * @return Replay request handle, NULL on error.
  */
@@ -1095,26 +1082,12 @@
 GNUNET_MULTICAST_member_replay_message (struct GNUNET_MULTICAST_Member *mem,
                                         uint64_t message_id,
                                         uint64_t fragment_offset,
-                                        uint64_t flags,
-                                        GNUNET_MULTICAST_ResultCallback 
result_cb,
-                                        void *result_cls)
+                                        uint64_t flags)
 {
   member_replay_request (mem, 0, message_id, fragment_offset, flags);
 }
 
 
-/**
- * Cancel a replay request.
- *
- * @param rh
- *        Request to cancel.
- */
-void
-GNUNET_MULTICAST_member_replay_cancel (struct 
GNUNET_MULTICAST_MemberReplayHandle *rh)
-{
-}
-
-
 static void
 member_to_origin (struct GNUNET_MULTICAST_Member *mem)
 {

Modified: gnunet/src/multicast/test_multicast.c
===================================================================
--- gnunet/src/multicast/test_multicast.c       2015-09-26 17:10:17 UTC (rev 
36375)
+++ gnunet/src/multicast/test_multicast.c       2015-09-26 17:10:24 UTC (rev 
36376)
@@ -317,7 +317,7 @@
   replay_fragment_id = 1;
   replay_flags = 1 | 1<<11;
   GNUNET_MULTICAST_member_replay_fragment (member, replay_fragment_id,
-                                           replay_flags, NULL, NULL);
+                                           replay_flags);
 }
 
 
@@ -330,7 +330,7 @@
   replay_fragment_id = 1234;
   replay_flags = 11 | 1<<11;
   GNUNET_MULTICAST_member_replay_fragment (member, replay_fragment_id,
-                                           replay_flags, NULL, NULL);
+                                           replay_flags);
 }