diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-09-20 12:32:12 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-09-20 12:32:12 +0000 |
commit | 87a8875eeebfaf98d3a8441adb3f227122e2aab3 (patch) | |
tree | d372f257bc59cd9785f29759331069d1c90ec7b8 /src/mesh/gnunet-service-mesh.c | |
parent | 44f59242570e7bcf3ea760f8965fda627748f61a (diff) | |
download | gnunet-87a8875eeebfaf98d3a8441adb3f227122e2aab3.tar.gz gnunet-87a8875eeebfaf98d3a8441adb3f227122e2aab3.zip |
- reorder for case of shutdown
Diffstat (limited to 'src/mesh/gnunet-service-mesh.c')
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 914862c33..aa3bfea97 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -4339,13 +4339,13 @@ tunnel_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
4339 | struct MeshTunnel *t = cls; | 4339 | struct MeshTunnel *t = cls; |
4340 | struct GNUNET_PeerIdentity id; | 4340 | struct GNUNET_PeerIdentity id; |
4341 | 4341 | ||
4342 | t->timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
4343 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | ||
4344 | return; | ||
4342 | GNUNET_PEER_resolve(t->id.oid, &id); | 4345 | GNUNET_PEER_resolve(t->id.oid, &id); |
4343 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 4346 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
4344 | "Tunnel %s [%X] timed out. Destroying.\n", | 4347 | "Tunnel %s [%X] timed out. Destroying.\n", |
4345 | GNUNET_i2s(&id), t->id.tid); | 4348 | GNUNET_i2s(&id), t->id.tid); |
4346 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | ||
4347 | return; | ||
4348 | t->timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
4349 | tunnel_destroy (t); | 4349 | tunnel_destroy (t); |
4350 | } | 4350 | } |
4351 | 4351 | ||