iterate topoogy header related stuff

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

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 8a1df7ff9ed8ed518b5ca8543d33e8db5cabae03..e3f266e2542137ed914e87e4cbd05fd108c98176 100644 (file)
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -360,6 +360,10 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_CORE_REQUEST_CONNECT 75
 
+/**
+ * Request from client asking to call back with all connected peers.
+ */
+#define GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS 76
 
 /**
  * Session key exchange between peers.
@@ -510,59 +514,56 @@ extern "C"
  */
 
 /**
- * Local and P2P generic DHT message start type
+ * Local DHT route request type
  */
-#define GNUNET_MESSAGE_TYPE_DHT_ROUTE 142
+#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE 142
 
 /**
- * Local and P2P generic DHT message start type
+ * Local generic DHT route result type
  */
-#define GNUNET_MESSAGE_TYPE_DHT_ROUTE_RESULT 143
+#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT 143
 
 /**
- * Local and P2P generic DHT message stop type
+ * P2P DHT route request type
  */
-#define GNUNET_MESSAGE_TYPE_DHT_STOP 144
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE 144
 
 /**
- * Local and message acknowledgment
+ * P2P DHT route result type
  */
-#define GNUNET_MESSAGE_TYPE_DHT_ACK 145
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT 145
 
 /**
- * Local DHT Put message, from API to service
+ * Local generic DHT message stop type
  */
-#define GNUNET_MESSAGE_TYPE_DHT_PUT 146
+#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_STOP 146
 
 /**
- * Local DHT Get message, from API to service
+ * Local and P2P DHT PUT message
+ * (encapsulated in DHT_ROUTE message)
  */
-#define GNUNET_MESSAGE_TYPE_DHT_GET 147
+#define GNUNET_MESSAGE_TYPE_DHT_PUT 147
 
 /**
- * Local DHT Get stop message, from API to service
+ * Local and P2P DHT GET message
+ * (encapsulated in DHT_ROUTE message)
  */
-#define GNUNET_MESSAGE_TYPE_DHT_GET_STOP 148
+#define GNUNET_MESSAGE_TYPE_DHT_GET 148
 
 /**
- * Local DHT Get result message, from service to API
+ * Local and P2P DHT Get result message
  */
 #define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 149
 
 /**
- * Local DHT Get message, from API to service
+ * Local and P2P DHT find peer message
  */
 #define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 150
 
 /**
- * Local DHT Get stop message, from API to service
+ * Local and P2P DHT find peer result message
  */
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_STOP 151
-
-/**
- * Local DHT find peer result message, from service to API
- */
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 152
+#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 151
 
 /**
  * Hostlist advertisement message
@@ -602,6 +603,11 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_STATISTICS_WATCH_VALUE 173
 
 
+/**
+ * Type of messages between the gnunet-vpn-helper and the daemon
+ */
+#define GNUNET_MESSAGE_TYPE_VPN_HELPER 185
+
 /**
  * Type used to match 'all' message types.
  */
@@ -609,12 +615,41 @@ extern "C"
 
 /*
   TODO:
-  - DV
-  - DHT
   - applications (FS, VPN, CHAT, TRACEKIT, TBENCH)
 */
 
 
+
+
+/* BELOW: experimental student-DHT protocol codes */
+
+/**
+ * Request to join a CAN DHT
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_CAN_JOIN_REQUEST 1174
+
+/**
+ * Response to join request of a CAN DHT
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_CAN_JOIN_REPLY 1175
+
+/**
+ * Messages for swapping locations
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_GET_NEIGHBOURLIST_REQUEST 1180
+
+#define GNUNET_MESSAGE_TYPE_DHT_GET_NEIGHBOURLIST_RESULT 1181
+
+#define GNUNET_MESSAGE_TYPE_DHT_SWAP_LOCATION_REQUEST 1182
+
+#define GNUNET_MESSAGE_TYPE_DHT_SWAP_LOCATION_ACK 1183
+
+/**
+ * Freenet hello message
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_FREENET_HELLO 1184
+
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif