#include "gnunet_util_lib.h"
/**
- * All the states a tunnel can be in.
+ * All the connectivity states a tunnel can be in.
*/
-enum MeshTunnel3State
+enum MeshTunnel3CState
{
/**
* Uninitialized status, should never appear in operation.
MESH_TUNNEL3_NEW,
/**
- * Path to the peer not known yet
+ * Path to the peer not known yet.
*/
MESH_TUNNEL3_SEARCHING,
MESH_TUNNEL3_WAITING,
/**
- * Peer connected and ready to accept data
+ * Peer connected and ready to accept data.
*/
MESH_TUNNEL3_READY,
+};
- /**
- * Peer connected previosly but not responding
- */
- MESH_TUNNEL3_RECONNECTING
+
+/**
+ * All the encryption states a tunnel can be in.
+ */
+enum MeshTunnel3EState
+{
+ /**
+ * Uninitialized status, should never appear in operation.
+ */
+ MESH_TUNNEL3_KEY_UNINITIALIZED,
+
+ /**
+ * Ephemeral key sent, waiting for peer's key.
+ */
+ MESH_TUNNEL3_KEY_SENT,
+
+ /**
+ * New ephemeral key and ping sent, waiting for pong.
+ * This means that we DO have the peer's ephemeral key, otherwise the
+ * state would be KEY_SENT.
+ */
+ MESH_TUNNEL3_KEY_PING,
+
+ /**
+ * Handshake completed: session key available.
+ */
+ MESH_TUNNEL3_KEY_OK,
};
/**
#include "gnunet-service-mesh_connection.h"
#include "gnunet-service-mesh_peer.h"
+/**
+ * Handle for messages queued but not yet sent.
+ */
+struct MeshTunnel3Queue;
+
+/**
+ * Callback called when a queued message is sent.
+ *
+ * @param cls Closure.
+ * @param t Tunnel this message was on.
+ * @param type Type of message sent.
+ * @param size Size of the message.
+ */
+typedef void (*GMT_sent) (void *cls,
+ struct MeshTunnel3 *t,
+ struct MeshTunnel3Queue *q,
+ uint16_t type, size_t size);
+
/******************************************************************************/
/******************************** API ***********************************/
void
GMT_destroy (struct MeshTunnel3 *t);
+
+/**
+ * Change the tunnel's connection state.
+ *
+ * @param t Tunnel whose connection state to change.
+ * @param cstate New connection state.
+ */
+void
+GMT_change_cstate (struct MeshTunnel3* t, enum MeshTunnel3CState cstate);
+
+
/**
- * Change the tunnel state.
+ * Change the tunnel encryption state.
*
- * @param t Tunnel whose state to change.
- * @param state New state.
+ * @param t Tunnel whose encryption state to change.
+ * @param state New encryption state.
*/
void
-GMT_change_state (struct MeshTunnel3* t, enum MeshTunnel3State state);
+GMT_change_estate (struct MeshTunnel3* t, enum MeshTunnel3EState state);
/**
* Add a connection to a tunnel.
* towards a channel of a local tunnel.
*
* @param t Tunnel this message came on.
- * @param msgh Message header.
- * @param fwd Is this message fwd?
+ * @param msg Message header.
*/
void
GMT_handle_encrypted (struct MeshTunnel3 *t,
- const struct GNUNET_MESH_Encrypted *msg,
- int fwd);
+ const struct GNUNET_MESH_Encrypted *msg);
/**
- * Cache a message to be sent once tunnel is online.
+ * Demultiplex an encapsulated KX message by message type.
*
- * @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?
+ * @param t Tunnel on which the message came.
+ * @param message KX message itself.
*/
void
-GMT_queue_data (struct MeshTunnel3 *t,
- struct MeshChannel *ch,
- struct GNUNET_MessageHeader *msg,
- int 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);
+GMT_handle_kx (struct MeshTunnel3 *t,
+ const struct GNUNET_MessageHeader *message);
/**
* @brief Use the given path for the tunnel.
GMT_count_channels (struct MeshTunnel3 *t);
/**
- * Get the state of a tunnel.
+ * Get the connectivity state of a tunnel.
+ *
+ * @param t Tunnel.
+ *
+ * @return Tunnel's connectivity state.
+ */
+enum MeshTunnel3CState
+GMT_get_cstate (struct MeshTunnel3 *t);
+
+/**
+ * Get the maximum buffer space for a tunnel towards a local client.
*
* @param t Tunnel.
*
- * @return Tunnel's state.
+ * @return Biggest buffer space offered by any channel in the tunnel.
*/
-enum MeshTunnel3State
-GMT_get_state (struct MeshTunnel3 *t);
+unsigned int
+GMT_get_channels_buffer (struct MeshTunnel3 *t);
/**
- * Get the total buffer space for a tunnel.
- *
- * FIXME get a ch parameter in case of loopback tunnels
+ * Get the total buffer space for a tunnel for P2P traffic.
*
* @param t Tunnel.
- * @param fwd Is this for FWD traffic?
*
* @return Buffer space offered by all connections in the tunnel.
*/
unsigned int
-GMT_get_buffer (struct MeshTunnel3 *t, int fwd);
+GMT_get_connections_buffer (struct MeshTunnel3 *t);
/**
* Get the tunnel's destination.
GMT_get_next_chid (struct MeshTunnel3 *t);
/**
- * Send ACK on one or more channels due to buffer in connections..
+ * 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);
/**
* Send ACK on one or more connections due to buffer space to the client.
*
* Iterates all connections of the tunnel and sends ACKs appropriately.
*
- * @param ch Channel which has some free buffer space.
- * @param fwd Is this in for FWD traffic? (ACK goes dest->root)
+ * @param t Tunnel which has some free buffer space.
+ */
+void
+GMT_send_connection_acks (struct MeshTunnel3 *t);
+
+/**
+ * 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_send_acks (struct MeshTunnel3 *t, int fwd);
+GMT_cancel (struct MeshTunnel3Queue *q);
/**
* Sends an already built message on a tunnel, encrypting it and
*
* @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 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.
+ *
+ * @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 MeshTunnel3 *t, int force,
+ GMT_sent cont, void *cont_cls);
/**
* Is the tunnel directed towards the local peer?
*
* @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);
* @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);
projects / oweals / gnunet.git / blobdiff