projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
loglevel MESSAGE for the incoming connection message + type
[oweals/gnunet.git]
/
src
/
cadet
/
cadet.h
diff --git
a/src/cadet/cadet.h
b/src/cadet/cadet.h
index 205955b053ccdfc715442c7f6abc0303a8b2966c..451d1f354363f18627781e57b95a1879dac995b0 100644
(file)
--- a/
src/cadet/cadet.h
+++ b/
src/cadet/cadet.h
@@
-68,7
+68,7
@@
extern "C"
/**
* Minimum value for channel IDs of local clients.
*/
/**
* Minimum value for channel IDs of local clients.
*/
-#define GNUNET_CADET_LOCAL_CHANNEL_ID_CLI 0x80000000
+#define GNUNET_CADET_LOCAL_CHANNEL_ID_CLI 0x80000000
U
/**
* FIXME.
/**
* FIXME.
@@
-135,10
+135,10
@@
struct GNUNET_CADET_PortMessage
/**
* Message for a client to create channels.
*/
/**
* Message for a client to create channels.
*/
-struct GNUNET_CADET_
Tu
nnelCreateMessage
+struct GNUNET_CADET_
LocalCha
nnelCreateMessage
{
/**
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_
TU
NNEL_CREATE
+ * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_
CHA
NNEL_CREATE
*
* Size: sizeof(struct GNUNET_CADET_ChannelOpenMessageMessage)
*/
*
* Size: sizeof(struct GNUNET_CADET_ChannelOpenMessageMessage)
*/
@@
-147,7
+147,7
@@
struct GNUNET_CADET_TunnelCreateMessage
/**
* ID of a channel controlled by this client.
*/
/**
* ID of a channel controlled by this client.
*/
- struct GNUNET_CADET_ClientChannelNumber c
hannel_id
;
+ struct GNUNET_CADET_ClientChannelNumber c
cn
;
/**
* Channel's peer
/**
* Channel's peer
@@
-169,17
+169,17
@@
struct GNUNET_CADET_TunnelCreateMessage
/**
* Message for or to a client to destroy tunnel.
*/
/**
* Message for or to a client to destroy tunnel.
*/
-struct GNUNET_CADET_
Tu
nnelDestroyMessage
+struct GNUNET_CADET_
LocalCha
nnelDestroyMessage
{
/**
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_
TU
NNEL_DESTROY
+ * Type: #GNUNET_MESSAGE_TYPE_CADET_LOCAL_
CHA
NNEL_DESTROY
*/
struct GNUNET_MessageHeader header;
/**
* ID of a channel controlled by this client.
*/
*/
struct GNUNET_MessageHeader header;
/**
* ID of a channel controlled by this client.
*/
- struct GNUNET_CADET_ClientChannelNumber c
hannel_id
;
+ struct GNUNET_CADET_ClientChannelNumber c
cn
;
};
};
@@
-196,7
+196,7
@@
struct GNUNET_CADET_LocalData
/**
* ID of the channel
*/
/**
* ID of the channel
*/
- struct GNUNET_CADET_ClientChannelNumber c
hannel_id
;
+ struct GNUNET_CADET_ClientChannelNumber c
cn
;
/**
* Payload follows
/**
* Payload follows
@@
-218,13
+218,15
@@
struct GNUNET_CADET_LocalAck
/**
* ID of the channel allowed to send more data.
*/
/**
* ID of the channel allowed to send more data.
*/
- struct GNUNET_CADET_ClientChannelNumber c
hannel_id
;
+ struct GNUNET_CADET_ClientChannelNumber c
cn
;
};
/**
* Message to inform the client about channels in the service.
};
/**
* Message to inform the client about channels in the service.
+ *
+ * TODO: split into two messages!
*/
struct GNUNET_CADET_LocalInfo
{
*/
struct GNUNET_CADET_LocalInfo
{
@@
-237,12
+239,7
@@
struct GNUNET_CADET_LocalInfo
/**
* ID of the channel allowed to send more data.
*/
/**
* 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).
/**
* ID of the destination of the channel (can be local peer).
@@
-253,6
+250,8
@@
struct GNUNET_CADET_LocalInfo
/**
* Message to inform the client about one of the peers in the service.
/**
* Message to inform the client about one of the peers in the service.
+ *
+ * TODO: split into two messages!
*/
struct GNUNET_CADET_LocalInfoPeer
{
*/
struct GNUNET_CADET_LocalInfoPeer
{
@@
-284,6
+283,8
@@
struct GNUNET_CADET_LocalInfoPeer
/**
* Message to inform the client about one of the tunnels in the service.
/**
* Message to inform the client about one of the tunnels in the service.
+ *
+ * TODO: split into two messages!
*/
struct GNUNET_CADET_LocalInfoTunnel
{
*/
struct GNUNET_CADET_LocalInfoTunnel
{