[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: set: remove workaround to t
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: set: remove workaround to test if a set bug and not cadet was at fault |
Date: |
Tue, 20 Jun 2017 18:09:17 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 90302a301 set: remove workaround to test if a set bug and not cadet
was at fault
90302a301 is described below
commit 90302a3018c017b4a5b60d7c8f04f8924117c979
Author: Florian Dold <address@hidden>
AuthorDate: Tue Jun 20 18:09:06 2017 +0200
set: remove workaround to test if a set bug and not cadet was at fault
---
src/set/gnunet-service-set_union.c | 50 ++++++++++----------------------------
1 file changed, 13 insertions(+), 37 deletions(-)
diff --git a/src/set/gnunet-service-set_union.c
b/src/set/gnunet-service-set_union.c
index 077b899f6..ca1049148 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -1448,22 +1448,10 @@ maybe_finish (struct Operation *op)
num_demanded);
if (0 == num_demanded)
{
- struct GNUNET_MQ_Envelope *ev;
-
op->state->phase = PHASE_DONE;
- /* FIXME: temporary hack, send message twice and add notification to
second message,
- * so we can be pretty sure that the other party gets at least one of
these
- * (since tunnel end handler is currently broken).
- */
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER);
- GNUNET_MQ_send (op->mq,
- ev);
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER);
- GNUNET_MQ_notify_sent (ev,
- &send_client_done,
- op);
- GNUNET_MQ_send (op->mq,
- ev);
+ send_client_done (op);
+ _GSS_operation_destroy (op,
+ GNUNET_YES);
}
}
}
@@ -1881,32 +1869,18 @@ handle_union_p2p_full_done (void *cls,
GNUNET_MQ_send (op->mq,
ev);
op->state->phase = PHASE_DONE;
- /* we now wait until the other peer sends us the OVER message*/
+ /* we now wait until the other peer disconnects */
}
break;
case PHASE_FULL_SENDING:
{
- struct GNUNET_MQ_Envelope *ev;
-
LOG (GNUNET_ERROR_TYPE_DEBUG,
"got FULL DONE, finishing\n");
/* We sent the full set, and got the response for that. We're done. */
op->state->phase = PHASE_DONE;
- GNUNET_CADET_receive_done (op->channel);
- /* FIXME: temporary hack, send message twice and add notification to
second message,
- * so we can be pretty sure that the other party gets at least one of
these
- * (since tunnel end handler is currently broken).
- */
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER);
- GNUNET_MQ_send (op->mq,
- ev);
- ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER);
- GNUNET_MQ_notify_sent (ev,
- &send_client_done,
- op);
- GNUNET_MQ_send (op->mq,
- ev);
- return;
+ send_client_done (op);
+ _GSS_operation_destroy (op,
+ GNUNET_YES);
}
break;
default:
@@ -2143,6 +2117,7 @@ handle_union_p2p_done (void *cls,
fail_union_operation (op);
return;
}
+
switch (op->state->phase)
{
case PHASE_INVENTORY_PASSIVE:
@@ -2160,9 +2135,8 @@ handle_union_p2p_done (void *cls,
* all our demands are satisfied, so that the active
* peer can quit if we gave him everything.
*/
- GNUNET_CADET_receive_done (op->channel);
maybe_finish (op);
- return;
+ break;
case PHASE_INVENTORY_ACTIVE:
LOG (GNUNET_ERROR_TYPE_DEBUG,
"got DONE (as active partner), waiting to finish\n");
@@ -2174,14 +2148,15 @@ handle_union_p2p_done (void *cls,
* to the other peer once our demands are met.
*/
op->state->phase = PHASE_FINISH_CLOSING;
- GNUNET_CADET_receive_done (op->channel);
maybe_finish (op);
- return;
+ break;
default:
GNUNET_break_op (0);
fail_union_operation (op);
return;
}
+ GNUNET_CADET_receive_done (op->channel);
+
}
/**
@@ -2425,6 +2400,7 @@ union_copy_state (struct SetState *state)
static void
union_channel_death (struct Operation *op)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "channel died, sending result to
client\n");
send_client_done (op);
_GSS_operation_destroy (op,
GNUNET_YES);
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: set: remove workaround to test if a set bug and not cadet was at fault,
gnunet <=