projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
converting conversation to use new CADET API
[oweals/gnunet.git]
/
src
/
cadet
/
gnunet-service-cadet_tunnel.h
diff --git
a/src/cadet/gnunet-service-cadet_tunnel.h
b/src/cadet/gnunet-service-cadet_tunnel.h
index 2d9a2b528c7a0c6b199fe16ba2ca9f0c7acaef55..1b56a06326ad3c9b0e43fde17784b74b2d1a9b60 100644
(file)
--- a/
src/cadet/gnunet-service-cadet_tunnel.h
+++ b/
src/cadet/gnunet-service-cadet_tunnel.h
@@
-87,7
+87,7
@@
enum CadetTunnelEState
/**
* Ephemeral key sent, waiting for peer's key.
*/
/**
* Ephemeral key sent, waiting for peer's key.
*/
- CADET_TUNNEL_KEY_SENT,
+ CADET_TUNNEL_KEY_
AX_
SENT,
/**
* In OTR: New ephemeral key and ping sent, waiting for pong.
/**
* In OTR: New ephemeral key and ping sent, waiting for pong.
@@
-104,7
+104,7
@@
enum CadetTunnelEState
* traffic MUST be a complete channel creation 3-way handshake, no payload
* will be sent before confirmation.
*/
* traffic MUST be a complete channel creation 3-way handshake, no payload
* will be sent before confirmation.
*/
- CADET_TUNNEL_KEY_
PING
,
+ CADET_TUNNEL_KEY_
AX_AUTH_SENT
,
/**
* Handshake completed: session key available.
/**
* Handshake completed: session key available.
@@
-286,12
+286,12
@@
GCT_remove_channel (struct CadetTunnel *t, struct CadetChannel *ch);
* Search for a channel by global ID.
*
* @param t Tunnel containing the channel.
* Search for a channel by global ID.
*
* @param t Tunnel containing the channel.
- * @param c
hid
Public channel number.
+ * @param c
tn
Public channel number.
*
* @return channel handler, NULL if doesn't exist
*/
struct CadetChannel *
*
* @return channel handler, NULL if doesn't exist
*/
struct CadetChannel *
-GCT_get_channel (struct CadetTunnel *t, struct GNUNET_CADET_Channel
Number chid
);
+GCT_get_channel (struct CadetTunnel *t, struct GNUNET_CADET_Channel
TunnelNumber ctn
);
/**
/**
@@
-304,7
+304,7
@@
GCT_get_channel (struct CadetTunnel *t, struct GNUNET_CADET_ChannelNumber chid);
*/
void
GCT_handle_encrypted (struct CadetTunnel *t,
*/
void
GCT_handle_encrypted (struct CadetTunnel *t,
- const struct GNUNET_CADET_
Encrypted
*msg);
+ const struct GNUNET_CADET_
TunnelEncryptedMessage
*msg);
/**
/**
@@
-315,7
+315,7
@@
GCT_handle_encrypted (struct CadetTunnel *t,
*/
void
GCT_handle_kx (struct CadetTunnel *t,
*/
void
GCT_handle_kx (struct CadetTunnel *t,
- const struct GNUNET_CADET_
KX
*msg);
+ const struct GNUNET_CADET_
TunnelKeyExchangeMessage
*msg);
/**
/**
@@
-427,8
+427,8
@@
GCT_get_destination (struct CadetTunnel *t);
*
* @return ID of a channel free to use.
*/
*
* @return ID of a channel free to use.
*/
-struct GNUNET_CADET_ChannelNumber
-GCT_get_next_c
hid
(struct CadetTunnel *t);
+struct GNUNET_CADET_Channel
Tunnel
Number
+GCT_get_next_c
tn
(struct CadetTunnel *t);
/**
/**