Use Client_find_by_session() instead of a few open-coded loops.

[umurmur.git] / src / channel.h

diff --git a/src/channel.h b/src/channel.h
index 29c28d32cc42f70403d55eba9f6eaeb1a64ff48c..d348184f8ccf9602268a49828270999779444af3 100644 (file)
--- a/src/channel.h
+++ b/src/channel.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-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -37,28 +37,48 @@
 
 typedef struct channel {
        int id;
-       char name[MAX_TEXT];
-       char desc[MAX_TEXT];
+       char *name;
+       char *desc;
+       char *password;
        struct channel *parent;
+       bool_t temporary, noenter, silent;
+       int position;
        struct dlist node;
        struct dlist subs;
        struct dlist clients;
        struct dlist flatlist_node;
        struct dlist channel_links;
-       struct dlist link_node;
+       int linkcount;
 } channel_t;
 
+typedef struct {
+       channel_t *chan;
+       struct dlist node;
+} channellist_t;
+
+typedef struct {
+  bool_t CHJOIN_SILENT,
+       CHJOIN_NOENTER,
+       CHJOIN_WRONGPW,
+       CHJOIN_NOTFOUND;
+} channelJoinResult_t;
+       
 void Chan_init();
 void Chan_free();
 void Chan_addChannel(channel_t *parent, channel_t *sub);
 void Chan_removeChannel(channel_t *c);
 void Chan_addClient(channel_t *c, client_t *client);
 void Chan_removeClient(channel_t *c, client_t *client);
-void Chan_playerJoin(channel_t *ch, client_t *client);
-void Chan_playerJoin_id(int channelid, client_t *client);
-void Chan_iterate(channel_t **channelpptr);
+int Chan_userJoin(channel_t *ch, client_t *client);
+int Chan_userJoin_id(int channelid, client_t *client);
+int Chan_userLeave(client_t *client);
+channelJoinResult_t Chan_userJoin_id_test(int channelid, client_t *client);
+channel_t *Chan_iterate(channel_t **channelpptr);
+channel_t *Chan_iterate_siblings(channel_t *parent, channel_t **channelpptr);
 channel_t *Chan_createChannel(const char *name, const char *desc);
 channel_t *Chan_fromId(int channelid);
 void Chan_freeChannel(channel_t *ch);
+void Chan_buildTreeList(channel_t *ch, struct dlist *head);
+void Chan_freeTreeList(struct dlist *head);
 
 #endif