#endif
#endif
-#define MESH_TUNNEL_OPT_SPEED_MIN 0x1
-#define MESH_TUNNEL_OPT_NOBUFFER 0x2
-
-
/******************************************************************************/
/******************** MESH NETWORK MESSAGES **************************/
/******************************************************************************/
GNUNET_NETWORK_STRUCT_BEGIN
/**
- * Message for mesh path management
+ * Message for mesh path creation.
*/
-struct GNUNET_MESH_ManipulatePath
+struct GNUNET_MESH_CreateTunnel
{
/**
- * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_[CREATE|CHANGE|ADD|DESTROY]
+ * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE
*
* Size: sizeof(struct GNUNET_MESH_ManipulatePath) +
* path_length * sizeof (struct GNUNET_PeerIdentity)
uint32_t tid GNUNET_PACKED;
/**
- * Tunnel options (MESH_TUNNEL_OPT_*).
+ * Tunnel options (GNUNET_MESH_OPTION_*).
*/
uint32_t opt GNUNET_PACKED;
/**
- * 64 bit alignment padding.
+ * Destination port.
*/
- uint32_t reserved GNUNET_PACKED;
+ uint32_t port GNUNET_PACKED;
/**
+ * FIXME do not add the first hop
* path_length structs defining the *whole* path from the origin [0] to the
* final destination [path_length-1].
*/
/* struct GNUNET_PeerIdentity peers[path_length]; */
};
-/**
- * Message for mesh data traffic to all tunnel targets.
- */
-struct GNUNET_MESH_Multicast
-{
- /**
- * Type: GNUNET_MESSAGE_TYPE_MESH_MULTICAST
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * TID of the tunnel
- */
- uint32_t tid GNUNET_PACKED;
-
- /**
- * Number of hops to live
- */
- uint32_t ttl GNUNET_PACKED;
-
- /**
- * Unique ID of the packet
- */
- uint32_t pid GNUNET_PACKED;
-
- /**
- * OID of the tunnel
- */
- struct GNUNET_PeerIdentity oid;
-
- /**
- * Payload follows
- */
-};
-
/**
- * Message for mesh data traffic to a particular destination from origin.
+ * Message for mesh data traffic.
*/
-struct GNUNET_MESH_Unicast
+struct GNUNET_MESH_Data
{
/**
- * Type: GNUNET_MESSAGE_TYPE_MESH_UNICAST
+ * Type: GNUNET_MESSAGE_TYPE_MESH_UNICAST,
+ * GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN
*/
struct GNUNET_MessageHeader header;
uint32_t ttl GNUNET_PACKED;
/**
- * Unique ID of the packet
+ * ID of the packet
*/
uint32_t pid GNUNET_PACKED;
*/
struct GNUNET_PeerIdentity oid;
- /**
- * Destination.
- */
- struct GNUNET_PeerIdentity destination;
+ /**
+ * Unique ID of the payload message
+ */
+ uint32_t mid GNUNET_PACKED;
/**
* Payload follows
/**
- * Message for mesh data traffic from a tunnel participant to origin.
+ * Message to acknowledge end-to-end data.
*/
-struct GNUNET_MESH_ToOrigin
+struct GNUNET_MESH_DataACK
{
- /**
- * Type: GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN
- */
+ /**
+ * Type: GNUNET_MESSAGE_TYPE_MESH_DATA_ACK
+ */
struct GNUNET_MessageHeader header;
- /**
- * TID of the tunnel
- */
+ /**
+ * TID of the tunnel
+ */
uint32_t tid GNUNET_PACKED;
- /**
- * Number of hops to live
- */
- uint32_t ttl GNUNET_PACKED;
-
- /**
- * Unique ID of the packet
- */
- uint32_t pid GNUNET_PACKED;
-
- /**
- * OID of the tunnel
- */
+ /**
+ * OID of the tunnel
+ */
struct GNUNET_PeerIdentity oid;
- /**
- * Sender of the message.
- */
- struct GNUNET_PeerIdentity sender;
+ /**
+ * Bitfield of already-received newer messages
+ * pid + 1 @ LSB
+ * pid + 64 @ MSB
+ */
+ uint64_t futures GNUNET_PACKED;
- /**
- * Payload follows
- */
+ /**
+ * Last message ID received.
+ */
+ uint32_t mid GNUNET_PACKED;
};
/**
* Maximum packet ID authorized.
*/
- uint32_t pid;
-
+ uint32_t pid GNUNET_PACKED;
};
+
/**
* Message to query a peer about its Flow Control status regarding a tunnel.
*/
struct GNUNET_PeerIdentity oid;
/**
- * Last ACK received.
+ * Last packet sent.
*/
- uint32_t last_ack;
+ uint32_t pid GNUNET_PACKED;
};
/**
*/
struct GNUNET_PeerIdentity peer_id;
+ /**
+ * Initial ACK value for payload.
+ */
+ uint32_t ack GNUNET_PACKED;
+
/* TODO: signature */
};
struct GNUNET_MESH_TunnelKeepAlive
{
/**
- * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE
+ * Type: GNUNET_MESSAGE_TYPE_MESH_PATH_(FWD|BCK)_KEEPALIVE
*/
struct GNUNET_MessageHeader header;
-
+
/**
* TID of the tunnel
*/
uint32_t tid GNUNET_PACKED;
-
+
/**
* OID of the tunnel
*/