1 files changed, 10 insertions, 31 deletions

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 1fb153673..b60fe65d4 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1878,52 +1878,31 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_MULTICAST_REQUEST
 
-
 /**
  * A peer wants to join the group.
  *
- * Unicast message to a group member.
- */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_REQUEST_JOIN
-
-/**
- * A join request was rejected.
- *
- * Unicast response to a join request.
+ * Unicast message to the origin or another group member.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_REJECT_JOIN
+#define GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_REQUEST
 
 /**
- * A peer joined the group.
+ * Response to a join request.
  *
- * Sent to all members by the origin.
- */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_NOTICE_JOIN
-
-/**
- * A peer wants to leave the group.
- */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_REQUEST_LEAVE
-
-/**
- * A peer left the group.
+ * Unicast message from a group member to the peer wanting to join.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_NOTICE_LEAVE
+#define GNUNET_MESSAGE_TYPE_MULTICAST_JOIN_DECISION
 
 /**
- * Ping request from a peer.
- *
- * A ping is sent after a period of inactivity and contains the last received
- * message ID.
+ * A peer wants to part the group.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_PEER_PING
+#define GNUNET_MESSAGE_TYPE_MULTICAST_PART_REQUEST
 
 /**
- * Response to a ping.
+ * Acknowledgement sent in response to a part request.
  *
- * Contains the last received message ID.
+ * Unicast message from a group member to the peer wanting to part.
  */
-#define GNUNET_MESSAGE_TYPE_MULTICAST_PEER_PONG
+#define GNUNET_MESSAGE_TYPE_MULTICAST_PART_ACK
 
 /**
  * Group terminated.