diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-15 21:49:06 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-15 21:49:06 +0100 |
commit | 71785fccb8584bd028ff48aa56f55e84324c569e (patch) | |
tree | df07376ac00f04484045be67f5743ff42449a2d2 /src/include | |
parent | 4270685ca41e6401f0836716a24e87dbab4d1145 (diff) | |
download | gnunet-71785fccb8584bd028ff48aa56f55e84324c569e.tar.gz gnunet-71785fccb8584bd028ff48aa56f55e84324c569e.zip |
cleaning up some CADET logic, improving types used
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_cadet_service.h | 29 | ||||
-rw-r--r-- | src/include/gnunet_protocols.h | 5 |
2 files changed, 29 insertions, 5 deletions
diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h index c32311643..c6b683370 100644 --- a/src/include/gnunet_cadet_service.h +++ b/src/include/gnunet_cadet_service.h | |||
@@ -102,9 +102,9 @@ enum GNUNET_CADET_ChannelOption | |||
102 | 102 | ||
103 | /** | 103 | /** |
104 | * Enable out of order delivery of messages. | 104 | * Enable out of order delivery of messages. |
105 | * Yes/No. | 105 | * Set bit for out-of-order delivery. |
106 | */ | 106 | */ |
107 | GNUNET_CADET_OPTION_OOORDER = 0x4, | 107 | GNUNET_CADET_OPTION_OUT_OF_ORDER = 0x4, |
108 | 108 | ||
109 | /** | 109 | /** |
110 | * Who is the peer at the other end of the channel. | 110 | * Who is the peer at the other end of the channel. |
@@ -332,7 +332,8 @@ union GNUNET_CADET_ChannelInfo | |||
332 | */ | 332 | */ |
333 | const union GNUNET_CADET_ChannelInfo * | 333 | const union GNUNET_CADET_ChannelInfo * |
334 | GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel, | 334 | GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel, |
335 | enum GNUNET_CADET_ChannelOption option, ...); | 335 | enum GNUNET_CADET_ChannelOption option, |
336 | ...); | ||
336 | 337 | ||
337 | 338 | ||
338 | /** | 339 | /** |
@@ -491,6 +492,24 @@ typedef void | |||
491 | 492 | ||
492 | 493 | ||
493 | /** | 494 | /** |
495 | * Hash uniquely identifying a connection below a tunnel. | ||
496 | */ | ||
497 | struct GNUNET_CADET_ConnectionTunnelIdentifier | ||
498 | { | ||
499 | struct GNUNET_CADET_Hash connection_of_tunnel; | ||
500 | }; | ||
501 | |||
502 | |||
503 | /** | ||
504 | * Number identifying a CADET channel. | ||
505 | */ | ||
506 | struct GNUNET_CADET_ChannelNumber | ||
507 | { | ||
508 | uint32_t cn GNUNET_PACKED; | ||
509 | }; | ||
510 | |||
511 | |||
512 | /** | ||
494 | * Method called to retrieve information about a specific tunnel the cadet peer | 513 | * Method called to retrieve information about a specific tunnel the cadet peer |
495 | * has established, o`r is trying to establish. | 514 | * has established, o`r is trying to establish. |
496 | * | 515 | * |
@@ -508,8 +527,8 @@ typedef void | |||
508 | const struct GNUNET_PeerIdentity *peer, | 527 | const struct GNUNET_PeerIdentity *peer, |
509 | unsigned int n_channels, | 528 | unsigned int n_channels, |
510 | unsigned int n_connections, | 529 | unsigned int n_connections, |
511 | uint32_t *channels, | 530 | const struct GNUNET_CADET_ChannelNumber *channels, |
512 | struct GNUNET_CADET_Hash *connections, | 531 | const struct GNUNET_CADET_ConnectionTunnelIdentifier *connections, |
513 | unsigned int estate, | 532 | unsigned int estate, |
514 | unsigned int cstate); | 533 | unsigned int cstate); |
515 | 534 | ||
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 6c56315a6..9e91a958c 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -2776,6 +2776,11 @@ extern "C" | |||
2776 | */ | 2776 | */ |
2777 | #define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_DUMP 1038 | 2777 | #define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_DUMP 1038 |
2778 | 2778 | ||
2779 | /** | ||
2780 | * End of local information about all peers known to the service. | ||
2781 | */ | ||
2782 | #define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEER_END 1039 | ||
2783 | |||
2779 | /******************************** Application *******************************/ | 2784 | /******************************** Application *******************************/ |
2780 | 2785 | ||
2781 | /** | 2786 | /** |