*/
#define GNUNET_MESSAGE_TYPE_TRANSPORT_PONG 33
+/**
+ * Message for TRANSPORT asking that a connection
+ * be initiated with a peer.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT 34
+
/**
* Request update and listing of a peer.
*/
*/
#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.
/**
* Local DHT route request type
*/
-#define GNUNET_MESSAGE_TYPE_LOCAL_DHT_ROUTE 142
+#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE 142
/**
* Local generic DHT route result type
*/
-#define GNUNET_MESSAGE_TYPE_LOCAL_DHT_ROUTE_RESULT 143
+#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT 143
/**
* P2P DHT route request type
*/
-#define GNUNET_MESSAGE_TYPE_P2P_DHT_ROUTE 144
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE 144
/**
* P2P DHT route result type
*/
-#define GNUNET_MESSAGE_TYPE_P2P_DHT_ROUTE_RESULT 145
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT 145
/**
* Local generic DHT message stop type
*/
-#define GNUNET_MESSAGE_TYPE_DHT_ROUTE_STOP 146
+#define GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_STOP 146
/**
* Local and P2P DHT PUT message
#define GNUNET_MESSAGE_TYPE_DHT_GET 148
/**
- * Local DHT Get stop message, from API to service
- * (encapsulated in DHT_ROUTE_STOP message)
+ * Local and P2P DHT Get result message
*/
-#define GNUNET_MESSAGE_TYPE_DHT_GET_STOP 149
+#define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 149
/**
- * Local and P2P DHT Get result message
+ * Local and P2P DHT find peer message
*/
-#define GNUNET_MESSAGE_TYPE_DHT_GET_RESULT 150
+#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 150
/**
- * Local and P2P DHT find peer message
+ * Local and P2P DHT find peer result message
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER 151
+#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 151
/**
- * Local DHT find peer stop message, from API to service
+ * P2P DHT PING request type
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_STOP 152
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_PING 152
/**
- * Local and P2P DHT find peer result message
+ * DHT Control message type, for telling the
+ * DHT to alter its current operation somehow.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_CONTROL 153
+
+/**
+ * Local control message type, tells peer to start
+ * issuing malicious GET requests.
*/
-#define GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT 153
+#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET 154
+
+/**
+ * Local control message type, tells peer to start
+ * issuing malicious PUT requests.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT 155
+
+/**
+ * Local control message type, tells peer to start
+ * dropping all requests.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_DROP 156
/**
* Hostlist advertisement message
*/
-#define GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT 170
+#define GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT 160
/**
*/
#define GNUNET_MESSAGE_TYPE_VPN_HELPER 185
+
+
+/**
+ * Type of messages between the gnunet-wlan-helper and the daemon
+ *
+ * data messages
+ */
+
+#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA 195
+
+/**
+ * Control messages between the gnunet-wlan-helper and the daemon
+ */
+
+#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL 196
+
+/**
+ * Type of messages for advertisement over wlan
+ */
+#define GNUNET_MESSAGE_TYPE_WLAN_HELPER_ADVERTISEMENT 196
+
+/**
+ * Type of messages for wlan
+ */
+
+/**
+ * Type of messages to query the local service-dns
+ */
+#define GNUNET_MESSAGE_TYPE_LOCAL_QUERY_DNS 205
+/**
+ * Type of messages the local service-dns responds with
+ */
+#define GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS 206
+
+
/**
* Type used to match 'all' message types.
*/
*/
+
+
+/* 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