/**
* Minimum value for channel IDs of local clients.
*/
-#define GNUNET_CADET_LOCAL_CHANNEL_ID_CLI 0x80000000
+#define GNUNET_CADET_LOCAL_CHANNEL_ID_CLI 0x80000000U
/**
* FIXME.
/**
* Message for a client to create channels.
*/
-struct GNUNET_CADET_ChannelOpenMessageMessage
+struct GNUNET_CADET_LocalChannelCreateMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_CREATE
+ * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE
*
* Size: sizeof(struct GNUNET_CADET_ChannelOpenMessageMessage)
*/
/**
* ID of a channel controlled by this client.
*/
- struct GNUNET_CADET_ClientChannelNumber channel_id;
+ struct GNUNET_CADET_ClientChannelNumber ccn;
/**
* Channel's peer
/**
- * Message for a client to destroy channels.
+ * Message for or to a client to destroy tunnel.
*/
-struct GNUNET_CADET_ChannelDestroyMessage
+struct GNUNET_CADET_LocalChannelDestroyMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_TUNNEL_DESTROY
- *
- * Size: sizeof(struct GNUNET_CADET_ChannelDestroyMessage)
+ * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY
*/
struct GNUNET_MessageHeader header;
/**
* ID of a channel controlled by this client.
*/
- struct GNUNET_CADET_ClientChannelNumber channel_id;
+ struct GNUNET_CADET_ClientChannelNumber ccn;
};
/**
* ID of the channel
*/
- struct GNUNET_CADET_ClientChannelNumber channel_id;
+ struct GNUNET_CADET_ClientChannelNumber ccn;
/**
* Payload follows
/**
* ID of the channel allowed to send more data.
*/
- struct GNUNET_CADET_ClientChannelNumber channel_id;
+ struct GNUNET_CADET_ClientChannelNumber ccn;
};
/**
* Message to inform the client about channels in the service.
+ *
+ * TODO: split into two messages!
*/
struct GNUNET_CADET_LocalInfo
{
/**
* ID of the channel allowed to send more data.
*/
- struct GNUNET_CADET_ClientChannelNumber channel_id;
-
- /**
- * ID of the owner of the channel (can be local peer).
- */
-// struct GNUNET_PeerIdentity owner;
+ struct GNUNET_CADET_ClientChannelNumber ccn;
/**
* ID of the destination of the channel (can be local peer).
/**
* Message to inform the client about one of the peers in the service.
+ *
+ * TODO: split into two messages!
*/
struct GNUNET_CADET_LocalInfoPeer
{
/**
* Message to inform the client about one of the tunnels in the service.
+ *
+ * TODO: split into two messages!
*/
struct GNUNET_CADET_LocalInfoTunnel
{