HKDF (does not work yet)

[oweals/gnunet.git] / src / include / gnunet_protocols.h

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 78da13b9a47eb3af7460e46a62d728586f09d23d..bfa1314c9dff18065a6cf5da23f0aa4e40be13e9 100644 (file)
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -40,11 +40,6 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_TEST 0
 
-/**
- * Request service shutdown.
- */
-#define GNUNET_MESSAGE_TYPE_SHUTDOWN 1
-
 
 /**
  * Request DNS resolution.
@@ -104,6 +99,16 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_ARM_IS_UNKNOWN 12
 
+/**
+ * Request ARM service shutdown.
+ */
+#define GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN 13
+
+/**
+ * Acknowledge service shutting down, disconnect
+ * indicates service stopped.
+ */
+#define GNUNET_MESSAGE_TYPE_ARM_SHUTDOWN_ACK 14
 
 /**
  * HELLO message used for communicating peer addresses.
@@ -169,21 +174,25 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_LOOKUP 27
 
 /**
- * Response to the address lookup request. 
+ * Response to the address lookup request.
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY 28
 
 /**
- * Change in blacklisting status of a peer.
+ * Register a client that wants to do blacklisting.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_INIT 29
+
+/**
+ * Query to a blacklisting client (is this peer blacklisted)?
  */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST 29
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY 30
+
 
 /**
- * Request to transport to notify us about any blacklisting status
- * changes on this connection (and to immediately send all
- * active blacklist entries).
+ * Reply from blacklisting client (answer to blacklist query).
  */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_NOTIFY 30
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_REPLY 31
 
 /**
  * Transport PING message
@@ -195,11 +204,6 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_PONG 33
 
-/**
- * Request addition of a HELLO
- */
-#define GNUNET_MESSAGE_TYPE_PEERINFO_ADD 36
-
 /**
  * Request update and listing of a peer.
  */
@@ -239,21 +243,48 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_DV_SEND 45
 
+/**
+ * DV service to DV api message, containing a confirmation
+ * or failure of a DV_SEND message.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_DV_SEND_RESULT 46
+
 /**
  * P2P DV message encapsulating some real message
  */
-#define GNUNET_MESSAGE_TYPE_DV_DATA 46
+#define GNUNET_MESSAGE_TYPE_DV_DATA 47
 
 /**
  * P2P DV message gossipping peer information
  */
-#define GNUNET_MESSAGE_TYPE_DV_GOSSIP 47
+#define GNUNET_MESSAGE_TYPE_DV_GOSSIP 48
 
 /**
  * DV Plugin to DV service message, indicating
  * startup.
  */
-#define GNUNET_MESSAGE_TYPE_DV_START 48
+#define GNUNET_MESSAGE_TYPE_DV_START 49
+
+/**
+ * P2P DV message notifying connected peers of a disconnect
+ */
+#define GNUNET_MESSAGE_TYPE_DV_DISCONNECT 50
+
+/**
+ * TCP NAT probe message, send from NAT'd peer to
+ * other peer to establish bi-directional communication
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE 51
+
+/**
+ * Normal UDP message type.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE 52
+
+/**
+ * Fragmented part of a UDP message.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE_PART 53
 
 /**
  * UDP NAT probe message, send from NAT'd peer to
@@ -496,48 +527,62 @@ extern "C"
 /**
  * Local and P2P generic DHT message start type
  */
-#define GNUNET_MESSAGE_TYPE_DHT 142
+#define GNUNET_MESSAGE_TYPE_DHT_ROUTE 142
+
+/**
+ * Local and P2P generic DHT message start type
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_ROUTE_RESULT 143
 
 /**
  * Local and P2P generic DHT message stop type
  */
-#define GNUNET_MESSAGE_TYPE_DHT_STOP 143
+#define GNUNET_MESSAGE_TYPE_DHT_STOP 144
 
 /**
  * Local and message acknowledgment
  */
 #define GNUNET_MESSAGE_TYPE_DHT_ACK 145
 
+/**
+ * Local DHT Put message, from API to service
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_PUT 146
+
 /**
  * Local DHT Get message, from API to service
  */
-#define GNUNET_MESSAGE_TYPE_DHT_GET 146
+#define GNUNET_MESSAGE_TYPE_DHT_GET 147
 
 /**
  * Local DHT Get stop message, from API to service
  */
-#define GNUNET_MESSAGE_TYPE_DHT_GET_STOP 147
+#define GNUNET_MESSAGE_TYPE_DHT_GET_STOP 148
+
+/**
+ * Local DHT Get result message, from service to API
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 149
 
 /**
  * Local DHT Get message, from API to service
  */
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 148
+#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 150
 
 /**
  * Local DHT Get stop message, from API to service
  */
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_STOP 149
+#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_STOP 151
 
 /**
- * Local DHT Put message, from API to service
+ * Local DHT find peer result message, from service to API
  */
-#define GNUNET_MESSAGE_TYPE_DHT_PUT 150
+#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 152
 
 /**
- * Local DHT Get result message, from service to API
+ * Hostlist advertisement message
  */
-#define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 151
-
+#define GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT 160
 
 /**
  * Type used to match 'all' message types.