X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessages.h;h=9fde9f9ab2cf739551147723866a4f6611e502ae;hb=4067f2a0693cc1b5536a3161e61eabb1aea551a3;hp=2e7d1a759faf442c3cbd5ba6150ffd9ac9695992;hpb=17ff75bcd300b8523afa53be4b7058ea2a5cbdf1;p=umurmur.git

diff --git a/src/messages.h b/src/messages.h
index 2e7d1a7..9fde9f9 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 0
+#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,7 +84,7 @@ typedef enum {
 	ContextAction,
 	UserList,
 	VoiceTarget,
-	PermissionQuery,
+	PermissionQuery, /* 20 */
 	CodecVersion,
 } messageType_t;
 
@@ -110,12 +134,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