*/
#define GNUNET_MESSAGE_TYPE_TRANSPORT_TRY_CONNECT 27
-/**
- * Request to other peer to confirm receipt.
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_PING 28
-
-/**
- * Message from other peer confirming receipt.
- */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_PONG 29
-
/**
* Response to another peer confirming that communication was
* established.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_ACK 30
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_ACK 28
/**
/**
- * Welcome message between TCP transports.
+ * Message by which a TCP transport notifies
+ * the other that it wants to check an address
+ * (and not initiate a persistent connection).
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME 40
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_PING 40
+
+/**
+ * Message by which a TCP transport confirms
+ * the other that the address used worked.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_PONG 41
+
+/**
+ * Welcome message between TCP transports
+ * (for a persistent connection).
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME 42
/**
* Data message between TCP transports.
*/
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_DATA 41
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_DATA 43
/**
/**
* Message sent by datastore client on join.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_INIT 92
+#define GNUNET_MESSAGE_TYPE_DATASTORE_RESERVE 92
/**
- * Message sent by datastore to client informing about size.
- * (in response to JOIN, PUT and REMOVE requests).
+ * Message sent by datastore client on join.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_SIZE 93
+#define GNUNET_MESSAGE_TYPE_DATASTORE_RELEASE_RESERVE 93
+
+/**
+ * Message sent by datastore to client informing about status
+ * processing a request
+ * (in response to RESERVE, RELEASE_RESERVE, PUT, UPDATE and REMOVE requests).
+ */
+#define GNUNET_MESSAGE_TYPE_DATASTORE_STATUS 94
/**
* Message sent by datastore client to store data.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_PUT 94
+#define GNUNET_MESSAGE_TYPE_DATASTORE_PUT 95
+
+/**
+ * Message sent by datastore client to update data.
+ */
+#define GNUNET_MESSAGE_TYPE_DATASTORE_UPDATE 96
/**
* Message sent by datastore client to get data.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_GET 95
+#define GNUNET_MESSAGE_TYPE_DATASTORE_GET 97
/**
* Message sent by datastore client to get random data.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_GET_RANDOM 96
+#define GNUNET_MESSAGE_TYPE_DATASTORE_GET_RANDOM 98
/**
* Message sent by datastore to client providing requested data
* (in response to GET or GET_RANDOM request).
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA 97
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA 99
/**
* Message sent by datastore to client signaling end of matching data.
* This message will also be sent for "GET_RANDOM", even though
* "GET_RANDOM" returns at most one data item.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END 98
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END 100
/**
* Message sent by datastore client to remove data.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE 99
+#define GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE 101
/**
* Message sent by datastore client to drop the database.
*/
-#define GNUNET_MESSAGE_TYPE_DATASTORE_DROP 100
+#define GNUNET_MESSAGE_TYPE_DATASTORE_DROP 102
+
+
+/**
+ * Message sent by fs client to start indexing.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_INDEX_START 128
+
+/**
+ * Affirmative response to a request for start indexing.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_INDEX_START_OK 129
+
+/**
+ * Response to a request for start indexing that
+ * refuses.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_INDEX_START_FAILED 130
+
+/**
+ * Request from client for list of indexed files.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET 131
+
+/**
+ * Reply to client with an indexed file name.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_ENTRY 132
+
+/**
+ * Reply to client indicating end of list.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END 133
+
+/**
+ * Request from client to unindex a file.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_UNINDEX 134
+
+/**
+ * Reply to client indicating unindex receipt.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_UNINDEX_OK 135
+
+/**
+ * Client asks FS service to start a (keyword) search.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_START_SEARCH 136
+
+/**
+ * FS service has found content matching this client's
+ * request.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_CONTENT 137
+
+/**
+ * P2P request for content (one FS to another).
+ */
+#define GNUNET_MESSAGE_TYPE_FS_GET 138
+
+
+/**
+ * P2P response with content or active
+ * migration of content.
+ */
+#define GNUNET_MESSAGE_TYPE_FS_PUT 139
/*
TODO: