[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25969 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25969 - gnunet/src/testbed |
Date: |
Thu, 31 Jan 2013 21:11:04 +0100 |
Author: harsha
Date: 2013-01-31 21:11:04 +0100 (Thu, 31 Jan 2013)
New Revision: 25969
Modified:
gnunet/src/testbed/gnunet-service-testbed_hc.c
gnunet/src/testbed/gnunet-service-testbed_oc.c
Log:
- call peer connect notifiy callback only after calling the cache callback
Modified: gnunet/src/testbed/gnunet-service-testbed_hc.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_hc.c 2013-01-31 20:02:50 UTC
(rev 25968)
+++ gnunet/src/testbed/gnunet-service-testbed_hc.c 2013-01-31 20:11:04 UTC
(rev 25969)
@@ -399,6 +399,11 @@
GNUNET_CONTAINER_DLL_insert_tail (entry->cgh_qhead, entry->cgh_qtail, cgh);
if (NULL != cgh2)
entry->notify_task = GNUNET_SCHEDULER_add_now (&call_cgh_cb, entry);
+ if (NULL != cgh->nctxt)
+ {/* Register the peer connect notify callback */
+ GNUNET_CONTAINER_DLL_insert_tail (entry->nctxt_qhead, entry->nctxt_qtail,
+ cgh->nctxt);
+ }
LOG_DEBUG ("Calling notify for handle type %u\n", cgh->type);
cgh->cb (cgh->cb_cls, entry->core_handle,
entry->transport_handle_, entry->peer_identity);
@@ -658,7 +663,6 @@
GNUNET_assert (NULL == cgh->nctxt);
cgh->nctxt = ctxt;
ctxt->cgh = cgh;
- GNUNET_CONTAINER_DLL_insert_tail (entry->nctxt_qhead, entry->nctxt_qtail,
ctxt);
}
if (NULL != handle)
{
@@ -780,7 +784,8 @@
if (NULL != cgh->nctxt)
{
GNUNET_assert (cgh == cgh->nctxt->cgh);
- GNUNET_CONTAINER_DLL_remove (entry->nctxt_qhead, entry->nctxt_qtail,
cgh->nctxt);
+ if (GNUNET_YES == cgh->notify_called)
+ GNUNET_CONTAINER_DLL_remove (entry->nctxt_qhead, entry->nctxt_qtail,
cgh->nctxt);
GNUNET_free (cgh->nctxt);
}
GNUNET_free (cgh);
Modified: gnunet/src/testbed/gnunet-service-testbed_oc.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_oc.c 2013-01-31 20:02:50 UTC
(rev 25968)
+++ gnunet/src/testbed/gnunet-service-testbed_oc.c 2013-01-31 20:11:04 UTC
(rev 25969)
@@ -546,9 +546,6 @@
GNUNET_SCHEDULER_cancel (occ->tcc.task);
occ->tcc.task = GNUNET_SCHEDULER_NO_TASK;
}
- GST_cache_get_handle_done (occ->cgh_ch);
- occ->peer->reference_cnt--;
- occ->cgh_ch = NULL;
GNUNET_free_non_null (occ->emsg);
occ->emsg = NULL;
send_overlay_connect_success_msg (occ);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25969 - gnunet/src/testbed,
gnunet <=