X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessages.h;h=fd306666f1164723d3b8a866f65608753bd49350;hb=ed9b54bd89b704e6111acbd91b6a7b50e3c30cf5;hp=eedf7fd6cbf5e3b84317138656b5b5eb437bb174;hpb=401bf05f273f514ae3bbf0f16d19dd8eb471255e;p=umurmur.git

diff --git a/src/messages.h b/src/messages.h
index eedf7fd..fd30666 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -38,12 +38,9 @@
 
 #define PROTVER_MAJOR 1
 #define PROTVER_MINOR 2
-#define PROTVER_PATCH 0
+#define PROTVER_PATCH 3
 #define PROTOCOL_VERSION ((PROTVER_MAJOR << 16) | (PROTVER_MINOR << 8) | (PROTVER_PATCH))
 
-#define MAX_TEXT 512
-
-
 #define PERM_NONE 0x0
 #define PERM_WRITE 0x1
 #define PERM_TRAVERSE 0x2
@@ -64,7 +61,7 @@
 #define PERM_CACHED 0x8000000
 #define PERM_ALL 0xf07ff
 
-#define PERM_DEFAULT (PERM_TRAVERSE | PERM_ENTER | PERM_SPEAK | PERM_WHISPER | PERM_TEXTMESSAGE)
+#define PERM_DEFAULT (PERM_TRAVERSE | PERM_ENTER | PERM_SPEAK | PERM_WHISPER | PERM_TEXTMESSAGE | PERM_MAKETEMPCHANNEL)
 
 typedef enum {
 	Version,
@@ -89,6 +86,9 @@ typedef enum {
 	VoiceTarget,
 	PermissionQuery, /* 20 */
 	CodecVersion,
+	UserStats,
+	RequestBlob,
+	ServerConfig
 } messageType_t;
 
 typedef enum {
@@ -126,6 +126,8 @@ typedef union payload {
 	struct  _MumbleProto__VoiceTarget *voiceTarget;
 	struct  _MumbleProto__PermissionQuery *permissionQuery;
 	struct  _MumbleProto__CodecVersion *codecVersion;
+	struct  _MumbleProto__UserStats *userStats;
+	struct  _MumbleProto__ServerConfig *serverConfig;
 } payload_t;
 
 typedef struct message {
@@ -142,6 +144,7 @@ message_t *Msg_networkToMessage(uint8_t *data, int size);
 void Msg_free(message_t *msg);
 void Msg_inc_ref(message_t *msg);
 
+message_t *Msg_CreateVoiceMsg(uint8_t *data, int size);
 message_t *Msg_create(messageType_t messageType);
 
 #endif