diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-12-17 10:05:04 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-12-17 10:05:04 +0000 |
commit | eb620579de05105499d35f21db8759682698df9d (patch) | |
tree | c56716516e244b7f4fc2329c74f4a4030ee7ea20 /src/mesh/gnunet-service-mesh_tunnel.c | |
parent | ff92e76e780b33c64f2638086788c60282d962b2 (diff) | |
download | gnunet-eb620579de05105499d35f21db8759682698df9d.tar.gz gnunet-eb620579de05105499d35f21db8759682698df9d.zip |
- log fixes, limit kx to live tunnels
Diffstat (limited to 'src/mesh/gnunet-service-mesh_tunnel.c')
-rw-r--r-- | src/mesh/gnunet-service-mesh_tunnel.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c index bfd35984b..eda392dd8 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.c +++ b/src/mesh/gnunet-service-mesh_tunnel.c | |||
@@ -341,9 +341,12 @@ estate2s (enum MeshTunnel3EState es) | |||
341 | static int | 341 | static int |
342 | is_ready (struct MeshTunnel3 *t) | 342 | is_ready (struct MeshTunnel3 *t) |
343 | { | 343 | { |
344 | return (MESH_TUNNEL3_READY == t->cstate | 344 | int ready; |
345 | && MESH_TUNNEL3_KEY_OK == t->estate) | 345 | |
346 | || GMT_is_loopback (t); | 346 | GMT_debug (t); |
347 | ready = (MESH_TUNNEL3_READY == t->cstate && MESH_TUNNEL3_KEY_OK == t->estate); | ||
348 | ready = ready || GMT_is_loopback (t); | ||
349 | return ready; | ||
347 | } | 350 | } |
348 | 351 | ||
349 | 352 | ||
@@ -889,6 +892,12 @@ send_kx (struct MeshTunnel3 *t, | |||
889 | return; | 892 | return; |
890 | } | 893 | } |
891 | 894 | ||
895 | if (GNUNET_NO != t->destroy) | ||
896 | { | ||
897 | LOG (GNUNET_ERROR_TYPE_DEBUG, " being destroyed, why bother\n"); | ||
898 | return; | ||
899 | } | ||
900 | |||
892 | /* Must have a connection. */ | 901 | /* Must have a connection. */ |
893 | if (NULL == t->connection_head) | 902 | if (NULL == t->connection_head) |
894 | { | 903 | { |