-avoid 'hu', as it is unsigned short, not uint16_t
[oweals/gnunet.git] / src / include / gnunet_protocols.h
index 0f3feaf58c0f2ddff0b3cc8697f49d4e24dd7a80..d329c6da869f5225e9de5bd5b9442feae157d208 100644 (file)
@@ -333,16 +333,15 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_CORE_SEND 76
 
-
 /**
- * Request for peer iteration from CORE service.
+ * Request for connection monitoring from CORE service.
  */
-#define GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS 78
+#define GNUNET_MESSAGE_TYPE_CORE_MONITOR_PEERS 78
 
 /**
- * Last reply from core to request for peer iteration from CORE service.
+ * Reply for monitor by CORE service.
  */
-#define GNUNET_MESSAGE_TYPE_CORE_ITERATE_PEERS_END 79
+#define GNUNET_MESSAGE_TYPE_CORE_MONITOR_NOTIFY 79
 
 /**
  * Encapsulation for an encrypted message between peers.
@@ -379,6 +378,11 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_CORE_EPHEMERAL_KEY 88
 
+/**
+ * Other peer confirms having received the type map
+ */
+#define GNUNET_MESSAGE_TYPE_CORE_CONFIRM_TYPE_MAP 89
+
 
 /*******************************************************************************
  * DATASTORE message types
@@ -517,14 +521,14 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_FS_MIGRATION_STOP 139
 
 /**
- * P2P request for content (one FS to another via a mesh).
+ * P2P request for content (one FS to another via a cadet).
  */
-#define GNUNET_MESSAGE_TYPE_FS_MESH_QUERY 140
+#define GNUNET_MESSAGE_TYPE_FS_CADET_QUERY 140
 
 /**
- * P2P answer for content (one FS to another via a mesh).
+ * P2P answer for content (one FS to another via a cadet).
  */
-#define GNUNET_MESSAGE_TYPE_FS_MESH_REPLY 141
+#define GNUNET_MESSAGE_TYPE_FS_CADET_REPLY 141
 
 
 /*******************************************************************************
@@ -607,34 +611,9 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET_RESULTS_KNOWN             156
 
 /**
- * Trail setup request is received by a peer.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP                157
-
-/**
- * Trail to a particular peer is returned to this peer.
+ * Further X-VINE DHT messages continued from 880
  */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT         158
 
-/**
- * Verify if your immediate successor is still your immediate successor.
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR           159
-
-/**
- * Notify your new immediate successor that you are its new predecessor. 
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR           160
-
-/**
- * Message which contains the immediate predecessor of requested successor
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT    161
-
-/**
- * Message which contains the get result. 
- */
-#define GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT                 162
 /*******************************************************************************
  * HOSTLIST message types
  ******************************************************************************/
@@ -797,179 +776,179 @@ extern "C"
 
 
 /*******************************************************************************
- * MESH message types
+ * CADET message types
  ******************************************************************************/
 
 /**
- * Type of message used to transport messages throug a MESH-tunnel (LEGACY)
+ * Type of message used to transport messages throug a CADET-tunnel (LEGACY)
  */
-#define GNUNET_MESSAGE_TYPE_MESH 215
+#define GNUNET_MESSAGE_TYPE_CADET 215
 
 /**
  * Type of message used to send another peer which messages we want to receive
- * through a mesh-tunnel (LEGACY)
+ * through a cadet-tunnel (LEGACY)
  */
-#define GNUNET_MESSAGE_TYPE_MESH_HELLO 216
+#define GNUNET_MESSAGE_TYPE_CADET_HELLO 216
 
 /**
  * Request the creation of a connection
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE      256
+#define GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE      256
 
 /**
  * Send origin an ACK that the connection is complete
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK         257
+#define GNUNET_MESSAGE_TYPE_CADET_CONNECTION_ACK         257
 
 /**
  * Notify that a connection is no longer valid
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN      258
+#define GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN      258
 
 /**
  * At some point, the route will spontaneously change TODO
  */
-#define GNUNET_MESSAGE_TYPE_MESH_PATH_CHANGED           259
+#define GNUNET_MESSAGE_TYPE_CADET_PATH_CHANGED           259
 
 /**
  * Payload data (usually inside a encrypted tunnel).
  */
-#define GNUNET_MESSAGE_TYPE_MESH_DATA                   260
+#define GNUNET_MESSAGE_TYPE_CADET_DATA                   260
 
 /**
  * Confirm payload data end-to-end.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_DATA_ACK               261
+#define GNUNET_MESSAGE_TYPE_CADET_DATA_ACK               261
 
 /**
  * Key exchange encapsulation.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_KX                     262
+#define GNUNET_MESSAGE_TYPE_CADET_KX                     262
 
 /**
  * New ephemeral key.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL           263
+#define GNUNET_MESSAGE_TYPE_CADET_KX_EPHEMERAL           263
 
 /**
  * Challenge to test peer's session key.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_KX_PING                264
+#define GNUNET_MESSAGE_TYPE_CADET_KX_PING                264
 
 /**
  * Answer to session key challenge.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_KX_PONG                265
+#define GNUNET_MESSAGE_TYPE_CADET_KX_PONG                265
 
 /**
  * Request the destuction of a connection
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY     266
+#define GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY     266
 
 /**
  * Hop-by-hop, connection dependent ACK.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_ACK                    268
+#define GNUNET_MESSAGE_TYPE_CADET_ACK                    268
 
 /**
  * Poll for a hop-by-hop ACK.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_POLL                   269
+#define GNUNET_MESSAGE_TYPE_CADET_POLL                   269
 
 /**
  * Announce connection is still alive (direction sensitive).
  */
-#define GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE              270
+#define GNUNET_MESSAGE_TYPE_CADET_KEEPALIVE              270
 
 /**
- * Connect to the mesh service, specifying subscriptions
+ * Connect to the cadet service, specifying subscriptions
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT          272
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_CONNECT          272
 
 /**
- * Ask the mesh service to create a new channel.
+ * Ask the cadet service to create a new channel.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE         273
+#define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_CREATE         273
 
 /**
- * Ask the mesh service to destroy a channel.
+ * Ask the cadet service to destroy a channel.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY        274
+#define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY        274
 
 /**
  * Confirm the creation of a channel
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK            275
+#define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_ACK            275
 
 /**
  * Reject the creation of a channel
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK           276
+#define GNUNET_MESSAGE_TYPE_CADET_CHANNEL_NACK           276
 
 /**
  * Encrypted data. (Payload, channel management, keepalive)
  */
-#define GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED              280
+#define GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED              280
 
 /**
  * Payload client <-> service
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA             285
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA             285
 
 /**
  * Local ACK for data.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK              286
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_ACK              286
 
 /**
  * Local information about all channels of service.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CHANNELS    290
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_CHANNELS    290
 
 /**
  * Local information of service about a specific channel.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CHANNEL     291
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_CHANNEL     291
 
 /**
  * Local information about all tunnels of service.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS     292
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_TUNNELS     292
 
 /**
  * Local information of service about a specific tunnel.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL      293
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_TUNNEL      293
 
 /**
  * Local information about all connections of service.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CONNECTIONS 294
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_CONNECTIONS 294
 
 /**
  * Local information of service about a specific connection.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CONNECTION  295
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_CONNECTION  295
 
 /**
  * Local information about all peers known to the service.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_PEERS       296
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEERS       296
 
 /**
  * Local information of service about a specific peer.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_PEER        297
+#define GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_PEER        297
 
 /**
  * Traffic (net-cat style) used by the Command Line Interface.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CLI                    298
+#define GNUNET_MESSAGE_TYPE_CADET_CLI                    298
 
 /**
  * 640kb should be enough for everybody
  */
-#define GNUNET_MESSAGE_TYPE_MESH_RESERVE_END            299
+#define GNUNET_MESSAGE_TYPE_CADET_RESERVE_END            299
 
 
 
@@ -2042,39 +2021,51 @@ extern "C"
  ******************************************************************************/
 
 /**
- * Client -> Vector-Product Service request message
+ * Client -> Alice
  */
 #define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_CLIENT_TO_ALICE 640
 
 /**
- * Client -> Vector-Product Service request message
+ * Client -> Bob
  */
 #define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_CLIENT_TO_BOB 641
 
 /**
- * Vector-Product Service request -> remote VP Service
+ * Client -> Alice/Bob multipart
+ */
+#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_CLIENT_MUTLIPART 642
+
+/**
+ * Alice -> Bob session initialization
+ */
+#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_SESSION_INITIALIZATION 643
+
+/**
+ * Alice -> Bob SP crypto-data (after intersection)
  */
-#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_ALICE_TO_BOB 642
+#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_ALICE_CRYPTODATA 644
 
 /**
- * Vector-Product Service request -> remote VP Service Multipart
+ * Alice -> Bob SP crypto-data multipart
  */
-#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_ALICE_TO_BOB_MULTIPART 643
+#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_ALICE_CRYPTODATA_MULTIPART 645
 
 /**
- * remote Vector-Product Service response -> requesting VP Service
+ * Bob -> Alice SP crypto-data
  */
-#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_TO_ALICE 644
+#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_CRYPTODATA 646
 
 /**
- * remote Vector-Product Service response -> requesting VP Service Multipart
+ * Bob -> Alice SP crypto-data multipart
  */
-#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_TO_ALICE_MULTIPART 645
+#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_BOB_CRYPTODATA_MULTIPART 647
 
 /**
- * Vector-Product Service response -> Client
+ * Alice/Bob -> Client Result
  */
-#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_SERVICE_TO_CLIENT 646
+#define GNUNET_MESSAGE_TYPE_SCALARPRODUCT_RESULT 648
+
+
 
 
 /*******************************************************************************
@@ -2134,19 +2125,19 @@ extern "C"
 /**
  * C: client
  * S: service
- * M: muticast
+ * M: multicast
  */
 
 /** S->C: result of an operation */
 #define GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE 680
 
-/** C->S: request to start a master */
+/** C->S: request to start a channel as a master */
 #define GNUNET_MESSAGE_TYPE_PSYC_MASTER_START 681
 
 /** S->C: master start acknowledgement */
 #define GNUNET_MESSAGE_TYPE_PSYC_MASTER_START_ACK 682
 
-/** C->S: request to start a master */
+/** C->S: request to join a channel as a slave */
 #define GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN 683
 
 /** S->C: slave join acknowledgement */
@@ -2266,113 +2257,116 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 739
 
 /**
- * Mesh: call initiation
+ * Cadet: call initiation
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RING 740
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RING 740
 
 /**
- * Mesh: hang up / refuse call
+ * Cadet: hang up / refuse call
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_HANG_UP 741
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_HANG_UP 741
 
 /**
- * Mesh: pick up phone (establish audio channel)
+ * Cadet: pick up phone (establish audio channel)
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_PICK_UP 742
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_PICK_UP 742
 
 /**
- * Mesh: phone suspended.
+ * Cadet: phone suspended.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_SUSPEND 743
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_SUSPEND 743
 
 /**
- * Mesh: phone resumed.
+ * Cadet: phone resumed.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RESUME 744
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_PHONE_RESUME 744
 
 /**
- * Mesh: audio data
+ * Cadet: audio data
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 745
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CADET_AUDIO 745
 
 
 /*******************************************************************************
  * MULTICAST message types
  ******************************************************************************/
 
-
-/* WIP: no numbers assigned yet */
+/**
+ * C: client
+ * S: service
+ * T: cadet
+ */
 
 /**
- * Start an origin.
+ * C->S: Start the origin.
  */
 #define GNUNET_MESSAGE_TYPE_MULTICAST_ORIGIN_START 750
 
 /**
- * Stop an origin.
+ * C->S: Join group as a member.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_ORIGIN_STOP 751
+#define GNUNET_MESSAGE_TYPE_MULTICAST_MEMBER_JOIN 751
 
 /**
- * Join a group as a member.
+ * C<--S<->T: A peer wants to join the group.
+ *
+ * Unicast message to the origin or another group member.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_MEMBER_JOIN 752
+#define GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_REQUEST 752
 
 /**
- * Leave a group.
+ * C<->S<->T: Response to a join request.
+ *
+ * Unicast message from a group member to the peer wanting to join.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_MEMBER_PART 753
+#define GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_DECISION 753
 
 /**
- * Multicast message from the origin to all members.
+ * A peer wants to part the group.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_MESSAGE 754
+#define GNUNET_MESSAGE_TYPE_MULTICAST_PART_REQUEST 754
 
 /**
- * A unicast message from a group member to the origin.
+ * Acknowledgement sent in response to a part request.
+ *
+ * Unicast message from a group member to the peer wanting to part.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_REQUEST 755
+#define GNUNET_MESSAGE_TYPE_MULTICAST_PART_ACK 755
 
 /**
- * A peer wants to join the group.
- *
- * Unicast message to the origin or another group member.
+ * Group terminated.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_REQUEST
+#define GNUNET_MESSAGE_TYPE_MULTICAST_GROUP_END 756
 
 /**
- * Response to a join request.
- *
- * Unicast message from a group member to the peer wanting to join.
+ * C<->S<->T: Multicast message from the origin to all members.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_DECISION
+#define GNUNET_MESSAGE_TYPE_MULTICAST_MESSAGE 757
 
 /**
- * A peer wants to part the group.
+ * C<->S<->T: Unicast request from a group member to the origin.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_PART_REQUEST
+#define GNUNET_MESSAGE_TYPE_MULTICAST_REQUEST 758
 
 /**
- * Acknowledgement sent in response to a part request.
- *
- * Unicast message from a group member to the peer wanting to part.
+ * C<->S<->T: Replay request from a group member to another member.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_PART_ACK
+#define GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST 759
 
 /**
- * Group terminated.
+ * C<->S<->T: Cancellation of a replay request.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_GROUP_END
+#define GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST_CANCEL 760
 
 /**
- *
+ * S->C: Membership test request.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST
+#define GNUNET_MESSAGE_TYPE_MULTICAST_MEMBERSHIP_TEST 761
 
 /**
- *
+ * C->S: Membership test result.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_REPLAY_REQUEST_CANCEL
+#define GNUNET_MESSAGE_TYPE_MULTICAST_MEMBERSHIP_TEST_RESULT 762
 
 
 
@@ -2403,17 +2397,167 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_SECRET_READY 783
 
 
+/*******************************************************************************
+ * SENSOR message types
+ ******************************************************************************/
+
+/**
+ * Request information about all sensors
+ */
+#define GNUNET_MESSAGE_TYPE_SENSOR_GETALL 800
+
+/**
+ * Request information about one sensor
+ */
+#define GNUNET_MESSAGE_TYPE_SENSOR_GET 801
+
+/**
+ * Message carrying sensor information
+ */
+#define GNUNET_MESSAGE_TYPE_SENSOR_INFO 802
+
+/**
+ * End of an iteration sequence
+ */
+#define GNUNET_MESSAGE_TYPE_SENSOR_END 803
+
+
+/*******************************************************************************
+ * PEERSTORE message types
+ ******************************************************************************/
+
+/**
+ * Store request message
+ */
+#define GNUNET_MESSAGE_TYPE_PEERSTORE_STORE 820
+
+/**
+ * Iteration request
+ */
+#define GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE 821
 
 /**
- * Next available: 800
+ * Iteration record message
  */
+#define GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_RECORD 822
 
+/**
+ * Iteration end message
+ */
+#define GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_END 823
 
+/**
+ * Watch request
+ */
+#define GNUNET_MESSAGE_TYPE_PEERSTORE_WATCH 824
+
+/**
+ * Watch response
+ */
+#define GNUNET_MESSAGE_TYPE_PEERSTORE_WATCH_RECORD 825
+
+/**
+ * Watch cancel request
+ */
+#define GNUNET_MESSAGE_TYPE_PEERSTORE_WATCH_CANCEL 826
 
 /*******************************************************************************
  * SOCIAL message types
  ******************************************************************************/
 
+/**
+ * C: client
+ * S: service
+ * P: PSYC
+ */
+
+/** S->C: result of an operation */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_RESULT_CODE 840
+
+/** C->S: request to enter a home as the host */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_HOME_ENTER 841
+
+/** S->C: home enter acknowledgement */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_HOME_ENTER_ACK 842
+
+/** C->S: request to enter a place as a guest */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_ENTER 843
+
+/** S->C: guest join acknowledgement */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_ENTER_ACK 844
+
+/** P->S->C: incoming join request from PSYC */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_JOIN_REQUEST 847
+
+/** C->S->P: decision about a join request */
+#define GNUNET_MESSAGE_TYPE_SOCIAL_JOIN_DECISION 848
+
+/*******************************************************************************
+ * X-VINE DHT messages 
+ ******************************************************************************/
+
+/**
+ * Trail setup request is received by a peer.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP 880
+
+/**
+ * Trail to a particular peer is returned to this peer.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT 881
+
+/**
+ * Verify if your immediate successor is still your immediate successor.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR 882
+
+/**
+ * Notify your new immediate successor that you are its new predecessor.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR 883
+
+/**
+ * Message which contains the immediate predecessor of requested successor
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT 884
+
+/**
+ * Message which contains the get result.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT 885
+
+/**
+ * Trail Rejection Message.
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_REJECTION 886
+
+/**
+ * Trail Tear down Message. 
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN 887
+
+/**
+ * Routing table add message. 
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_ADD_TRAIL 888
+
+/**
+ * Trail compression message. 
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_COMPRESSION 889
+
+#if ENABLE_MALICIOUS
+/**
+ * Turn X-VINE DHT service malicious
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_ACT_MALICIOUS 890
+#endif
+
+/*******************************************************************************/
+
+/**
+ * Next available: 900
+ */
 
 /**
  * Type used to match 'all' message types.