struct MeshTunnelDelayed *prev;
/**
- * Channel.
+ * Tunnel.
*/
- struct MeshChannel *ch;
+ struct MeshTunnel3 *t;
+
+ struct MeshTunnel3Queue *q;
+ GMT_sent cont;
+ void *cont_cls;
/**
* Message to send.
*/
struct MeshConnectionQueue *q;
+ /**
+ * Handle in case message hasn't been given to a connection yet.
+ */
+ struct MeshTunnelDelayed *tq;
+
/**
* Continuation to call once sent.
*/
}
+/**
+ * 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 q Connection queue handle (unused).
+ * @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);
+}
+
+
+/**
+ * Delete a queued message: either was sent or the channel was destroyed
+ * before the tunnel's key exchange had a chance to finish.
+ *
+ * @param tq Queue handle.
+ */
+static void
+unqueue_data (struct MeshTunnelDelayed *tq)
+{
+ GNUNET_CONTAINER_DLL_remove (tq->t->tq_head, tq->t->tq_tail, tq);
+ GNUNET_free (tq);
+}
+
+
+/**
+ * Cache a message to be sent once tunnel is online.
+ *
+ * @param t Tunnel to hold the message.
+ * @param msg Message itself (copy will be made).
+ */
+static struct MeshTunnelDelayed *
+queue_data (struct MeshTunnel3 *t, const struct GNUNET_MessageHeader *msg,
+ GMT_sent cont, void *cont_cls)
+{
+ struct MeshTunnelDelayed *tq;
+ uint16_t size = ntohs (msg->size);
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "queue data on Tunnel %s\n", GMT_2s (t));
+
+ if (GNUNET_YES == is_ready (t))
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+
+ tq = GNUNET_malloc (sizeof (struct MeshTunnelDelayed) + size);
+
+ tq->t = t;
+ tq->cont = cont;
+ tq->cont_cls = cont_cls;
+ memcpy (&tq[1], msg, size);
+ GNUNET_CONTAINER_DLL_insert_tail (t->tq_head, t->tq_tail, tq);
+ return tq;
+}
+
+
+
+/**
+ * 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 force Force the tunnel to take the message (buffer overfill).
+ * @param cont Continuation to call once message is really sent.
+ * @param cont_cls Closure for @c cont.
+ * @param existing_q In case this a transmission of previously queued data,
+ * this should be TunnelQueue given to the client.
+ * Otherwise, NULL.
+ *
+ * @return Handle to cancel message. NULL if @c cont is NULL.
+ */
+static struct MeshTunnel3Queue *
+send_prebuilt_message (const struct GNUNET_MessageHeader *message,
+ struct MeshTunnel3 *t, int force,
+ GMT_sent cont, void *cont_cls,
+ struct MeshTunnel3Queue *existing_q)
+{
+ 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];
+ uint32_t iv;
+ uint16_t type;
+ int fwd;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT Send on Tunnel %s\n", GMT_2s (t));
+
+ if (GNUNET_NO == is_ready (t))
+ {
+ GNUNET_assert (NULL == existing_q);
+ q = GNUNET_new (struct MeshTunnel3Queue);
+ q->tq = queue_data (t, message, cont, cont_cls);
+ q->tq->q = q;
+ return q;
+ }
+
+ GNUNET_assert (GNUNET_NO == GMT_is_loopback (t));
+
+ 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 = 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);
+ if (NULL == c)
+ {
+ GNUNET_break (GNUNET_YES == t->destroy);
+ 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:
+ msg->cid = *GMC_get_id (c);
+ msg->ttl = htonl (default_ttl);
+ break;
+ default:
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "unkown type %s\n",
+ GM_m2s (type));
+ GNUNET_break (0);
+ }
+
+ fwd = GMC_is_origin (c, GNUNET_YES);
+
+ if (NULL == cont)
+ {
+ (void) GMC_send_prebuilt_message (&msg->header, c, fwd, force, NULL, NULL);
+ return NULL;
+ }
+ if (NULL == existing_q)
+ {
+ q = GNUNET_new (struct MeshTunnel3Queue); /* FIXME valgrind: leak*/
+ }
+ else
+ {
+ q = existing_q;
+ q->tq = NULL;
+ }
+ q->q = GMC_send_prebuilt_message (&msg->header, c, fwd, force,
+ &message_sent, q);
+ q->cont = cont;
+ q->cont_cls = cont_cls;
+
+ return q;
+}
+
+
/**
* Send all cached messages that we can, tunnel is online.
*
LOG (GNUNET_ERROR_TYPE_DEBUG, " tq head: %p\n", t->tq_head);
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));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " sending queued data\n");
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),
- NULL);
-
- GNUNET_free (tq);
+ send_prebuilt_message ((struct GNUNET_MessageHeader *) &tq[1],
+ tq->t, GNUNET_YES, tq->cont, tq->cont_cls, tq->q);
+ unqueue_data (tq);
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"GMT_send_queued_data end\n",
}
-
-
-/**
- * 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);
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "queue data on Tunnel %s\n", GMT_2s (t));
-
- if (GNUNET_YES == is_ready (t))
- {
- 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 cstate New connection state.
*/
void
-GMT_change_cstate (struct MeshTunnel3* t, enum MeshTunnel3CState state)
+GMT_change_cstate (struct MeshTunnel3* t, enum MeshTunnel3CState cstate)
{
if (NULL == t)
return;
GMP_2s (t->peer), cstate2s (t->cstate));
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Tunnel %s cstate is now %s\n",
- GMP_2s (t->peer), cstate2s (state));
+ GMP_2s (t->peer), cstate2s (cstate));
if (myid != GMP_get_short_id (t->peer) &&
MESH_TUNNEL3_READY != t->cstate &&
- MESH_TUNNEL3_READY == state)
+ MESH_TUNNEL3_READY == cstate)
{
- t->cstate = state;
+ t->cstate = cstate;
if (MESH_TUNNEL3_KEY_OK == t->estate)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " triggered send queued data\n");
rekey_tunnel (t, NULL);
}
}
- t->cstate = state;
+ t->cstate = cstate;
- if (MESH_TUNNEL3_READY == state && 3 <= GMT_count_connections (t))
+ if (MESH_TUNNEL3_READY == cstate && 3 <= GMT_count_connections (t))
{
GMP_stop_search (t->peer);
}
{
struct MeshTConnection *aux;
+ GNUNET_assert (NULL != c);
+
for (aux = t->connection_head; aux != NULL; aux = aux->next)
if (aux->c == c)
return;
GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_NONCE, &cid);
c = GMC_new (&cid, t, p, own_pos);
+ if (NULL == c)
+ {
+ /* Path was flawed */
+ return NULL;
+ }
GMT_add_connection (t, c);
return c;
}
{
if (GMC_get_state (iter->c) != MESH_CONNECTION_READY)
{
- iter = iter->next;
continue;
}
buffer += get_connection_buffer (iter);
GMT_get_next_chid (struct MeshTunnel3 *t)
{
MESH_ChannelNumber chid;
+ MESH_ChannelNumber mask;
+ int result;
+
+ /* Set bit 30 depending on the ID relationship. Bit 31 is always 0 for GID.
+ * If our ID is bigger or loopback tunnel, start at 0, bit 30 = 0
+ * If peer's ID is bigger, start at 0x4... bit 30 = 1
+ */
+ result = GNUNET_CRYPTO_cmp_peer_identity (&my_full_id, GMP_get_id (t->peer));
+ if (0 > result)
+ mask = 0x4000000;
+ else
+ mask = 0x0;
while (NULL != GMT_get_channel (t, t->next_chid))
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Channel %u exists...\n", t->next_chid);
t->next_chid = (t->next_chid + 1) & ~GNUNET_MESH_LOCAL_CHANNEL_ID_CLI;
+ t->next_chid |= mask;
}
chid = t->next_chid;
t->next_chid = (t->next_chid + 1) & ~GNUNET_MESH_LOCAL_CHANNEL_ID_CLI;
+ t->next_chid |= mask;
return chid;
}
}
-/**
- * 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.
*
void
GMT_cancel (struct MeshTunnel3Queue *q)
{
- GMC_cancel (q->q);
- /* message_sent() will be called and free q */
+ if (NULL != q->q)
+ {
+ GMC_cancel (q->q);
+ /* message_sent() will be called and free q */
+ }
+ else if (NULL != q->tq)
+ {
+ unqueue_data (q->tq);
+ }
+ else
+ {
+ GNUNET_break (0);
+ }
}
*
* @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 force Force the tunnel to take the message (buffer overfill).
* @param cont Continuation to call once message is really sent.
* @param cont_cls Closure for @c cont.
*/
struct MeshTunnel3Queue *
GMT_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
- struct MeshTunnel3 *t, struct MeshChannel *ch,
- int force,
+ struct MeshTunnel3 *t, int force,
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];
- uint32_t iv;
- uint16_t type;
- int fwd;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT Send on Tunnel %s\n", GMT_2s (t));
-
- if (GNUNET_NO == is_ready (t))
- {
- queue_data (t, ch, message);
- /* FIXME */
- return NULL;
- }
-
- GNUNET_assert (GNUNET_NO == GMT_is_loopback (t));
-
- 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 = 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);
- if (NULL == c)
- {
- GNUNET_break (GNUNET_YES == t->destroy);
- 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:
- msg->cid = *GMC_get_id (c);
- msg->ttl = htonl (default_ttl);
- break;
- default:
- LOG (GNUNET_ERROR_TYPE_DEBUG, "unkown type %s\n",
- GM_m2s (type));
- GNUNET_break (0);
- }
-
- fwd = GMC_is_origin (c, GNUNET_YES);
-
- if (NULL == cont)
- {
- (void) GMC_send_prebuilt_message (&msg->header, c, fwd, force, NULL, NULL);
- return NULL;
- }
- q = GNUNET_new (struct MeshTunnel3Queue); /* FIXME valgrind: leak*/
- q->q = GMC_send_prebuilt_message (&msg->header, c, fwd, force,
- &message_sent, q);
- q->cont = cont;
- q->cont_cls = cont_cls;
-
- return q;
+ return send_prebuilt_message (message, t, force, cont, cont_cls, NULL);
}
+
/**
* Is the tunnel directed towards the local peer?
*
projects / oweals / gnunet.git / blobdiff