use enum GNUNET_ATS_Network_Type instead of uint32_t where appropriate
[oweals/gnunet.git] / src / include / gnunet_protocols.h
index 4c0c1312f180248b92f349528dae8ddbea3bad8e..ea150c52f32ac3565d3d732958c2b765a7a499f1 100644 (file)
@@ -784,21 +784,18 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_HELLO 216
 
 /**
- * Request the creation of a connection DEPRECATED
+ * Request the creation of a connection
  */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE            256
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE      256
 
 /**
- * Send origin an ACK that the connection is complete DEPRECATED
+ * Send origin an ACK that the connection is complete
  */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_ACK               257
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK         257
 
 /**
- * Notify that a connection is no longer valid DEPRECATED
+ * Notify that a connection is no longer valid
  */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN            258
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN      258
 
 /**
@@ -817,44 +814,30 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_DATA_ACK               261
 
 /**
- * Key exchange messages.
+ * Key exchange encapsulation.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_KX                     262
-#define GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL           263
-#define GNUNET_MESSAGE_TYPE_MESH_KX_PING                264
-#define GNUNET_MESSAGE_TYPE_MESH_KX_PONG                265
 
 /**
- * Payload data origin->end DEPRECATED.
+ * New ephemeral key.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_UNICAST                260
-
-/**
- * Payload data end->origin DEPRECATED.
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN              262
+#define GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL           263
 
 /**
- * Confirm owner->dest data end-to-end (ack goes dest->owner). DEPRECATED
+ * Challenge to test peer's session key.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_UNICAST_ACK            263
+#define GNUNET_MESSAGE_TYPE_MESH_KX_PING                264
 
 /**
- * Confirm dest->owner data end-to-end (ack goes owner->dest). DEPRECATED
+ * Answer to session key challenge.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_TO_ORIG_ACK            264
+#define GNUNET_MESSAGE_TYPE_MESH_KX_PONG                265
 
 /**
- * Request the destuction of a path (PATH DEPRECATED)
+ * Request the destuction of a connection
  */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY           266
 #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY     266
 
-/**
- * Request the destruction of a whole tunnel
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY         267
-
 /**
  * Hop-by-hop, connection dependent ACK.
  */
@@ -866,15 +849,9 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_POLL                   269
 
 /**
- * Announce origin is still alive.
- */
-#define GNUNET_MESSAGE_TYPE_MESH_FWD_KEEPALIVE          270
-#define GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE          270
-
-/**
- * Announce destination is still alive. DEPRECATED
+ * Announce connection is still alive (direction sensitive).
  */
-#define GNUNET_MESSAGE_TYPE_MESH_BCK_KEEPALIVE          271
+#define GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE              270
 
 /**
  * Connect to the mesh service, specifying subscriptions
@@ -882,16 +859,14 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT          272
 
 /**
- * Ask the mesh service to create a new tunnel DEPRECATED
+ * Ask the mesh service to create a new channel.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE         273
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE    273
 
 /**
- * Ask the mesh service to destroy a tunnel DEPRECATED
+ * Ask the mesh service to destroy a channel.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY        274
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY   274
 
 /**
  * Confirm the creation of a channel
@@ -899,20 +874,15 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK            275
 
 /**
- * Encrypted data going forward. DEPRECATED
+ * Reject the creation of a channel
  */
-#define GNUNET_MESSAGE_TYPE_MESH_FWD                    280
+#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK           276
 
 /**
  * Encrypted data. (Payload, channel management, keepalive)
  */
 #define GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED              280
 
-/**
- * Encrypted data going backwards.
- */
-#define GNUNET_MESSAGE_TYPE_MESH_BCK                    281
-
 /**
  * Payload client <-> service
  */
@@ -923,6 +893,11 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK              286
 
+/**
+ * Local NACK for rejected channels.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK             287
+
 /**
  * Local information about all tunnels of service. DEPRECATED
  */
@@ -935,6 +910,11 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL      288
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CHANNEL     288
 
+/**
+ * Traffic (net-cat style) used by the Command Line Interface.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_CLI                    298
+
 /**
  * 640kb should be enough for everybody
  */
@@ -1812,12 +1792,12 @@ extern "C"
 /**
  * Strata estimator.
  */
-#define GNUNET_MESSAGE_TYPE_SET_P2P_SE 582
+#define GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE 582
 
 /**
  * Invertible bloom filter.
  */
-#define GNUNET_MESSAGE_TYPE_SET_P2P_IBF 583
+#define GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF 583
 
 /**
  * Actual set elements.
@@ -1849,6 +1829,15 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_SET_ITER_DONE 589
 
+/**
+ * Information about the element count for intersection
+ */
+#define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO 591
+
+/**
+ * Bloom filter message for intersection exchange started by Bob.
+ */
+#define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF 592
 
 /*******************************************************************************
  * TESTBED LOGGER message types
@@ -2143,67 +2132,77 @@ extern "C"
 /**
  * Client -> Server message register a phone.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER 730
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER 731
 
 /**
- * Client -> Server meessage to reject/hangup a call
+ * Client -> Server message to reject/hangup a call
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICK_UP 731
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICK_UP 732
 
 /**
- * Client -> Server meessage to reject/hangup a call
+ * Client -> Server message to reject/hangup a call
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP 732
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP 733
 
 /**
  * Client <- Server message to indicate a ringing phone
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL 733
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL 734
 
 /**
  * Client <- Server message to indicate a ringing phone
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING 734
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING 735
 
 /**
- * Client <-> Server message to send audio data.
+ * Client <-> Server message to suspend connection.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_BUSY 735
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND 736
+
+/**
+ * Client <-> Server message to resume connection.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME 737
 
 /**
  * Client <-> Server message to send audio data.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP 736
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP 738
 
 /**
  * Client <-> Server message to send audio data.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 737
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 739
 
 /**
  * Mesh: call initiation
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RING 738
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RING 740
 
 /**
  * Mesh: hang up / refuse call
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_HANG_UP 739
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_HANG_UP 741
 
 /**
  * Mesh: pick up phone (establish audio channel)
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_PICK_UP 740
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_PICK_UP 742
+
+/**
+ * Mesh: phone suspended.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_SUSPEND 743
 
 /**
- * Mesh: phone is busy (refuse nicely)
+ * Mesh: phone resumed.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_BUSY 741
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RESUME 744
 
 /**
  * Mesh: audio data
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 742
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 745
 
 
 /*******************************************************************************
@@ -2265,9 +2264,39 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST_CANCEL
 
 
+
+/*******************************************************************************
+ * SECRETSHARING message types
+ ******************************************************************************/
+
+
+/**
+ * Establish a new session.
+ */
+#define GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_GENERATE 780
+
+/**
+ * Request the decryption of a ciphertext.
+ */
+#define GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_DECRYPT 781
+
+/**
+ * The service succeeded in decrypting a ciphertext.
+ */
+#define GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_DECRYPT_DONE 782
+
 /**
- * Next available: 780
+ * The cryptosystem has been established.
+ * Contains the peer's share.
  */
+#define GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_SECRET_READY 783
+
+
+
+/**
+ * Next available: 800
+ */
+
 
 
 /*******************************************************************************