diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-12-12 18:19:40 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-12-12 18:19:40 +0000 |
commit | 083e5e024ecaf53838d74e80c5cef2415474f428 (patch) | |
tree | e178c9b64cbd6fa11cb7f7c750dd757f2143a4c3 /src | |
parent | 460df81053cc9d3cdc893243d1f0b6707982e2c5 (diff) | |
download | gnunet-083e5e024ecaf53838d74e80c5cef2415474f428.tar.gz gnunet-083e5e024ecaf53838d74e80c5cef2415474f428.zip |
- cancel transmission altogether on error
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/gnunet-service-mesh_channel.c | 6 | ||||
-rw-r--r-- | src/mesh/gnunet-service-mesh_tunnel.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c index bf1a127c5..216456296 100644 --- a/src/mesh/gnunet-service-mesh_channel.c +++ b/src/mesh/gnunet-service-mesh_channel.c | |||
@@ -2324,6 +2324,12 @@ GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
2324 | } | 2324 | } |
2325 | chq->tq = GMT_send_prebuilt_message (message, ch->t, GNUNET_YES, | 2325 | chq->tq = GMT_send_prebuilt_message (message, ch->t, GNUNET_YES, |
2326 | &ch_message_sent, chq); | 2326 | &ch_message_sent, chq); |
2327 | if (NULL != chq->tq) | ||
2328 | { | ||
2329 | GNUNET_break (0); | ||
2330 | GNUNET_free (chq); | ||
2331 | chq = NULL; | ||
2332 | } | ||
2327 | chq->rel->uniq = chq; | 2333 | chq->rel->uniq = chq; |
2328 | break; | 2334 | break; |
2329 | 2335 | ||
diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c index 83c024de1..020765584 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.c +++ b/src/mesh/gnunet-service-mesh_tunnel.c | |||
@@ -1748,7 +1748,6 @@ void | |||
1748 | GMT_remove_connection (struct MeshTunnel3 *t, struct MeshConnection *c) | 1748 | GMT_remove_connection (struct MeshTunnel3 *t, struct MeshConnection *c) |
1749 | { | 1749 | { |
1750 | struct MeshTConnection *aux; | 1750 | struct MeshTConnection *aux; |
1751 | unsigned int i; | ||
1752 | 1751 | ||
1753 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Removing connection %s from tunnel %s\n", | 1752 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Removing connection %s from tunnel %s\n", |
1754 | GMC_2s (c), GMT_2s (t)); | 1753 | GMC_2s (c), GMT_2s (t)); |