#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
-#include "mesh_protocol_enc.h"
+#include "mesh_protocol.h"
#include "mesh_path.h"
#include "gnunet-service-mesh_tunnel.h"
#define LOG(level, ...) GNUNET_log_from(level,"mesh-tun",__VA_ARGS__)
-#define REKEY_WAIT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+#define REKEY_WAIT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5)
/******************************************************************************/
/******************************** STRUCTS **********************************/
/**
* Queued messages, to transmit once tunnel gets connected.
*/
- struct MeshTunnelQueue *tq_head;
- struct MeshTunnelQueue *tq_tail;
+ struct MeshTunnelDelayed *tq_head;
+ struct MeshTunnelDelayed *tq_tail;
};
/**
- * Struct used to queue messages in a tunnel.
+ * Struct used to save messages in a non-ready tunnel to send once connected.
*/
-struct MeshTunnelQueue
+struct MeshTunnelDelayed
{
/**
* DLL
*/
- struct MeshTunnelQueue *next;
- struct MeshTunnelQueue *prev;
+ struct MeshTunnelDelayed *next;
+ struct MeshTunnelDelayed *prev;
/**
* Channel.
};
+/**
+ * Handle for messages queued but not yet sent.
+ */
+struct MeshTunnel3Queue
+{
+ /**
+ * Connection queue handle, to cancel if necessary.
+ */
+ struct MeshConnectionQueue *q;
+
+ /**
+ * Continuation to call once sent.
+ */
+ GMT_sent cont;
+
+ /**
+ * Closure for @c cont.
+ */
+ void *cont_cls;
+};
+
+
/******************************************************************************/
/******************************* GLOBALS ***********************************/
/******************************************************************************/
return "MESH_TUNNEL3_SEARCHING";
case MESH_TUNNEL3_WAITING:
return "MESH_TUNNEL3_WAITING";
+ case MESH_TUNNEL3_KEY_SENT:
+ return "MESH_TUNNEL3_KEY_SENT";
case MESH_TUNNEL3_READY:
return "MESH_TUNNEL3_READY";
case MESH_TUNNEL3_RECONNECTING:
return "MESH_TUNNEL3_RECONNECTING";
+ case MESH_TUNNEL3_REKEY:
+ return "MESH_TUNNEL3_REKEY";
default:
sprintf (buf, "%u (UNKNOWN STATE)", s);
}
+/**
+ * Get the channel's buffer. ONLY FOR NON-LOOPBACK CHANNELS!!
+ *
+ * @param tch Tunnel's channel handle.
+ *
+ * @return Amount of messages the channel can still buffer towards the client.
+ */
+static unsigned int
+get_channel_buffer (const struct MeshTChannel *tch)
+{
+ int fwd;
+
+ /* If channel is outgoing, is origin in the FWD direction and fwd is YES */
+ fwd = GMCH_is_origin (tch->ch, GNUNET_YES);
+
+ return GMCH_get_buffer (tch->ch, fwd);
+}
+
+
+/**
+ * Get the channel's allowance status.
+ *
+ * @param tch Tunnel's channel handle.
+ *
+ * @return #GNUNET_YES if we allowed the client to send data to us.
+ */
+static int
+get_channel_allowed (const struct MeshTChannel *tch)
+{
+ int fwd;
+
+ /* If channel is outgoing, is origin in the FWD direction and fwd is YES */
+ fwd = GMCH_is_origin (tch->ch, GNUNET_YES);
+
+ return GMCH_get_allowed (tch->ch, fwd);
+}
+
+
+/**
+ * Get the connection's buffer.
+ *
+ * @param tc Tunnel's connection handle.
+ *
+ * @return Amount of messages the connection can still buffer.
+ */
+static unsigned int
+get_connection_buffer (const struct MeshTConnection *tc)
+{
+ int fwd;
+
+ /* If connection is outgoing, is origin in the FWD direction and fwd is YES */
+ fwd = GMC_is_origin (tc->c, GNUNET_YES);
+
+ return GMC_get_buffer (tc->c, fwd);
+}
+
+
+/**
+ * Get the connection's allowance.
+ *
+ * @param tc Tunnel's connection handle.
+ *
+ * @return Amount of messages we have allowed the next peer to send us.
+ */
+static unsigned int
+get_connection_allowed (const struct MeshTConnection *tc)
+{
+ int fwd;
+
+ /* If connection is outgoing, is origin in the FWD direction and fwd is YES */
+ fwd = GMC_is_origin (tc->c, GNUNET_YES);
+
+ return GMC_get_allowed (tc->c, fwd);
+}
+
+
/**
* Check that a ephemeral key message s well formed and correctly signed.
*
* @param t Tunnel on which the message came.
* @param msg The ephemeral key message.
*
- * @return \GNUNET_OK if message is fine, \GNUNET_SYSERR otherwise.
+ * @return GNUNET_OK if message is fine, GNUNET_SYSERR otherwise.
*/
int
-check_ephemeral (struct MeshTunnel3 *t,
+check_ephemeral (struct MeshTunnel3 *t,
const struct GNUNET_MESH_KX_Ephemeral *msg)
{
/* Check message size */
{
struct GNUNET_CRYPTO_SymmetricInitializationVector siv;
- GNUNET_CRYPTO_symmetric_derive_iv (&siv, &t->e_key, &iv, sizeof (uint32_t), NULL);
+ GNUNET_CRYPTO_symmetric_derive_iv (&siv, &t->d_key, &iv, sizeof (uint32_t), NULL);
return GNUNET_CRYPTO_symmetric_decrypt (src, size, &t->d_key, &siv, dst);
}
* Pick a connection on which send the next data message.
*
* @param t Tunnel on which to send the message.
- * @param fwd Is this a fwd message?
*
* @return The connection on which to send the next message.
*/
static struct MeshConnection *
-tunnel_get_connection (struct MeshTunnel3 *t, int fwd)
+tunnel_get_connection (struct MeshTunnel3 *t)
{
struct MeshTConnection *iter;
struct MeshConnection *best;
GNUNET_h2s (GMC_get_id (iter->c)), GMC_get_state (iter->c));
if (MESH_CONNECTION_READY == GMC_get_state (iter->c))
{
- qn = GMC_get_qn (iter->c, fwd);
+ qn = GMC_get_qn (iter->c, GMC_is_origin (iter->c, GNUNET_YES));
LOG (GNUNET_ERROR_TYPE_DEBUG, " q_n %u, \n", qn);
if (qn < lowest_q)
{
}
+/**
+ * Send all cached messages that we can, tunnel is online.
+ *
+ * @param t Tunnel that holds the messages. Cannot be loopback.
+ */
+static void
+send_queued_data (struct MeshTunnel3 *t)
+{
+ struct MeshTunnelDelayed *tq;
+ struct MeshTunnelDelayed *next;
+ unsigned int room;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "GMT_send_queued_data on tunnel %s\n",
+ GMT_2s (t));
+
+ if (GMT_is_loopback (t))
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ room = GMT_get_connections_buffer (t);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " buffer space: %u\n", room);
+ for (tq = t->tq_head; NULL != tq && room > 0; tq = next)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " data on channel %s\n", GMCH_2s (tq->ch));
+ next = tq->next;
+ room--;
+ GNUNET_CONTAINER_DLL_remove (t->tq_head, t->tq_tail, tq);
+ GMCH_send_prebuilt_message ((struct GNUNET_MessageHeader *) &tq[1],
+ tq->ch, GMCH_is_origin (tq->ch, GNUNET_YES),
+ GNUNET_NO);
+
+ GNUNET_free (tq);
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "GMT_send_queued_data end\n",
+ GMP_2s (t->peer));
+}
+
+
+
+
+/**
+ * Cache a message to be sent once tunnel is online.
+ *
+ * @param t Tunnel to hold the message.
+ * @param ch Channel the message is about.
+ * @param msg Message itself (copy will be made).
+ */
+static void
+queue_data (struct MeshTunnel3 *t,
+ struct MeshChannel *ch,
+ const struct GNUNET_MessageHeader *msg)
+{
+ struct MeshTunnelDelayed *tq;
+ uint16_t size = ntohs (msg->size);
+
+ if (MESH_TUNNEL3_READY == t->state)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ tq = GNUNET_malloc (sizeof (struct MeshTunnelDelayed) + size);
+
+ tq->ch = ch;
+ memcpy (&tq[1], msg, size);
+ GNUNET_CONTAINER_DLL_insert_tail (t->tq_head, t->tq_tail, tq);
+}
+
+
+
+/**
+ * Sends key exchange message on a tunnel, choosing the best connection.
+ * Should not be called on loopback tunnels.
+ *
+ * @param t Tunnel on which this message is transmitted.
+ * @param message Message to send. Function modifies it.
+ */
+static void
+send_kx (struct MeshTunnel3 *t,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct MeshConnection *c;
+ struct GNUNET_MESH_KX *msg;
+ size_t size = ntohs (message->size);
+ char cbuf[sizeof (struct GNUNET_MESH_KX) + size];
+ uint16_t type;
+ int fwd;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT KX on Tunnel %s\n", GMT_2s (t));
+
+ /* Avoid loopback. */
+ if (GMT_is_loopback (t))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " loopback!\n");
+ GNUNET_break (0);
+ return;
+ }
+
+ /* Must have a connection. */
+ if (NULL == t->connection_head)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ msg = (struct GNUNET_MESH_KX *) cbuf;
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX);
+ msg->header.size = htons (sizeof (struct GNUNET_MESH_KX) + size);
+ c = tunnel_get_connection (t);
+ if (NULL == c)
+ {
+ GNUNET_break (GNUNET_YES == t->destroy);
+ return;
+ }
+ type = ntohs (message->type);
+ switch (type)
+ {
+ case GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL:
+ case GNUNET_MESSAGE_TYPE_MESH_KX_PING:
+ case GNUNET_MESSAGE_TYPE_MESH_KX_PONG:
+ msg->reserved = htonl (0);
+ memcpy (&msg[1], message, size);
+ break;
+ default:
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "unkown type %s\n",
+ GNUNET_MESH_DEBUG_M2S (type));
+ GNUNET_break (0);
+ }
+
+ fwd = GMC_is_origin (t->connection_head->c, GNUNET_YES);
+ /* TODO save handle and cancel in case of a unneeded retransmission */
+ GMC_send_prebuilt_message (&msg->header, c, fwd, NULL, NULL);
+}
+
+
/**
* Send the ephemeral key on a tunnel.
*
static void
send_ephemeral (struct MeshTunnel3 *t)
{
- kx_msg.sender_status = htonl (t->state);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__);
- /* When channel is NULL, fwd is irrelevant. */
- GMT_send_prebuilt_message (&kx_msg.header, t, NULL, GNUNET_YES);
+ kx_msg.sender_status = htonl (t->state);
+ send_kx (t, &kx_msg.header);
}
/**
{
struct GNUNET_MESH_KX_Ping msg;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__);
msg.header.size = htons (sizeof (msg));
msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_PING);
msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
msg.target = *GMP_get_id (t->peer);
msg.nonce = t->kx_ctx->challenge;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " sending %u\n", msg.nonce);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " towards %s\n", GNUNET_i2s (&msg.target));
t_encrypt (t, &msg.target, &msg.target, ping_encryption_size(), msg.iv);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " e sending %u\n", msg.nonce);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " e towards %s\n", GNUNET_i2s (&msg.target));
- /* When channel is NULL, fwd is irrelevant. */
- GMT_send_prebuilt_message (&msg.header, t, NULL, GNUNET_YES);
+ send_kx (t, &msg.header);
}
{
struct GNUNET_MESH_KX_Pong msg;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "%s()\n", __FUNCTION__);
msg.header.size = htons (sizeof (msg));
msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_PONG);
msg.iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
msg.nonce = challenge;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " sending %u\n", msg.nonce);
t_encrypt (t, &msg.nonce, &msg.nonce, sizeof (msg.nonce), msg.iv);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " e sending %u\n", msg.nonce);
- /* When channel is NULL, fwd is irrelevant. */
- GMT_send_prebuilt_message (&msg.header, t, NULL, GNUNET_YES);
+ send_kx (t, &msg.header);
}
t->rekey_task = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Re-key Tunnel\n");
+ if (NULL != tc && 0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
return;
- t->kx_ctx = GNUNET_new (struct MeshTunnelKXCtx);
- t->kx_ctx->challenge = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
- UINT32_MAX);
- t->kx_ctx->d_key_old = t->d_key;
+ if (NULL == t->kx_ctx)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " new kx ctx\n");
+ t->kx_ctx = GNUNET_new (struct MeshTunnelKXCtx);
+ t->kx_ctx->challenge = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT32_MAX);
+ t->kx_ctx->d_key_old = t->d_key;
+ }
send_ephemeral (t);
- send_ping (t);
+ if (MESH_TUNNEL3_READY == t->state || MESH_TUNNEL3_REKEY == t->state)
+ {
+ send_ping (t);
+ t->state = MESH_TUNNEL3_REKEY;
+ }
+ else if (MESH_TUNNEL3_WAITING == t->state)
+ {
+ t->state = MESH_TUNNEL3_KEY_SENT;
+ }
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Unexpected state %u\n", t->state);
+ }
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " next call in %s\n",
+ GNUNET_STRINGS_relative_time_to_string (REKEY_WAIT, GNUNET_YES));
t->rekey_task = GNUNET_SCHEDULER_add_delayed (REKEY_WAIT, &rekey_tunnel, t);
}
long n = (long) cls;
uint32_t r;
+ if (GNUNET_SCHEDULER_NO_TASK != t->rekey_task)
+ return GNUNET_YES;
+
r = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, (uint32_t) n * 100);
delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, r);
t->rekey_task = GNUNET_SCHEDULER_add_delayed (delay, &rekey_tunnel, t);
}
+/**
+ * Called only on shutdown, destroy every tunnel.
+ *
+ * @param cls Closure (unused).
+ * @param key Current public key.
+ * @param value Value in the hash map (tunnel).
+ *
+ * @return #GNUNET_YES, so we should continue to iterate,
+ */
+static int
+destroy_iterator (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
+{
+ struct MeshTunnel3 *t = value;
+
+ GMT_destroy (t);
+ return GNUNET_YES;
+}
+
+
/**
* Demultiplex data per channel and call appropriate channel handler.
*
* @param t Tunnel on which the data came.
* @param msg Data message.
- * @param fwd Is this FWD data? (root -> dest)
+ * @param fwd Is this message fwd? This only is meaningful in loopback channels.
+ * #GNUNET_YES if message is FWD on the respective channel (loopback)
+ * #GNUNET_NO if message is BCK on the respective channel (loopback)
+ * #GNUNET_SYSERR if message on a one-ended channel (remote)
*/
-void
+static void
handle_data (struct MeshTunnel3 *t,
const struct GNUNET_MESH_Data *msg,
int fwd)
GMCH_handle_data (ch, msg, fwd);
}
-void
+
+/**
+ * Demultiplex data ACKs per channel and update appropriate channel buffer info.
+ *
+ * @param t Tunnel on which the DATA ACK came.
+ * @param msg DATA ACK message.
+ * @param fwd Is this message fwd? This only is meaningful in loopback channels.
+ * #GNUNET_YES if message is FWD on the respective channel (loopback)
+ * #GNUNET_NO if message is BCK on the respective channel (loopback)
+ * #GNUNET_SYSERR if message on a one-ended channel (remote)
+ */
+static void
handle_data_ack (struct MeshTunnel3 *t,
const struct GNUNET_MESH_DataACK *msg,
int fwd)
GMCH_handle_data_ack (ch, msg, fwd);
}
-void
+
+/**
+ * Handle channel create.
+ *
+ * @param t Tunnel on which the data came.
+ * @param msg Data message.
+ */
+static void
handle_ch_create (struct MeshTunnel3 *t,
- const struct GNUNET_MESH_ChannelCreate *msg,
- int fwd)
+ const struct GNUNET_MESH_ChannelCreate *msg)
{
struct MeshChannel *ch;
size_t size;
/* Check channel */
ch = GMT_get_channel (t, ntohl (msg->chid));
- if (NULL != ch)
+ if (NULL != ch && ! GMT_is_loopback (t))
{
/* Probably a retransmission, safe to ignore */
LOG (GNUNET_ERROR_TYPE_DEBUG, " already exists...\n");
}
else
{
- ch = GMCH_handle_create (t, msg, fwd);
+ ch = GMCH_handle_create (t, msg);
}
- GMT_add_channel (t, ch);
+ if (NULL != ch)
+ GMT_add_channel (t, ch);
}
-void
+
+
+/**
+ * Handle channel NACK: check correctness and call channel handler for NACKs.
+ *
+ * @param t Tunnel on which the NACK came.
+ * @param msg NACK message.
+ */
+static void
+handle_ch_nack (struct MeshTunnel3 *t,
+ const struct GNUNET_MESH_ChannelManage *msg)
+{
+ struct MeshChannel *ch;
+ size_t size;
+
+ /* Check size */
+ size = ntohs (msg->header.size);
+ if (size != sizeof (struct GNUNET_MESH_ChannelManage))
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ /* Check channel */
+ ch = GMT_get_channel (t, ntohl (msg->chid));
+ if (NULL == ch)
+ {
+ GNUNET_STATISTICS_update (stats, "# channel NACK on unknown channel",
+ 1, GNUNET_NO);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel %u unknown\n",
+ ntohl (msg->chid));
+ return;
+ }
+
+ GMCH_handle_nack (ch);
+}
+
+
+/**
+ * Handle a CHANNEL ACK (SYNACK/ACK).
+ *
+ * @param t Tunnel on which the CHANNEL ACK came.
+ * @param msg CHANNEL ACK message.
+ * @param fwd Is this message fwd? This only is meaningful in loopback channels.
+ * #GNUNET_YES if message is FWD on the respective channel (loopback)
+ * #GNUNET_NO if message is BCK on the respective channel (loopback)
+ * #GNUNET_SYSERR if message on a one-ended channel (remote)
+ */
+static void
handle_ch_ack (struct MeshTunnel3 *t,
const struct GNUNET_MESH_ChannelManage *msg,
int fwd)
GMCH_handle_ack (ch, msg, fwd);
}
-void
+
+
+/**
+ * Handle a channel destruction message.
+ *
+ * @param t Tunnel on which the message came.
+ * @param msg Channel destroy message.
+ * @param fwd Is this message fwd? This only is meaningful in loopback channels.
+ * #GNUNET_YES if message is FWD on the respective channel (loopback)
+ * #GNUNET_NO if message is BCK on the respective channel (loopback)
+ * #GNUNET_SYSERR if message on a one-ended channel (remote)
+ */
+static void
handle_ch_destroy (struct MeshTunnel3 *t,
const struct GNUNET_MESH_ChannelManage *msg,
int fwd)
return;
}
derive_key_material (&km, &msg->ephemeral_key);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " km is %s\n", GNUNET_h2s (&km));
derive_symmertic (&t->e_key, &my_full_id, GMP_get_id (t->peer), &km);
derive_symmertic (&t->d_key, GMP_get_id (t->peer), &my_full_id, &km);
+ if (MESH_TUNNEL3_KEY_SENT == t->state)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " our key was sent, send ping\n");
+ send_ping (t);
+ t->state = MESH_TUNNEL3_REKEY;
+ }
}
{
struct GNUNET_MESH_KX_Ping res;
+ if (ntohs (msg->header.size) != sizeof (res))
+ {
+ GNUNET_break_op (0);
+ return;
+ }
+
LOG (GNUNET_ERROR_TYPE_DEBUG, " ping message\n");
- t_decrypt (t, &res.target, &msg->target, ping_encryption_size(), msg->iv);
- if (0 != memcmp (&my_full_id, &msg->target, sizeof (my_full_id)))
+ t_decrypt (t, &res.target, &msg->target, ping_encryption_size (), msg->iv);
+ if (0 != memcmp (&my_full_id, &res.target, sizeof (my_full_id)))
{
- GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " at %s\n", GNUNET_i2s (&my_full_id));
- LOG (GNUNET_ERROR_TYPE_DEBUG, " for %s\n", GNUNET_i2s (&msg->target));
+ GNUNET_break_op (0);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " e got %u\n", msg->nonce);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " e towards %s\n", GNUNET_i2s (&msg->target));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " got %u\n", res.nonce);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " towards %s\n", GNUNET_i2s (&res.target));
return;
}
- send_pong (t, res.iv);
+ send_pong (t, res.nonce);
}
handle_pong (struct MeshTunnel3 *t,
const struct GNUNET_MESH_KX_Pong *msg)
{
- if (GNUNET_SCHEDULER_NO_TASK != t->rekey_task)
+ uint32_t challenge;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "PONG received\n");
+ if (GNUNET_SCHEDULER_NO_TASK == t->rekey_task)
{
- GNUNET_SCHEDULER_cancel (t->rekey_task);
- t->rekey_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_free (t->kx_ctx);
- t->kx_ctx = NULL;
+ GNUNET_break_op (0);
+ return;
}
- else
+ t_decrypt (t, &challenge, &msg->nonce, sizeof (uint32_t), msg->iv);
+
+ if (challenge != t->kx_ctx->challenge)
{
- GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Wrong PONG challenge: %u (e: %u). Expected: %u.\n",
+ challenge, msg->nonce, t->kx_ctx->challenge);
+ GNUNET_break_op (0);
+ return;
}
+ GNUNET_SCHEDULER_cancel (t->rekey_task);
+ t->rekey_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_free (t->kx_ctx);
+ t->kx_ctx = NULL;
+ t->state = MESH_TUNNEL3_READY;
+ send_queued_data (t);
}
*
* @param t Tunnel this message came on.
* @param msgh Message header.
- * @param fwd Is this message fwd?
+ * @param fwd Is this message fwd? This only is meaningful in loopback channels.
+ * #GNUNET_YES if message is FWD on the respective channel (loopback)
+ * #GNUNET_NO if message is BCK on the respective channel (loopback)
+ * #GNUNET_SYSERR if message on a one-ended channel (remote)
*/
static void
handle_decrypted (struct MeshTunnel3 *t,
case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE:
handle_ch_create (t,
- (struct GNUNET_MESH_ChannelCreate *) msgh,
- fwd);
+ (struct GNUNET_MESH_ChannelCreate *) msgh);
+ break;
+
+ case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK:
+ handle_ch_nack (t,
+ (struct GNUNET_MESH_ChannelManage *) msgh);
break;
case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK:
*
* @param t Tunnel this message came on.
* @param msg Encrypted message.
- * @param fwd Is this message fwd?
*/
void
GMT_handle_encrypted (struct MeshTunnel3 *t,
- const struct GNUNET_MESH_Encrypted *msg,
- int fwd)
+ const struct GNUNET_MESH_Encrypted *msg)
{
size_t size = ntohs (msg->header.size);
size_t payload_size = size - sizeof (struct GNUNET_MESH_Encrypted);
while (off < decrypted_size)
{
msgh = (struct GNUNET_MessageHeader *) &cbuf[off];
- handle_decrypted (t, msgh, fwd);
+ handle_decrypted (t, msgh, GNUNET_SYSERR);
off += ntohs (msgh->size);
}
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "kx message received\n", type);
switch (type)
{
- case GNUNET_MESSAGE_TYPE_MESH_KX:
+ case GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL:
handle_ephemeral (t, (struct GNUNET_MESH_KX_Ephemeral *) message);
break;
}
-
-/**
- * Cache a message to be sent once tunnel is online.
- *
- * @param t Tunnel to hold the message.
- * @param ch Channel the message is about.
- * @param msg Message itself (copy will be made).
- * @param fwd Is this fwd?
- */
-void
-GMT_queue_data (struct MeshTunnel3 *t,
- struct MeshChannel *ch,
- struct GNUNET_MessageHeader *msg,
- int fwd)
-{
- struct MeshTunnelQueue *tq;
- uint16_t size = ntohs (msg->size);
-
- tq = GNUNET_malloc (sizeof (struct MeshTunnelQueue) + size);
-
- tq->ch = ch;
- memcpy (&tq[1], msg, size);
- GNUNET_CONTAINER_DLL_insert_tail (t->tq_head, t->tq_tail, tq);
-
- if (MESH_TUNNEL3_READY == t->state)
- GMT_send_queued_data (t, fwd);
-}
-
-
-/**
- * Send all cached messages that we can, tunnel is online.
- *
- * @param t Tunnel that holds the messages.
- * @param fwd Is this fwd?
- */
-void
-GMT_send_queued_data (struct MeshTunnel3 *t, int fwd)
-{
- struct MeshTunnelQueue *tq;
- struct MeshTunnelQueue *next;
- unsigned int room;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "GMT_send_queued_data on tunnel %s\n",
- GMT_2s (t));
- room = GMT_get_buffer (t, fwd);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " buffer space: %u\n", room);
- for (tq = t->tq_head; NULL != tq && room > 0; tq = next)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " data on channel %s\n", GMCH_2s (tq->ch));
- next = tq->next;
- room--;
- GNUNET_CONTAINER_DLL_remove (t->tq_head, t->tq_tail, tq);
- GMCH_send_prebuilt_message ((struct GNUNET_MessageHeader *) &tq[1],
- tq->ch, fwd);
-
- GNUNET_free (tq);
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "GMT_send_queued_data end\n",
- GMP_2s (t->peer));
-}
-
-
/**
* Initialize the tunnel subsystem.
*
my_private_key = key;
kx_msg.header.size = htons (sizeof (kx_msg));
- kx_msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX);
+ kx_msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL);
kx_msg.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_MESH_KX);
kx_msg.purpose.size = htonl (ephemeral_purpose_size ());
kx_msg.origin_identity = my_full_id;
GNUNET_SCHEDULER_cancel (rekey_task);
rekey_task = GNUNET_SCHEDULER_NO_TASK;
}
+ GNUNET_CONTAINER_multipeermap_iterate (tunnels, &destroy_iterator, NULL);
GNUNET_CONTAINER_multipeermap_destroy (tunnels);
}
"Tunnel %s state is now %s\n",
GMP_2s (t->peer),
GMT_state2s (state));
- t->state = state;
+ if (myid != GMP_get_short_id (t->peer) &&
+ MESH_TUNNEL3_WAITING == t->state && MESH_TUNNEL3_READY == state)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " triggered rekey\n");
+ rekey_tunnel (t, NULL);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Tunnel %s state is now %s\n",
+ GMP_2s (t->peer),
+ GMT_state2s (t->state));
+ }
+ else
+ {
+ t->state = state;
+ }
if (MESH_TUNNEL3_READY == state && 3 <= GMT_count_connections (t))
{
GMP_stop_search (t->peer);
{
struct MeshTChannel *aux;
+ GNUNET_assert (NULL != ch);
+
LOG (GNUNET_ERROR_TYPE_DEBUG, "Adding channel %p to tunnel %p\n", ch, t);
for (aux = t->channel_head; aux != NULL; aux = aux->next)
{
struct MeshTConnection *iter;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel empty: destroying scheduled\n");
for (iter = t->connection_head; NULL != iter; iter = iter->next)
{
GMC_send_destroy (iter->c);
void
GMT_destroy (struct MeshTunnel3 *t)
{
- struct MeshTConnection *iter;
- struct MeshTConnection *next;
+ struct MeshTConnection *iter_c;
+ struct MeshTConnection *next_c;
+ struct MeshTChannel *iter_ch;
+ struct MeshTChannel *next_ch;
if (NULL == t)
return;
LOG (GNUNET_ERROR_TYPE_DEBUG, "destroying tunnel %s\n", GMP_2s (t->peer));
-// if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (tunnels, &t->id, t))
-// GNUNET_break (0);
+ GNUNET_break (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (tunnels,
+ GMP_get_id (t->peer), t));
- for (iter = t->connection_head; NULL != iter; iter = next)
+ for (iter_c = t->connection_head; NULL != iter_c; iter_c = next_c)
+ {
+ next_c = iter_c->next;
+ GMC_destroy (iter_c->c);
+ }
+ for (iter_ch = t->channel_head; NULL != iter_ch; iter_ch = next_ch)
{
- next = iter->next;
- GMC_destroy (iter->c);
+ next_ch = iter_ch->next;
+ GMCH_destroy (iter_ch->ch);
+ /* Should only happen on shutdown, but it's ok. */
}
GNUNET_STATISTICS_update (stats, "# tunnels", -1, GNUNET_NO);
GMT_get_state (struct MeshTunnel3 *t)
{
if (NULL == t)
+ {
+ GNUNET_break (0);
return (enum MeshTunnel3State) -1;
+ }
return t->state;
}
+
/**
- * Get the total buffer space for a tunnel.
- *
- * If terminal, use the biggest channel buffer (or 64) if no channel exists.
- * If not terminal, use the sum of all connection buffers.
+ * Get the maximum buffer space for a tunnel towards a local client.
*
* @param t Tunnel.
- * @param fwd Is this for FWD traffic?
*
- * @return Buffer space offered by all entities (c/ch) in the tunnel.
+ * @return Biggest buffer space offered by any channel in the tunnel.
*/
unsigned int
-GMT_get_buffer (struct MeshTunnel3 *t, int fwd)
+GMT_get_channels_buffer (struct MeshTunnel3 *t)
{
- struct MeshTConnection *iter;
+ struct MeshTChannel *iter;
unsigned int buffer;
+ unsigned int ch_buf;
- iter = t->connection_head;
- buffer = 0;
+ if (NULL == t->channel_head)
+ {
+ /* Probably getting buffer for a channel create/handshake. */
+ return 64;
+ }
- /* If terminal, return biggest channel buffer */
- if (NULL == iter || GMC_is_terminal (iter->c, fwd))
+ buffer = 0;
+ for (iter = t->channel_head; NULL != iter; iter = iter->next)
{
- struct MeshTChannel *iter_ch;
- unsigned int ch_buf;
+ ch_buf = get_channel_buffer (iter);
+ if (ch_buf > buffer)
+ buffer = ch_buf;
+ }
+ return buffer;
+}
- if (NULL == t->channel_head)
- {
- /* Probably getting buffer for a channel create/handshake. */
- return 64;
- }
- for (iter_ch = t->channel_head; NULL != iter_ch; iter_ch = iter_ch->next)
- {
- ch_buf = GMCH_get_buffer (iter_ch->ch, fwd);
- if (ch_buf > buffer)
- buffer = ch_buf;
- }
- return buffer;
- }
+/**
+ * Get the total buffer space for a tunnel for P2P traffic.
+ *
+ * @param t Tunnel.
+ *
+ * @return Buffer space offered by all connections in the tunnel.
+ */
+unsigned int
+GMT_get_connections_buffer (struct MeshTunnel3 *t)
+{
+ struct MeshTConnection *iter;
+ unsigned int buffer;
- /* If not terminal, return sum of connection buffers */
+ iter = t->connection_head;
+ buffer = 0;
while (NULL != iter)
{
if (GMC_get_state (iter->c) != MESH_CONNECTION_READY)
continue;
}
- buffer += GMC_get_buffer (iter->c, fwd);
+ buffer += get_connection_buffer (iter);
iter = iter->next;
}
* Send ACK on one or more channels due to buffer in connections.
*
* @param t Channel which has some free buffer space.
- * @param fwd Is this for FWD traffic? (ACK goes to root)
*/
void
-GMT_unchoke_channels (struct MeshTunnel3 *t, int fwd)
+GMT_unchoke_channels (struct MeshTunnel3 *t)
{
struct MeshTChannel *iter;
unsigned int buffer;
if (NULL != t->channel_head)
LOG (GNUNET_ERROR_TYPE_DEBUG, " head ch: %p\n", t->channel_head->ch);
- if (NULL == t)
- {
- GNUNET_break (0);
- return;
- }
-
/* Get buffer space */
- buffer = GMT_get_buffer (t, fwd);
+ buffer = GMT_get_connections_buffer (t);
if (0 == buffer)
{
return;
choked_n = 0;
for (iter = t->channel_head; NULL != iter; iter = iter->next)
{
- if (GNUNET_NO == GMCH_get_allowed (iter->ch, fwd))
+ if (GNUNET_NO == get_channel_allowed (iter))
{
choked[choked_n++] = iter->ch;
}
{
unsigned int r = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
choked_n);
- GMCH_allow_client (choked[r], fwd);
+ GMCH_allow_client (choked[r], GMCH_is_origin (choked[r], GNUNET_YES));
choked_n--;
buffer--;
choked[r] = choked[choked_n];
* Iterates all connections of the tunnel and sends ACKs appropriately.
*
* @param t Tunnel.
- * @param fwd Is this in for FWD traffic? (ACK goes dest->root)
*/
void
-GMT_send_acks (struct MeshTunnel3 *t, int fwd)
+GMT_send_connection_acks (struct MeshTunnel3 *t)
{
struct MeshTConnection *iter;
uint32_t allowed;
unsigned int buffer;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Tunnel send %s ACKs on %s\n",
- fwd ? "FWD" : "BCK", GMT_2s (t));
+ "Tunnel send connection ACKs on %s\n",
+ GMT_2s (t));
if (NULL == t)
{
GNUNET_break (0);
return;
}
- if (NULL == t->channel_head ||
- GNUNET_NO == GMCH_is_origin (t->channel_head->ch, !fwd))
- {
- GNUNET_break (0);
- return;
- }
- buffer = GMT_get_buffer (t, fwd);
+ buffer = GMT_get_channels_buffer (t);
/* Count connections, how many messages are already allowed */
cs = GMT_count_connections (t);
for (allowed = 0, iter = t->connection_head; NULL != iter; iter = iter->next)
{
- allowed += GMC_get_allowed (iter->c, fwd);
+ allowed += get_connection_allowed (iter);
}
/* Make sure there is no overflow */
if (allowed > buffer)
{
- GNUNET_break (0);
return;
}
allow_per_connection = to_allow/cs;
to_allow -= allow_per_connection;
cs--;
- if (GMC_get_allowed (iter->c, fwd) > 64 / 3)
+ if (get_connection_allowed (iter) > 64 / 3)
{
continue;
}
- GMC_allow (iter->c, buffer, fwd);
+ GMC_allow (iter->c, buffer, GMC_is_origin (iter->c, GNUNET_YES));
}
GNUNET_break (to_allow == 0);
}
+/**
+ * Callback called when a queued message is sent.
+ *
+ * Calculates the average time and connection packet tracking.
+ *
+ * @param cls Closure (TunnelQueue handle).
+ * @param c Connection this message was on.
+ * @param type Type of message sent.
+ * @param fwd Was this a FWD going message?
+ * @param size Size of the message.
+ */
+static void
+message_sent (void *cls,
+ struct MeshConnection *c,
+ struct MeshConnectionQueue *q,
+ uint16_t type, int fwd, size_t size)
+{
+ struct MeshTunnel3Queue *qt = cls;
+
+ GNUNET_assert (NULL != qt->cont);
+ qt->cont (qt->cont_cls, GMC_get_tunnel (c), qt, type, size);
+ GNUNET_free (qt);
+}
+
+
+/**
+ * Cancel a previously sent message while it's in the queue.
+ *
+ * ONLY can be called before the continuation given to the send function
+ * is called. Once the continuation is called, the message is no longer in the
+ * queue.
+ *
+ * @param q Handle to the queue.
+ */
+void
+GMT_cancel (struct MeshTunnel3Queue *q)
+{
+ GMC_cancel (q->q);
+ /* message_sent() will be called and free q */
+}
+
/**
* Sends an already built message on a tunnel, encrypting it and
* choosing the best connection.
* @param message Message to send. Function modifies it.
* @param t Tunnel on which this message is transmitted.
* @param ch Channel on which this message is transmitted.
- * @param fwd Is this a fwd message?
+ * @param fwd Is this a fwd message on @c ch?
+ * @param cont Continuation to call once message is really sent.
+ * @param cont_cls Closure for @c cont.
+ *
+ * @return Handle to cancel message. NULL if @c cont is NULL.
*/
-void
+struct MeshTunnel3Queue *
GMT_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
struct MeshTunnel3 *t,
- struct MeshChannel *ch,
- int fwd)
+ struct MeshChannel *ch, int fwd,
+ GMT_sent cont, void *cont_cls)
{
+ struct MeshTunnel3Queue *q;
struct MeshConnection *c;
struct GNUNET_MESH_Encrypted *msg;
size_t size = ntohs (message->size);
size_t encrypted_size;
- char *cbuf[sizeof (struct GNUNET_MESH_Encrypted) + size + 64];
- uint64_t iv;
+ char cbuf[sizeof (struct GNUNET_MESH_Encrypted) + size];
+ uint32_t iv;
uint16_t type;
+ if (MESH_TUNNEL3_READY != t->state)
+ {
+ queue_data (t, ch, message);
+ /* FIXME */
+ return NULL;
+ }
LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT Send on Tunnel %s\n", GMT_2s (t));
- iv = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_NONCE, UINT64_MAX);
+ if (GMT_is_loopback (t))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " loopback!\n");
+ handle_decrypted (t, message, fwd);
+ /* FIXME: call cont? */
+ return NULL; /* Already delivered, cannot cancel */
+ }
+
+ iv = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
msg = (struct GNUNET_MESH_Encrypted *) cbuf;
msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED);
- msg->iv = GNUNET_htonll (iv);
+ msg->iv = iv;
encrypted_size = t_encrypt (t, &msg[1], message, size, iv);
msg->header.size = htons (sizeof (struct GNUNET_MESH_Encrypted) + encrypted_size);
- c = tunnel_get_connection (t, fwd);
+ c = tunnel_get_connection (t);
if (NULL == c)
{
GNUNET_break (GNUNET_YES == t->destroy);
- return;
+ return NULL;
}
type = ntohs (message->type);
switch (type)
{
case GNUNET_MESSAGE_TYPE_MESH_DATA:
+ case GNUNET_MESSAGE_TYPE_MESH_DATA_ACK:
case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE:
case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY:
case GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK:
GNUNET_break (0);
}
- GMC_send_prebuilt_message (&msg->header, c, fwd);
+ fwd = GMC_is_origin (c, GNUNET_YES);
+
+ if (NULL == cont)
+ {
+ (void) GMC_send_prebuilt_message (&msg->header, c, fwd, NULL, NULL);
+ return NULL;
+ }
+ q = GNUNET_new (struct MeshTunnel3Queue); /* FIXME valgrind: leak*/
+ q->q = GMC_send_prebuilt_message (&msg->header, c, fwd, &message_sent, q);
+ q->cont = cont;
+ q->cont_cls = cont_cls;
+
+ return q;
}
/**
*
* @param t Tunnel.
*
- * @return GNUNET_YES if it is loopback.
+ * @return #GNUNET_YES if it is loopback.
*/
int
GMT_is_loopback (const struct MeshTunnel3 *t)
{
- return (myid == GMP_get_short_id(t->peer));
+ return (myid == GMP_get_short_id (t->peer));
}
/**
- * Is the tunnel using this path already?
+ * Is the tunnel this path already?
*
* @param t Tunnel.
* @param p Path.
*
- * @return GNUNET_YES a connection uses this path.
+ * @return #GNUNET_YES a connection uses this path.
*/
int
GMT_is_path_used (const struct MeshTunnel3 *t, const struct MeshPeerPath *p)
const char *
GMT_2s (const struct MeshTunnel3 *t)
{
+ if (NULL == t)
+ return "(NULL)";
+
return GMP_2s (t->peer);
-}
\ No newline at end of file
+}
projects / oweals / gnunet.git / blobdiff