Update copyright year.

[umurmur.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index db5cfaa4c0e1e5aff595bd029be368dd0b784e20..d58d3e3d174b255d93a8afdab13b914543b43798 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -29,6 +29,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <limits.h>
+#include <stdlib.h>
+#include <string.h>
 #include "log.h"
 #include "list.h"
 #include "client.h"
@@ -159,9 +161,12 @@ void Chan_init()
                        channel_t *ch, *ch_itr = NULL;
                        ch = Chan_createChannel(chdesc.name, chdesc.description);
                        ch->noenter = chdesc.noenter;
-                       
+                       if (chdesc.password) {
+                               Log_info("Setting password on channel '%s'", ch->name); 
+                               ch->password = strdup(chdesc.password);
+                       }
                        if (strcmp(defaultChannelName, chdesc.name) == 0) {
-                               Log_info("Setting default channel %s", ch->name); 
+                               Log_info("Setting default channel '%s'", ch->name); 
                                defaultChan = ch;
                        }
                        
@@ -170,7 +175,7 @@ void Chan_init()
                        } while (ch_itr != NULL && strcmp(ch_itr->name, chdesc.parent) != 0);
                        
                        if (ch_itr == NULL)
-                               Log_fatal("Error in channel configuration: parent not found");
+                               Log_fatal("Error in channel configuration: parent '%s' not found", chdesc.parent);
                        else {
                                Chan_addChannel(ch_itr, ch);
                                Log_info("Adding channel '%s' parent '%s'", ch->name, chdesc.parent);
@@ -182,6 +187,8 @@ void Chan_init()
        
        if (defaultChan->noenter)
                Log_fatal("Error in channel configuration: default channel is marked as noenter");
+       if (defaultChan->password)
+               Log_fatal("Error in channel configuration: default channel has a password");
 
        /* Channel links */
        for (i = 0; ; i++) {
@@ -212,7 +219,8 @@ void Chan_init()
                        ch_dst = ch_itr;
                
                list_add_tail(&ch_dst->link_node, &ch_src->channel_links);
-               Log_info("Adding channel link %s -> %s", ch_src->name, ch_dst->name);
+               ch_src->linkcount++;
+               Log_info("Adding channel link '%s' -> '%s'", ch_src->name, ch_dst->name);
        }
 }
 
@@ -223,10 +231,12 @@ void Chan_free()
        
        list_iterate_safe(itr, save, &channels) {
                ch = list_get_entry(itr, channel_t, flatlist_node);
-               Log_debug("Free channel %s", ch->name);
+               Log_debug("Free channel '%s'", ch->name);
                free(ch->name);
                if (ch->desc)
                        free(ch->desc);
+               if (ch->password)
+                       free(ch->password);
                free(ch);
        }
 }
@@ -254,7 +264,7 @@ void Chan_addChannel(channel_t *parent, channel_t *ch)
 }
 
 
-int Chan_playerLeave(client_t *client)
+int Chan_userLeave(client_t *client)
 {
        channel_t *leaving = NULL;
        int leaving_id = -1;
@@ -270,20 +280,23 @@ int Chan_playerLeave(client_t *client)
        return leaving_id;
 }
 
-int Chan_playerJoin(channel_t *ch, client_t *client)
+int Chan_userJoin(channel_t *ch, client_t *client)
 {
        int leaving_id;
-       
-       Log_debug("Add player %s to channel %s", client->playerName, ch->name); 
 
+       /* Do nothing if user already is in this channel */
+       if ((channel_t *)client->channel == ch)
+               return 0;
+       
+       Log_debug("Add user %s to channel %s", client->username, ch->name); 
        /* Only allowed in one channel at a time */
-       leaving_id = Chan_playerLeave(client);
+       leaving_id = Chan_userLeave(client);
        list_add_tail(&client->chan_node, &ch->clients);
        client->channel = (void *)ch;
        return leaving_id;
 }
 
-int Chan_playerJoin_id(int channelid, client_t *client)
+int Chan_userJoin_id(int channelid, client_t *client)
 {
        channel_t *ch_itr = NULL;
        do {
@@ -294,10 +307,10 @@ int Chan_playerJoin_id(int channelid, client_t *client)
                return -1;
        }
        else
-               return Chan_playerJoin(ch_itr, client); 
+               return Chan_userJoin(ch_itr, client);   
 }
 
-bool_t Chan_playerJoin_id_test(int channelid)
+channelJoinResult_t Chan_userJoin_id_test(int channelid, client_t *client)
 {
        channel_t *ch_itr = NULL;
        do {
@@ -305,12 +318,13 @@ bool_t Chan_playerJoin_id_test(int channelid)
        } while (ch_itr != NULL && ch_itr->id != channelid);
        if (ch_itr == NULL) {
                Log_warn("Channel id %d not found - ignoring.", channelid);
-               return false;
+               return CHJOIN_NOTFOUND;
        }
-       if (ch_itr->noenter)
-               return false;
-       else
-               return true;
+       else if (ch_itr->noenter)
+               return CHJOIN_NOENTER;
+       else if (ch_itr->password && !Client_token_match(client, ch_itr->password))
+               return CHJOIN_WRONGPW;
+       else return CHJOIN_OK;
 }
 
 #if 0
@@ -342,3 +356,28 @@ void Chan_removeChannel(channel_t *ch)
 {
        list_del(&ch->node);
 }
+
+void Chan_buildTreeList(channel_t *ch, struct dlist *head)
+{
+       channellist_t *chl;
+       struct dlist *itr;
+       channel_t *sub;
+       
+       chl = malloc(sizeof(channellist_t));
+       chl->chan = ch;
+       init_list_entry(&chl->node);
+       list_add_tail(&chl->node, head);
+
+       list_iterate(itr, &ch->subs) {
+               sub = list_get_entry(itr, channel_t, node);
+               Chan_buildTreeList(sub, head);
+       }
+}
+
+void Chan_freeTreeList(struct dlist *head)
+{
+       struct dlist *itr, *save;
+       list_iterate_safe(itr, save, head) {
+               free(list_get_entry(itr, channellist_t, node));
+       }
+}