X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessages.h;h=fd306666f1164723d3b8a866f65608753bd49350;hb=86214eabc4bcdb19fc4171ef5bf3c231cbff6518;hp=4582d6cc56fd9df51de4fea234bb14a2eff32706;hpb=ac258369305673f3d17322b845ad58f2b9f64100;p=umurmur.git

diff --git a/src/messages.h b/src/messages.h
index 4582d6c..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.
 
@@ -36,8 +36,32 @@
 #include "list.h"
 #include "types.h"
 
-#define MAX_TEXT 256
-#define MESSAGE_STREAM_VERSION 4
+#define PROTVER_MAJOR 1
+#define PROTVER_MINOR 2
+#define PROTVER_PATCH 3
+#define PROTOCOL_VERSION ((PROTVER_MAJOR << 16) | (PROTVER_MINOR << 8) | (PROTVER_PATCH))
+
+#define PERM_NONE 0x0
+#define PERM_WRITE 0x1
+#define PERM_TRAVERSE 0x2
+#define PERM_ENTER 0x4
+#define PERM_SPEAK 0x8
+#define PERM_MUTEDEAFEN 0x10
+#define PERM_MOVE 0x20
+#define PERM_MAKECHANNEL 0x40
+#define PERM_LINKCHANNEL 0x80
+#define PERM_WHISPER 0x100
+#define PERM_TEXTMESSAGE 0x200
+#define PERM_MAKETEMPCHANNEL 0x400
+// Root channel only
+#define PERM_KICK 0x10000
+#define PERM_BAN 0x20000
+#define PERM_REGISTER 0x40000
+#define PERM_SELFREGISTER 0x80000	
+#define PERM_CACHED 0x8000000
+#define PERM_ALL 0xf07ff
+
+#define PERM_DEFAULT (PERM_TRAVERSE | PERM_ENTER | PERM_SPEAK | PERM_WHISPER | PERM_TEXTMESSAGE | PERM_MAKETEMPCHANNEL)
 
 typedef enum {
 	Version,
@@ -50,7 +74,7 @@ typedef enum {
 	ChannelState,
 	UserRemove,
 	UserState,
-	BanList,
+	BanList, /* 10 */
 	TextMessage,
 	PermissionDenied,
 	ACL,
@@ -60,8 +84,11 @@ typedef enum {
 	ContextAction,
 	UserList,
 	VoiceTarget,
-	PermissionQuery,
+	PermissionQuery, /* 20 */
 	CodecVersion,
+	UserStats,
+	RequestBlob,
+	ServerConfig
 } messageType_t;
 
 typedef enum {
@@ -97,8 +124,10 @@ typedef union payload {
 	struct  _MumbleProto__UserList *userList;
 	struct  _MumbleProto__VoiceTarget__Target *voiceTarget_target;
 	struct  _MumbleProto__VoiceTarget *voiceTarget;
-	/* PermissionQuery not supported */
+	struct  _MumbleProto__PermissionQuery *permissionQuery;
 	struct  _MumbleProto__CodecVersion *codecVersion;
+	struct  _MumbleProto__UserStats *userStats;
+	struct  _MumbleProto__ServerConfig *serverConfig;
 } payload_t;
 
 typedef struct message {
@@ -110,12 +139,12 @@ typedef struct message {
 } message_t;
 
 
-
 int Msg_messageToNetwork(message_t *msg, uint8_t *buffer);
 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