X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.c;h=fdf4e82df9acab3a9597b56b5449d13508068b23;hb=ae418f7371164782194a73d2daa6873cd62f8440;hp=d5d873cae3c7f25ed203eb30fab5411dd94b2c39;hpb=2c0dc163ea5a84f8bf2d4fb5ac98985d77da32c1;p=umurmur.git diff --git a/src/channel.c b/src/channel.c index d5d873c..fdf4e82 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2013, Martin Johansson - Copyright (C) 2005-2013, Thorvald Natvig +/* Copyright (C) 2009-2014, Martin Johansson + Copyright (C) 2005-2014, Thorvald Natvig All rights reserved. @@ -93,7 +93,7 @@ static channel_t *next_channel(channel_t *ch) if (list_get_next(&ch->node) == &list_get_entry(&ch->node, channel_t, node)->parent->subs) return NULL; else - return list_get_entry(list_get_next(&ch->node), channel_t, node); + return list_get_entry(list_get_next(&ch->node), channel_t, node); } #endif @@ -134,7 +134,7 @@ channel_t *Chan_iterate_siblings(channel_t *parent, channel_t **channelpptr) *channelpptr = ch; return ch; } - + void Chan_init() { int i; @@ -143,7 +143,7 @@ void Chan_init() const char *defaultChannelName; defaultChannelName = getStrConf(DEFAULT_CHANNEL); - + for (i = 0; ; i++) { if (Conf_getNextChannel(&chdesc, i) < 0) { if (i == 0) @@ -165,18 +165,18 @@ void Chan_init() ch->position = chdesc.position; ch->silent = chdesc.silent; if (chdesc.password) { - Log_info("Setting password on channel '%s'", ch->name); + 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; } - + do { Chan_iterate(&ch_itr); } while (ch_itr != NULL && strcmp(ch_itr->name, chdesc.parent) != 0); - + if (ch_itr == NULL) Log_fatal("Error in channel configuration: parent '%s' not found", chdesc.parent); else { @@ -187,7 +187,7 @@ void Chan_init() } if (defaultChan == NULL) defaultChan = rootChan; - + if (defaultChan->noenter) Log_fatal("Error in channel configuration: default channel is marked as noenter"); if (defaultChan->password) @@ -196,6 +196,7 @@ void Chan_init() /* Channel links */ for (i = 0; ; i++) { channel_t *ch_src, *ch_dst, *ch_itr = NULL; + channellist_t *chl; if (Conf_getNextChannelLink(&chlink, i) < 0) { if (i == 0) Log_info("No channel links found in configuration file."); @@ -210,8 +211,8 @@ void Chan_init() chlink.source); else ch_src = ch_itr; - - ch_itr = NULL; + + ch_itr = NULL; do { Chan_iterate(&ch_itr); } while (ch_itr != NULL && strcmp(ch_itr->name, chlink.destination) != 0); @@ -220,8 +221,13 @@ void Chan_init() chlink.destination); else ch_dst = ch_itr; - - list_add_tail(&ch_dst->link_node, &ch_src->channel_links); + + chl = malloc(sizeof(channellist_t)); + if(!chl) + Log_fatal("Out of memory"); + chl->chan = ch_dst; + init_list_entry(&chl->node); + list_add_tail(&chl->node, &ch_src->channel_links); ch_src->linkcount++; Log_info("Adding channel link '%s' -> '%s'", ch_src->name, ch_dst->name); } @@ -230,8 +236,9 @@ void Chan_init() void Chan_free() { struct dlist *itr, *save; + struct dlist *linkitr, *linksave; channel_t *ch; - + list_iterate_safe(itr, save, &channels) { ch = list_get_entry(itr, channel_t, flatlist_node); Log_debug("Free channel '%s'", ch->name); @@ -240,6 +247,11 @@ void Chan_free() free(ch->desc); if (ch->password) free(ch->password); + list_iterate_safe(linkitr, linksave, &ch->channel_links) { + channellist_t *chl; + chl = list_get_entry(linkitr, channellist_t, node); + free(chl); + } free(ch); } } @@ -271,7 +283,7 @@ int Chan_userLeave(client_t *client) { channel_t *leaving = NULL; int leaving_id = -1; - + if (client->channel) { list_del(&client->chan_node); leaving = (channel_t *)client->channel; @@ -290,8 +302,8 @@ int Chan_userJoin(channel_t *ch, client_t *client) /* 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); + + Log_debug("Add user %s to channel %s", client->username, ch->name); /* Only allowed in one channel at a time */ leaving_id = Chan_userLeave(client); list_add_tail(&client->chan_node, &ch->clients); @@ -310,24 +322,28 @@ int Chan_userJoin_id(int channelid, client_t *client) return -1; } else - return Chan_userJoin(ch_itr, client); + return Chan_userJoin(ch_itr, client); } channelJoinResult_t Chan_userJoin_id_test(int channelid, client_t *client) { + channelJoinResult_t result; channel_t *ch_itr = NULL; do { Chan_iterate(&ch_itr); } while (ch_itr != NULL && ch_itr->id != channelid); if (ch_itr == NULL) { Log_warn("Channel id %d not found - ignoring.", channelid); - return CHJOIN_NOTFOUND; + result.CHJOIN_NOTFOUND = 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; + else + result.CHJOIN_NOTFOUND = false; + + result.CHJOIN_NOENTER = ch_itr->noenter; + result.CHJOIN_WRONGPW = ch_itr->password && !Client_token_match(client, ch_itr->password) && !client->isAdmin; + result.CHJOIN_SILENT = ch_itr->silent; + + return result; } #if 0 @@ -365,8 +381,10 @@ void Chan_buildTreeList(channel_t *ch, struct dlist *head) channellist_t *chl; struct dlist *itr; channel_t *sub; - + chl = malloc(sizeof(channellist_t)); + if(!chl) + Log_fatal("Out of memory"); chl->chan = ch; init_list_entry(&chl->node); list_add_tail(&chl->node, head);