[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36679 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36679 - gnunet/src/transport |
Date: |
Sat, 21 Nov 2015 17:57:19 +0100 |
Author: amatus
Date: 2015-11-21 17:57:18 +0100 (Sat, 21 Nov 2015)
New Revision: 36679
Modified:
gnunet/src/transport/gnunet-transport.c
Log:
gnunet-transport shutting down too early
Fixes issue #3700
Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c 2015-11-21 10:16:48 UTC (rev
36678)
+++ gnunet/src/transport/gnunet-transport.c 2015-11-21 16:57:18 UTC (rev
36679)
@@ -427,11 +427,6 @@
static unsigned int address_resolutions;
/**
- * Address resolutions pending in progress
- */
-static unsigned int address_resolution_in_progress;
-
-/**
* DLL for NAT Test Contexts: head
*/
struct TestContext *head;
@@ -1446,11 +1441,7 @@
if (NULL == peer)
{
/* done */
- address_resolution_in_progress = GNUNET_NO;
pic = NULL;
- if (NULL != end)
- GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
}
@@ -1467,7 +1458,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received address for peer `%s': %s\n",
GNUNET_i2s (peer),
- address->transport_name);
+ address ? address->transport_name : "");
if (NULL != address)
resolve_peer_address (address,
@@ -1904,7 +1895,6 @@
}
else if (iterate_connections) /* -i: List information about peers once */
{
- address_resolution_in_progress = GNUNET_YES;
pic = GNUNET_TRANSPORT_monitor_peers (cfg, (NULL == cpid) ? NULL : &pid,
GNUNET_YES, TIMEOUT, &process_peer_iteration_cb, (void *) cfg);
op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
@@ -1915,7 +1905,6 @@
{
monitored_peers = GNUNET_CONTAINER_multipeermap_create (10,
GNUNET_NO);
- address_resolution_in_progress = GNUNET_YES;
pic = GNUNET_TRANSPORT_monitor_peers (cfg,
(NULL == cpid) ? NULL : &pid,
GNUNET_NO,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36679 - gnunet/src/transport,
gnunet <=