aboutsummaryrefslogtreecommitdiff
path: root/src/stream
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2012-07-25 14:22:56 +0000
committerBart Polot <bart@net.in.tum.de>2012-07-25 14:22:56 +0000
commitceb3be6d5ce8ebb9a1ca940b67d3e6a74896db6f (patch)
treea78c88dacf2dc2fb42f8dcd25ce40563f61a637b /src/stream
parent225da976a68a9fafe056e15e812fc7e0f8f9e38e (diff)
downloadgnunet-ceb3be6d5ce8ebb9a1ca940b67d3e6a74896db6f.tar.gz
gnunet-ceb3be6d5ce8ebb9a1ca940b67d3e6a74896db6f.zip
Eliminated mesh API buffering
Diffstat (limited to 'src/stream')
-rw-r--r--src/stream/stream_api.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/stream/stream_api.c b/src/stream/stream_api.c
index 595bf7a6c..930bd63e7 100644
--- a/src/stream/stream_api.c
+++ b/src/stream/stream_api.c
@@ -2813,10 +2813,12 @@ new_tunnel_notify (void *cls,
2813 2813
2814 if (GNUNET_NO == lsocket->listening) 2814 if (GNUNET_NO == lsocket->listening)
2815 { 2815 {
2816 LOG (GNUNET_ERROR_TYPE_DEBUG, 2816// FIXME: socket uninitalized
2817 "%s: Destroying tunnel from peer %s as we don't have the lock\n", 2817// FIXME: cannot use GNUNET_i2s twice in same call (static buffer)
2818 GNUNET_i2s (&socket->other_peer), 2818// LOG (GNUNET_ERROR_TYPE_DEBUG,
2819 GNUNET_i2s (&socket->other_peer)); 2819// "%s: Destroying tunnel from peer %s as we don't have the lock\n",
2820// GNUNET_i2s (&socket->other_peer),
2821// GNUNET_i2s (&socket->other_peer));
2820 GNUNET_MESH_tunnel_destroy (tunnel); 2822 GNUNET_MESH_tunnel_destroy (tunnel);
2821 return NULL; 2823 return NULL;
2822 } 2824 }
@@ -2949,7 +2951,6 @@ lock_status_change_cb (void *cls, const char *domain, uint32_t lock,
2949 GNUNET_MESH_ApplicationType ports[] = {lsocket->port, 0}; 2951 GNUNET_MESH_ApplicationType ports[] = {lsocket->port, 0};
2950 2952
2951 lsocket->mesh = GNUNET_MESH_connect (lsocket->cfg, 2953 lsocket->mesh = GNUNET_MESH_connect (lsocket->cfg,
2952 RECEIVE_BUFFER_SIZE, /* FIXME: QUEUE size as parameter? */
2953 lsocket, /* Closure */ 2954 lsocket, /* Closure */
2954 &new_tunnel_notify, 2955 &new_tunnel_notify,
2955 &tunnel_cleaner, 2956 &tunnel_cleaner,
@@ -3036,7 +3037,6 @@ GNUNET_STREAM_open (const struct GNUNET_CONFIGURATION_Handle *cfg,
3036 } while (GNUNET_STREAM_OPTION_END != option); 3037 } while (GNUNET_STREAM_OPTION_END != option);
3037 va_end (vargs); /* End of variable args parsing */ 3038 va_end (vargs); /* End of variable args parsing */
3038 socket->mesh = GNUNET_MESH_connect (cfg, /* the configuration handle */ 3039 socket->mesh = GNUNET_MESH_connect (cfg, /* the configuration handle */
3039 RECEIVE_BUFFER_SIZE, /* QUEUE size as parameter? */
3040 socket, /* cls */ 3040 socket, /* cls */
3041 NULL, /* No inbound tunnel handler */ 3041 NULL, /* No inbound tunnel handler */
3042 NULL, /* No in-tunnel cleaner */ 3042 NULL, /* No in-tunnel cleaner */