diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-07-25 15:10:28 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-07-25 15:10:28 +0000 |
commit | 6543b22ff1da876ebafa68775167289fb3f5c24d (patch) | |
tree | a536256e015452f7a71eac2ecde13c172ce4a094 /src | |
parent | 2136613190f2d556b6011e94f8bef15892840bbf (diff) | |
download | gnunet-6543b22ff1da876ebafa68775167289fb3f5c24d.tar.gz gnunet-6543b22ff1da876ebafa68775167289fb3f5c24d.zip |
- wip
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/gnunet-service-mesh-enc.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/mesh/gnunet-service-mesh-enc.c b/src/mesh/gnunet-service-mesh-enc.c index 644c13213..0226815ff 100644 --- a/src/mesh/gnunet-service-mesh-enc.c +++ b/src/mesh/gnunet-service-mesh-enc.c | |||
@@ -1424,7 +1424,6 @@ static size_t | |||
1424 | send_core_connection_create (void *cls, size_t size, void *buf) | 1424 | send_core_connection_create (void *cls, size_t size, void *buf) |
1425 | { | 1425 | { |
1426 | struct MeshConnection *c = cls; | 1426 | struct MeshConnection *c = cls; |
1427 | struct MeshTunnel2 *t = c->t; | ||
1428 | struct GNUNET_MESH_ConnectionCreate *msg; | 1427 | struct GNUNET_MESH_ConnectionCreate *msg; |
1429 | struct GNUNET_PeerIdentity *peer_ptr; | 1428 | struct GNUNET_PeerIdentity *peer_ptr; |
1430 | struct MeshPeerPath *p = c->path; | 1429 | struct MeshPeerPath *p = c->path; |
@@ -1858,7 +1857,6 @@ peer_destroy (struct MeshPeer *peer) | |||
1858 | struct GNUNET_PeerIdentity id; | 1857 | struct GNUNET_PeerIdentity id; |
1859 | struct MeshPeerPath *p; | 1858 | struct MeshPeerPath *p; |
1860 | struct MeshPeerPath *nextp; | 1859 | struct MeshPeerPath *nextp; |
1861 | unsigned int i; | ||
1862 | 1860 | ||
1863 | GNUNET_PEER_resolve (peer->id, &id); | 1861 | GNUNET_PEER_resolve (peer->id, &id); |
1864 | GNUNET_PEER_change_rc (peer->id, -1); | 1862 | GNUNET_PEER_change_rc (peer->id, -1); |
@@ -1882,9 +1880,7 @@ peer_destroy (struct MeshPeer *peer) | |||
1882 | path_destroy (p); | 1880 | path_destroy (p); |
1883 | p = nextp; | 1881 | p = nextp; |
1884 | } | 1882 | } |
1885 | for (i = 0; i < peer->ntunnels; i++) | 1883 | tunnel_destroy_empty (peer->tunnel); |
1886 | tunnel_destroy_empty (peer->tunnels[i]); | ||
1887 | GNUNET_array_grow (peer->tunnels, peer->ntunnels, 0); | ||
1888 | GNUNET_free (peer); | 1884 | GNUNET_free (peer); |
1889 | return GNUNET_OK; | 1885 | return GNUNET_OK; |
1890 | } | 1886 | } |
@@ -1932,17 +1928,14 @@ peer_remove_path (struct MeshPeer *peer, GNUNET_PEER_Id p1, | |||
1932 | if (0 == destroyed) | 1928 | if (0 == destroyed) |
1933 | return; | 1929 | return; |
1934 | 1930 | ||
1935 | for (i = 0; i < peer->ntunnels; i++) | ||
1936 | { | ||
1937 | d = tunnel_notify_connection_broken (peer->tunnels[i], p1, p2); | ||
1938 | if (0 == d) | ||
1939 | continue; | ||
1940 | 1931 | ||
1941 | peer_d = peer_get_short (d); | 1932 | d = tunnel_notify_connection_broken (peer->tunnel, p1, p2); |
1942 | next = peer_get_best_path (peer_d, peer->tunnels[i]); | 1933 | |
1943 | tunnel_use_path (peer->tunnels[i], next); | 1934 | peer_d = peer_get_short (d); // FIXME |
1944 | peer_connect (peer_d, peer->tunnels[i]); | 1935 | next = peer_get_best_path (peer_d); |
1945 | } | 1936 | tunnel_use_path (peer->tunnel, next); |
1937 | peer_connect (peer_d); | ||
1938 | |||
1946 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer_info_remove_path END\n"); | 1939 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer_info_remove_path END\n"); |
1947 | } | 1940 | } |
1948 | 1941 | ||