diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-07-16 00:11:14 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-07-16 00:11:14 +0000 |
commit | ac9ec4a3dadd323c8b03c1e804748ac987b7c972 (patch) | |
tree | 18f45a0d649e2a978c5e097d2849a6105d0cac61 | |
parent | 6a600aefa069d8555fe8a8ee5cf080fef52b9422 (diff) | |
download | gnunet-ac9ec4a3dadd323c8b03c1e804748ac987b7c972.tar.gz gnunet-ac9ec4a3dadd323c8b03c1e804748ac987b7c972.zip |
- disconnect tunnels before destorying mesh handle
-rw-r--r-- | src/fs/gnunet-service-fs_mesh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fs/gnunet-service-fs_mesh.c b/src/fs/gnunet-service-fs_mesh.c index 4c311279d..a03dccde0 100644 --- a/src/fs/gnunet-service-fs_mesh.c +++ b/src/fs/gnunet-service-fs_mesh.c | |||
@@ -746,7 +746,7 @@ get_mesh (const struct GNUNET_PeerIdentity *target) | |||
746 | sh, | 746 | sh, |
747 | &sh->target, | 747 | &sh->target, |
748 | GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER, | 748 | GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER, |
749 | GNUNET_YES, | 749 | GNUNET_NO, |
750 | GNUNET_YES); | 750 | GNUNET_YES); |
751 | GNUNET_assert (GNUNET_OK == | 751 | GNUNET_assert (GNUNET_OK == |
752 | GNUNET_CONTAINER_multihashmap_put (mesh_map, | 752 | GNUNET_CONTAINER_multihashmap_put (mesh_map, |
@@ -1231,16 +1231,16 @@ GSF_mesh_stop () | |||
1231 | 1231 | ||
1232 | while (NULL != (sc = sc_head)) | 1232 | while (NULL != (sc = sc_head)) |
1233 | terminate_mesh (sc); | 1233 | terminate_mesh (sc); |
1234 | if (NULL != listen_socket) | ||
1235 | { | ||
1236 | GNUNET_MESH_disconnect (listen_socket); | ||
1237 | listen_socket = NULL; | ||
1238 | } | ||
1239 | GNUNET_CONTAINER_multihashmap_iterate (mesh_map, | 1234 | GNUNET_CONTAINER_multihashmap_iterate (mesh_map, |
1240 | &release_meshs, | 1235 | &release_meshs, |
1241 | NULL); | 1236 | NULL); |
1242 | GNUNET_CONTAINER_multihashmap_destroy (mesh_map); | 1237 | GNUNET_CONTAINER_multihashmap_destroy (mesh_map); |
1243 | mesh_map = NULL; | 1238 | mesh_map = NULL; |
1239 | if (NULL != listen_socket) | ||
1240 | { | ||
1241 | GNUNET_MESH_disconnect (listen_socket); | ||
1242 | listen_socket = NULL; | ||
1243 | } | ||
1244 | } | 1244 | } |
1245 | 1245 | ||
1246 | /* end of gnunet-service-fs_mesh.c */ | 1246 | /* end of gnunet-service-fs_mesh.c */ |