X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.c;h=5ac6924ab3f970c06a8a528775ab4ea0ee1e72cb;hb=66c74e96472bd59c9c01815c621c303f4cb19b58;hp=4609e4cb786a94fb47b22171396c0b23a203fa59;hpb=ebdd6565cbbd2db46833530112c15be0e22afc29;p=umurmur.git

diff --git a/src/channel.c b/src/channel.c
index 4609e4c..5ac6924 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2011, 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.
 
@@ -153,6 +153,7 @@ void Chan_init()
 		if (i == 0) {
 			rootChan = createChannel(0, chdesc.name, chdesc.description);
 			rootChan->noenter = chdesc.noenter;
+			rootChan->silent = chdesc.silent;
 			list_add_tail(&rootChan->flatlist_node, &channels);
 			if (strcmp(defaultChannelName, chdesc.name) == 0)
 				defaultChan = rootChan;
@@ -161,9 +162,14 @@ void Chan_init()
 			channel_t *ch, *ch_itr = NULL;
 			ch = Chan_createChannel(chdesc.name, chdesc.description);
 			ch->noenter = chdesc.noenter;
-			
+			ch->position = chdesc.position;
+			ch->silent = chdesc.silent;
+			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;
 			}
 			
@@ -172,7 +178,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);
@@ -184,6 +190,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++) {
@@ -230,6 +238,8 @@ void Chan_free()
 		free(ch->name);
 		if (ch->desc)
 			free(ch->desc);
+		if (ch->password)
+			free(ch->password);
 		free(ch);
 	}
 }
@@ -303,20 +313,25 @@ int Chan_userJoin_id(int channelid, client_t *client)
 		return Chan_userJoin(ch_itr, client);	
 }
 
-bool_t Chan_userJoin_id_test(int channelid)
+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 false;
+		result.CHJOIN_NOTFOUND = true;
 	}
-	if (ch_itr->noenter)
-		return false;
 	else
-		return true;
+		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