[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31243 - gnunet/src/set
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31243 - gnunet/src/set |
Date: |
Tue, 10 Dec 2013 00:22:55 +0100 |
Author: dold
Date: 2013-12-10 00:22:55 +0100 (Tue, 10 Dec 2013)
New Revision: 31243
Modified:
gnunet/src/set/gnunet-service-set.c
Log:
- fix #3185 and #3184 in set
Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2013-12-09 21:53:53 UTC (rev 31242)
+++ gnunet/src/set/gnunet-service-set.c 2013-12-09 23:22:55 UTC (rev 31243)
@@ -201,7 +201,11 @@
for (op = incoming_head; NULL != op; op = op->next)
if (op->state->suggest_id == id)
+ {
+ // FIXME: remove this assertion once the corresponding bug is gone!
+ GNUNET_assert (GNUNET_YES == op->is_incoming);
return op;
+ }
return NULL;
}
@@ -441,13 +445,16 @@
static void
incoming_destroy (struct Operation *incoming)
{
+ GNUNET_assert (GNUNET_YES == incoming->is_incoming);
GNUNET_CONTAINER_DLL_remove (incoming_head, incoming_tail, incoming);
if (GNUNET_SCHEDULER_NO_TASK != incoming->state->timeout_task)
{
GNUNET_SCHEDULER_cancel (incoming->state->timeout_task);
incoming->state->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
+ GNUNET_assert (NULL != incoming->state);
GNUNET_free (incoming->state);
+ incoming->state = NULL;
}
@@ -459,7 +466,9 @@
static void
incoming_retire (struct Operation *incoming)
{
+ GNUNET_assert (GNUNET_YES == incoming->is_incoming);
incoming->is_incoming = GNUNET_NO;
+ GNUNET_assert (NULL != incoming->state);
GNUNET_free (incoming->state);
incoming->state = NULL;
GNUNET_CONTAINER_DLL_remove (incoming_head, incoming_tail, incoming);
@@ -505,7 +514,9 @@
{
struct GNUNET_MQ_Envelope *mqm;
struct GNUNET_SET_RequestMessage *cmsg;
-
+
+ GNUNET_assert (GNUNET_YES == incoming->is_incoming);
+ GNUNET_assert (NULL != incoming->state);
GNUNET_assert (NULL != incoming->spec);
GNUNET_assert (0 == incoming->state->suggest_id);
incoming->state->suggest_id = suggest_id++;
@@ -546,6 +557,8 @@
struct Listener *listener;
struct OperationSpecification *spec;
+ GNUNET_assert (GNUNET_YES == op->is_incoming);
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got op request\n");
if (GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST != ntohs (mh->type))
@@ -1180,9 +1193,8 @@
handle_incoming_disconnect (struct Operation *op)
{
GNUNET_assert (GNUNET_YES == op->is_incoming);
- if (NULL == op->channel)
- return;
incoming_destroy (op);
+ op->vt = NULL;
}
@@ -1287,8 +1299,8 @@
/**
- * Functions with this signature are called whenever any message is
- * received via the mesh channel.
+ * Functions with this signature are called whenever a message is
+ * received via a mesh channel.
*
* The msg_handler is a virtual table set in initially either when a peer
* creates a new channel with us (channel_new_cb), or once we create a new
channel
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31243 - gnunet/src/set,
gnunet <=