Derive message type from position in .proto file

This involves changing the .proto file, to actually
reflect the type in the protocol.

1 files changed, 17 insertions, 14 deletions

diff --git a/src/mumble.proto b/src/mumble.proto
index d2d3c66..33ee20e 100644
--- a/src/mumble.proto
+++ b/src/mumble.proto
@@ -1,3 +1,6 @@
+/* NOTE: Do not replace this file directly with future mumble.proto.
+	 We derive the message id from the position in this file. */
+
 package MumbleProto;
 
 option optimize_for = SPEED;
@@ -49,14 +52,6 @@ message Reject {
 	optional string reason = 2;
 }
 
-message ServerConfig {
-	optional uint32 max_bandwidth = 1;
-	optional string welcome_text = 2;
-	optional bool allow_html = 3;
-	optional uint32 message_length = 4;
-	optional uint32 image_message_length = 5;
-}
-
 message ServerSync {
 	optional uint32 session = 1;
 	optional uint32 max_bandwidth = 2;
@@ -274,14 +269,22 @@ message UserStats {
 	optional bool strong_certificate = 18 [default = false];
 }
 
-message SuggestConfig {
-	optional uint32 version = 1;
-	optional bool positional = 2;
-	optional bool push_to_talk = 3;
-}
-
 message RequestBlob {
 	repeated uint32 session_texture = 1;
 	repeated uint32 session_comment = 2;
 	repeated uint32 channel_description = 3;
 }
+
+message ServerConfig {
+	optional uint32 max_bandwidth = 1;
+	optional string welcome_text = 2;
+	optional bool allow_html = 3;
+	optional uint32 message_length = 4;
+	optional uint32 image_message_length = 5;
+}
+
+message SuggestConfig {
+	optional uint32 version = 1;
+	optional bool positional = 2;
+	optional bool push_to_talk = 3;
+}