aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2014-03-17 11:02:24 +0000
committerBart Polot <bart@net.in.tum.de>2014-03-17 11:02:24 +0000
commit09a4a6bf590ae8e1d85eb519d915b0678dbdef94 (patch)
tree4bcca684747504e52e87ecb3adc5f8d24eceab2b /src
parent81ed24969da3230870f5bbd4965f0202e55b1d0f (diff)
downloadgnunet-09a4a6bf590ae8e1d85eb519d915b0678dbdef94.tar.gz
gnunet-09a4a6bf590ae8e1d85eb519d915b0678dbdef94.zip
- check incoming channel for NULL
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-mesh-profiler.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesh/gnunet-mesh-profiler.c b/src/mesh/gnunet-mesh-profiler.c
index 8d6984170..1027cba26 100644
--- a/src/mesh/gnunet-mesh-profiler.c
+++ b/src/mesh/gnunet-mesh-profiler.c
@@ -40,7 +40,7 @@
40/** 40/**
41 * Duration of each round. 41 * Duration of each round.
42 */ 42 */
43#define ROUND_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20) 43#define ROUND_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
44 44
45/** 45/**
46 * Paximum ping period in milliseconds. Real period = rand (0, PING_PERIOD) 46 * Paximum ping period in milliseconds. Real period = rand (0, PING_PERIOD)
@@ -249,7 +249,8 @@ disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
249 { 249 {
250 GNUNET_TESTBED_operation_done (peers[i].op); 250 GNUNET_TESTBED_operation_done (peers[i].op);
251 GNUNET_MESH_channel_destroy (peers[i].ch); 251 GNUNET_MESH_channel_destroy (peers[i].ch);
252 GNUNET_MESH_channel_destroy (peers[i].incoming_ch); 252 if (NULL != peers[i].incoming_ch)
253 GNUNET_MESH_channel_destroy (peers[i].incoming_ch);
253 } 254 }
254 GNUNET_MESH_TEST_cleanup (test_ctx); 255 GNUNET_MESH_TEST_cleanup (test_ctx);
255 if (GNUNET_SCHEDULER_NO_TASK != shutdown_handle) 256 if (GNUNET_SCHEDULER_NO_TASK != shutdown_handle)