X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=a7a273d88935776b3b008a6bd854ec7ca427f24a;hp=a37fca96adabd7243b6302f7b6327d6aa6f428f1;hb=2a7dd06ebd9cc72d45a6a4becdbef5213d7b7800;hpb=4ef172d60331611ddb4d96ba33266998eb7ae505

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index a37fca96..a7a273d8 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -1,20 +1,20 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * IRC channel commands
  */
 
-
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.28 2005/03/02 16:35:11 alex Exp $";
+/**
+ * @file
+ * IRC channel commands
+ */
 
 #include "imp.h"
 #include <assert.h>
@@ -24,8 +24,8 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.28 2005/03/02 16:35:11 alex Ex
 
 #include "defines.h"
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
+#include "conn-func.h"
 #include "lists.h"
 #include "log.h"
 #include "match.h"
@@ -33,18 +33,218 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.28 2005/03/02 16:35:11 alex Ex
 #include "parse.h"
 #include "irc-info.h"
 #include "irc-write.h"
-#include "resolve.h"
 #include "conf.h"
 
 #include "exp.h"
 #include "irc-channel.h"
 
 
-GLOBAL BOOLEAN
+/*
+ * RFC 2812, (3.2.1 Join message Command):
+ *  Note that this message
+ *  accepts a special argument ("0"), which is a special request to leave all
+ *  channels the user is currently a member of. The server will process this
+ *  message as if the user had sent a PART command (See Section 3.2.2) for
+ *  each channel he is a member of.
+ */
+static bool
+part_from_all_channels(CLIENT* client, CLIENT *target)
+{
+	CL2CHAN *cl2chan;
+	CHANNEL *chan;
+
+	while ((cl2chan = Channel_FirstChannelOf(target))) {
+		chan = Channel_GetChannel(cl2chan);
+		assert( chan != NULL );
+		Channel_Part(target, client, Channel_Name(chan), Client_ID(target));
+	}
+	return CONNECTED;
+}
+
+
+/**
+ * Check weather a local client is allowed to join an already existing
+ * channel or not.
+ * @param Client Client that sent the JOIN command
+ * @param chan Channel to check
+ * @param channame Name of the channel
+ * @param key Provided channel key (or NULL if none has been provided)
+ * @return true if client is allowed to join channel, false otherwise
+ */
+static bool
+join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame,
+	     const char *key)
+{
+	bool is_invited, is_banned;
+	const char *channel_modes;
+
+	/* Allow IRC operators to overwrite channel limits */
+	if (strchr(Client_Modes(Client), 'o'))
+		return true;
+
+	is_banned = Lists_Check(Channel_GetListBans(chan), Client);
+	is_invited = Lists_Check(Channel_GetListInvites(chan), Client);
+
+	if (is_banned && !is_invited) {
+		/* Client is banned from channel (and not on invite list) */
+		IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG,
+				   Client_ID(Client), channame);
+		return false;
+	}
+
+	channel_modes = Channel_Modes(chan);
+	if (strchr(channel_modes, 'i') && !is_invited) {
+		/* Channel is "invite-only" and client is not on invite list */
+		IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG,
+				   Client_ID(Client), channame);
+		return false;
+	}
+
+	if (!Channel_CheckKey(chan, Client, key ? key : "")) {
+		/* Channel is protected by a channel key and the client
+		 * didn't specify the correct one */
+		IRC_WriteStrClient(Client, ERR_BADCHANNELKEY_MSG,
+				   Client_ID(Client), channame);
+		return false;
+	}
+
+	if (strchr(channel_modes, 'l') &&
+	    (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) {
+		/* There are more clints joined to this channel than allowed */
+		IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG,
+				   Client_ID(Client), channame);
+		return false;
+	}
+
+	if (strchr(channel_modes, 'z') && !Conn_UsesSSL(Client_Conn(Client))) {
+		/* Only "secure" clients are allowed, but clients doesn't
+		 * use SSL encryption */
+		IRC_WriteStrClient(Client, ERR_SECURECHANNEL_MSG,
+				   Client_ID(Client), channame);
+		return false;
+	}
+
+	if (strchr(channel_modes, 'O') && !Client_OperByMe(Client)) {
+		/* Only IRC operators are allowed! */
+		IRC_WriteStrClient(Client, ERR_OPONLYCHANNEL_MSG,
+				   Client_ID(Client), channame);
+		return false;
+	}
+
+	return true;
+}
+
+
+static void
+join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags)
+{
+	if (flags) {
+		while (*flags) {
+			Channel_UserModeAdd(chan, target, *flags);
+			flags++;
+		}
+	}
+
+	/* If channel persistent and client is ircop: make client chanop */
+	if (strchr(Channel_Modes(chan), 'P') && strchr(Client_Modes(target), 'o'))
+		Channel_UserModeAdd(chan, target, 'o');
+}
+
+
+static void
+cb_join_forward(CLIENT *To, CLIENT *Prefix, void *Data)
+{
+	CONN_ID conn;
+	char str[COMMAND_LEN], *ptr = NULL;
+
+	strlcpy(str, (char *)Data, sizeof(str));
+	conn = Client_Conn(To);
+
+	if (Conn_Options(conn) & CONN_RFC1459) {
+		/* RFC 1459 compatibility mode, appended modes are NOT
+		 * supported, so strip them off! */
+		ptr = strchr(str, 0x7);
+		if (ptr)
+			*ptr++ = '\0';
+	}
+
+	IRC_WriteStrClientPrefix(To, Prefix, "JOIN %s", str);
+	if (ptr && *ptr)
+		IRC_WriteStrClientPrefix(To, Prefix, "MODE %s +%s %s", str, ptr,
+					 Client_ID(Prefix));
+} /* cb_join_forward */
+
+
+static void
+join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan,
+					const char *channame)
+{
+	char modes[CHANNEL_MODE_LEN], str[COMMAND_LEN];
+
+	strlcpy(&modes[1], Channel_UserModes(chan, target), sizeof(modes) - 1);
+	if (modes[1])
+		modes[0] = 0x7;
+	else
+		modes[0] = '\0';
+
+	/* forward to other servers (if it is not a local channel) */
+	if (!Channel_IsLocal(chan)) {
+		snprintf(str, sizeof(str), "%s%s", channame, modes);
+		IRC_WriteStrServersPrefixFlag_CB(Client, target, '\0',
+						 cb_join_forward, str);
+	}
+
+	/* tell users in this channel about the new client */
+	IRC_WriteStrChannelPrefix(Client, chan, target, false,
+				  "JOIN :%s",  channame);
+
+	/* syncronize channel modes */
+	if (modes[1]) {
+		IRC_WriteStrChannelPrefix(Client, chan, target, false,
+					  "MODE %s +%s %s", channame,
+					  &modes[1], Client_ID(target));
+	}
+} /* join_forward */
+
+
+static bool
+join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan,
+					const char *channame)
+{
+	const char *topic;
+
+	if (Client_Type(Client) != CLIENT_USER)
+		return true;
+	/* acknowledge join */
+	if (!IRC_WriteStrClientPrefix(Client, target, "JOIN :%s", channame))
+		return false;
+
+	/* Send topic to client, if any */
+	topic = Channel_Topic(chan);
+	assert(topic != NULL);
+	if (*topic) {
+		if (!IRC_WriteStrClient(Client, RPL_TOPIC_MSG,
+			Client_ID(Client), channame, topic))
+				return false;
+#ifndef STRICT_RFC
+		if (!IRC_WriteStrClient(Client, RPL_TOPICSETBY_MSG,
+			Client_ID(Client), channame,
+			Channel_TopicWho(chan),
+			Channel_TopicTime(chan)))
+				return false;
+#endif
+	}
+	/* send list of channel members to client */
+	if (!IRC_Send_NAMES(Client, chan))
+		return false;
+	return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG, Client_ID(Client), Channel_Name(chan));
+}
+
+
+GLOBAL bool
 IRC_JOIN( CLIENT *Client, REQUEST *Req )
 {
-	CHAR *channame, *key, *flags, *topic, modes[8];
-	BOOLEAN is_new_chan, is_invited, is_banned;
+	char *channame, *key = NULL, *flags, *lastkey = NULL, *lastchan = NULL;
 	CLIENT *target;
 	CHANNEL *chan;
 
@@ -52,301 +252,306 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 	assert( Req != NULL );
 
 	/* Bad number of arguments? */
-	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	if (Req->argc < 1 || Req->argc > 2)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
 
 	/* Who is the sender? */
-	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
-	else target = Client;
-	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	if (Client_Type(Client) == CLIENT_SERVER)
+		target = Client_Search(Req->prefix);
+	else
+		target = Client;
+
+	if (!target)
+		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix);
+
+	/* Is argument "0"? */
+	if (Req->argc == 1 && !strncmp("0", Req->argv[0], 2))
+		return part_from_all_channels(Client, target);
 
 	/* Are channel keys given? */
-	if( Req->argc > 1 ) key = Req->argv[1];
-	else key = NULL;
+	if (Req->argc > 1)
+		key = strtok_r(Req->argv[1], ",", &lastkey);
 
-	/* Channel-Namen durchgehen */
-	chan = NULL;
-	channame = strtok( Req->argv[0], "," );
-	while( channame )
-	{
-		chan = NULL; flags = NULL;
+	channame = Req->argv[0];
+	channame = strtok_r(channame, ",", &lastchan);
 
-		/* wird der Channel neu angelegt? */
-		if( Channel_Search( channame )) is_new_chan = FALSE;
-		else is_new_chan = TRUE;
+	/* Make sure that "channame" is not the empty string ("JOIN :") */
+	if (! channame)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
 
-		/* Hat ein Server Channel-User-Modes uebergeben? */
-		if( Client_Type( Client ) == CLIENT_SERVER )
-		{
-			/* Channel-Flags extrahieren */
-			flags = strchr( channame, 0x7 );
-			if( flags )
-			{
+	while (channame) {
+		flags = NULL;
+
+		/* Did the server include channel-user-modes? */
+		if (Client_Type(Client) == CLIENT_SERVER) {
+			flags = strchr(channame, 0x7);
+			if (flags) {
 				*flags = '\0';
 				flags++;
 			}
 		}
 
-		/* Local client? */
-		if( Client_Type( Client ) == CLIENT_USER )
-		{
-			/* Test if the user has reached his maximum channel count */
-			if( Client_Type( Client ) == CLIENT_USER )
-			{
-				if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
-				{
-					IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame );
-					return CONNECTED;
-				}
-			}
+		chan = Channel_Search(channame);
+		if (!chan && Conf_PredefChannelsOnly) {
+			 /* channel must be created, but server does not allow this */
+			IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame);
+			break;
+		}
 
-			/* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
-			if( is_new_chan )
-			{
-				/* Erster User im Channel: Operator-Flag setzen */
-				flags = "o";
+		/* Local client? */
+		if (Client_Type(Client) == CLIENT_USER) {
+			/* Test if the user has reached the channel limit */
+			if ((Conf_MaxJoins > 0) &&
+			    (Channel_CountForUser(Client) >= Conf_MaxJoins))
+				return IRC_WriteStrClient(Client,
+						ERR_TOOMANYCHANNELS_MSG,
+						Client_ID(Client), channame);
+			if (chan) {
+				/* Already existing channel: check if the
+				 * client is allowed to join */
+				if (!join_allowed(Client, chan, channame, key))
+					break;
+			} else {
+				/* New channel: first user will become channel
+				 * operator unless this is a modeless channel */
+				if (*channame != '+')
+					flags = "o";
 			}
-			else
-			{
-				/* Existierenden Channel suchen */
-				chan = Channel_Search( channame );
-				assert( chan != NULL );
-
-				is_banned = Lists_CheckBanned( target, chan );
-				is_invited = Lists_CheckInvited( target, chan );
-
-				/* Testen, ob Client gebanned ist */
-				if(( is_banned == TRUE ) &&  ( is_invited == FALSE ))
-				{
-					/* Client ist gebanned (und nicht invited): */
-					IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
-
-					/* Try next name, if any */
-					channame = strtok( NULL, "," );
-					continue;
-				}
-
-				/* Ist der Channel "invite-only"? */
-				if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE ))
-				{
-					/* Channel ist "invite-only" und Client wurde nicht invited: */
-					IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
-
-					/* Try next name, if any */
-					channame = strtok( NULL, "," );
-					continue;
-				}
-
-				/* Is the channel protected by a key? */
-				if(( strchr( Channel_Modes( chan ), 'k' )) && ( strcmp( Channel_Key( chan ), key ? key : "" ) != 0 ))
-				{
-					/* Bad channel key! */
-					IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame );
-
-					/* Try next name, if any */
-					channame = strtok( NULL, "," );
-					continue;
-				}
 
-				/* Are there already too many members? */
-				if(( strchr( Channel_Modes( chan ), 'l' )) && ( Channel_MaxUsers( chan ) <= Channel_MemberCount( chan )))
-				{
-					/* Bad channel key! */
-					IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame );
-
-					/* Try next name, if any */
-					channame = strtok( NULL, "," );
-					continue;
-				}
-			}
-		}
-		else
-		{
+			/* Local client: update idle time */
+			Conn_UpdateIdle(Client_Conn(Client));
+		} else {
 			/* Remote server: we don't need to know whether the
 			 * client is invited or not, but we have to make sure
 			 * that the "one shot" entries (generated by INVITE
 			 * commands) in this list become deleted when a user
 			 * joins a channel this way. */
-			chan = Channel_Search( channame );
-			if( chan != NULL ) (VOID)Lists_CheckInvited( target, chan );
+			if (chan)
+				(void)Lists_Check(Channel_GetListInvites(chan),
+						  target);
 		}
 
-		/* Channel joinen (und ggf. anlegen) */
-		if( ! Channel_Join( target, channame ))
-		{
-			/* naechsten Namen ermitteln */
-			channame = strtok( NULL, "," );
-			continue;
-		}
-		if( ! chan ) chan = Channel_Search( channame );
-		assert( chan != NULL );
-
-		/* Modes setzen (wenn vorhanden) */
-		while( flags && *flags )
-		{
-			Channel_UserModeAdd( chan, target, *flags );
-			flags++;
-		}
-
-		/* Wenn persistenter Channel und IRC-Operator: zum Channel-OP machen */
-		if(( strchr( Channel_Modes( chan ), 'P' )) && ( strchr( Client_Modes( target ), 'o' ))) Channel_UserModeAdd( chan, target, 'o' );
-
-		/* Muessen Modes an andere Server gemeldet werden? */
-		strlcpy( &modes[1], Channel_UserModes( chan, target ), sizeof( modes ) - 1 );
-		if( modes[1] ) modes[0] = 0x7;
-		else modes[0] = '\0';
-
-		/* An andere Server weiterleiten */
-		IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes );
+		/* Join channel (and create channel if it doesn't exist) */
+		if (!Channel_Join(target, channame))
+			break;
 
-		/* im Channel bekannt machen */
-		IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame );
-		if( modes[1] )
-		{
-			/* Modes im Channel bekannt machen */
-			IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s +%s %s", channame, &modes[1], Client_ID( target ));
+		if (!chan) { /* channel is new; it has been created above */
+			chan = Channel_Search(channame);
+			assert(chan != NULL);
+			if (Channel_IsModeless(chan)) {
+				Channel_ModeAdd(chan, 't'); /* /TOPIC not allowed */
+				Channel_ModeAdd(chan, 'n'); /* no external msgs */
+			}
 		}
+		assert(chan != NULL);
 
-		if( Client_Type( Client ) == CLIENT_USER )
-		{
-			/* an Client bestaetigen */
-			IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame );
+		join_set_channelmodes(chan, target, flags);
 
-			/* Topic an Client schicken */
-			topic = Channel_Topic( chan );
-			if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic );
+		join_forward(Client, target, chan, channame);
 
-			/* Mitglieder an Client Melden */
-			IRC_Send_NAMES( Client, chan );
-			IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), Channel_Name( chan ));
-		}
+		if (!join_send_topic(Client, target, chan, channame))
+			break; /* write error */
 
-		/* naechsten Namen ermitteln */
-		channame = strtok( NULL, "," );
+		/* next channel? */
+		channame = strtok_r(NULL, ",", &lastchan);
+		if (channame && key)
+			key = strtok_r(NULL, ",", &lastkey);
 	}
 	return CONNECTED;
 } /* IRC_JOIN */
 
 
-GLOBAL BOOLEAN
-IRC_PART( CLIENT *Client, REQUEST *Req )
+/**
+ * Handler for the IRC "PART" command.
+ */
+GLOBAL bool
+IRC_PART(CLIENT * Client, REQUEST * Req)
 {
 	CLIENT *target;
-	CHAR *chan;
-
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	/* Wer ist der Absender? */
-	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
-	else target = Client;
-	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	char *chan;
+
+	assert(Client != NULL);
+	assert(Req != NULL);
+
+	if (Req->argc < 1 || Req->argc > 2)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
+
+	/* Get the sender */
+	if (Client_Type(Client) == CLIENT_SERVER)
+		target = Client_Search(Req->prefix);
+	else
+		target = Client;
+	if (!target)
+		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+					  Client_ID(Client), Req->prefix);
+
+	/* Loop over all the given channel names */
+	chan = strtok(Req->argv[0], ",");
+
+	/* Make sure that "chan" is not the empty string ("PART :") */
+	if (! chan)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
+
+	while (chan) {
+		Channel_Part(target, Client, chan,
+			     Req->argc > 1 ? Req->argv[1] : Client_ID(target));
+		chan = strtok(NULL, ",");
+	}
 
-	/* Channel-Namen durchgehen */
-	chan = strtok( Req->argv[0], "," );
-	while( chan )
-	{
-		if( ! Channel_Part( target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID( target )))
-		{
-			/* naechsten Namen ermitteln */
-			chan = strtok( NULL, "," );
-			continue;
-		}
+	/* Update idle time, if local client */
+	if (Client_Conn(Client) > NONE)
+		Conn_UpdateIdle(Client_Conn(Client));
 
-		/* naechsten Namen ermitteln */
-		chan = strtok( NULL, "," );
-	}
 	return CONNECTED;
 } /* IRC_PART */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 {
 	CHANNEL *chan;
 	CLIENT *from;
-	CHAR *topic;
+	char *topic;
+	bool onchannel, topicok, use_servermode, r;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
-	else from = Client;
-	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
-
-	/* Welcher Channel? */
-	chan = Channel_Search( Req->argv[0] );
-	if( ! chan ) return IRC_WriteStrClient( from, ERR_NOSUCHCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
-
-	/* Ist der User Mitglied in dem Channel? */
-	if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
-
-	if( Req->argc == 1 )
-	{
-		/* Topic erfragen */
-		topic = Channel_Topic( chan );
-		if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic );
-		else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan ));
+	if (Req->argc < 1 || Req->argc > 2)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
+
+	if (Client_Type(Client) == CLIENT_SERVER)
+		from = Client_Search(Req->prefix);
+	else
+		from = Client;
+
+	if (!from)
+		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+					  Client_ID(Client), Req->prefix);
+
+	chan = Channel_Search(Req->argv[0]);
+	if (!chan)
+		return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG,
+					  Client_ID(from), Req->argv[0]);
+
+	Channel_CheckAdminRights(chan, Client, from,
+				 &onchannel, &topicok, &use_servermode);
+
+	if (!onchannel && !topicok)
+		return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG,
+					  Client_ID(from), Req->argv[0]);
+
+	if (Req->argc == 1) {
+		/* Request actual topic */
+		topic = Channel_Topic(chan);
+		if (*topic) {
+			r = IRC_WriteStrClient(from, RPL_TOPIC_MSG,
+					       Client_ID(Client),
+					       Channel_Name(chan), topic);
+#ifndef STRICT_RFC
+			r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG,
+					       Client_ID(Client),
+					       Channel_Name(chan),
+					       Channel_TopicWho(chan),
+					       Channel_TopicTime(chan));
+#endif
+			return r;
+		}
+		else
+			return IRC_WriteStrClient(from, RPL_NOTOPIC_MSG,
+						  Client_ID(from),
+						  Channel_Name(chan));
 	}
 
-	if( strchr( Channel_Modes( chan ), 't' ))
-	{
-		/* Topic Lock. Ist der User ein Channel Operator? */
-		if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
+	if (strchr(Channel_Modes(chan), 't')) {
+		/* Topic Lock. Is the user a channel or IRC operator? */
+		if (!topicok)
+			return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
+						  Client_ID(from),
+						  Channel_Name(chan));
 	}
 
-	/* Topic setzen */
-	Channel_SetTopic( chan, Req->argv[1] );
-	Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "<none>" );
-
-	/* im Channel bekannt machen und an Server weiterleiten */
-	IRC_WriteStrServersPrefix( Client, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
-	IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
-
-	if( Client_Type( Client ) == CLIENT_USER ) return IRC_WriteStrClientPrefix( Client, Client, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
-	else return CONNECTED;
+	/* Set new topic */
+	Channel_SetTopic(chan, from, Req->argv[1]);
+	LogDebug("%s \"%s\" set topic on \"%s\": %s",
+		 Client_TypeText(from), Client_Mask(from), Channel_Name(chan),
+		 Req->argv[1][0] ? Req->argv[1] : "<none>");
+
+	if (use_servermode)
+		from = Client_ThisServer();
+
+	/* Update channel and forward new topic to other servers */
+	if (!Channel_IsLocal(chan))
+		IRC_WriteStrServersPrefix(Client, from, "TOPIC %s :%s",
+					  Req->argv[0], Req->argv[1]);
+	IRC_WriteStrChannelPrefix(Client, chan, from, false, "TOPIC %s :%s",
+				  Req->argv[0], Req->argv[1]);
+
+	if (Client_Type(Client) == CLIENT_USER)
+		return IRC_WriteStrClientPrefix(Client, Client, "TOPIC %s :%s",
+						Req->argv[0], Req->argv[1]);
+	else
+		return CONNECTED;
 } /* IRC_TOPIC */
 
 
-GLOBAL BOOLEAN
+/**
+ * Handler for the IRC "LIST" command.
+ * This implementation handles the local case as well as the forwarding of the
+ * LIST command to other servers in the IRC network.
+ */
+GLOBAL bool
 IRC_LIST( CLIENT *Client, REQUEST *Req )
 {
-	CHAR *pattern;
+	char *pattern;
 	CHANNEL *chan;
 	CLIENT *from, *target;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	/* Bad number of prameters? */
+	if( Req->argc > 2 )
+		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
+			Client_ID( Client ), Req->command );
 
-	if( Req->argc > 0 ) pattern = strtok( Req->argv[0], "," );
-	else pattern = "*";
+	if( Req->argc > 0 )
+		pattern = strtok( Req->argv[0], "," );
+	else
+		pattern = "*";
 
-	/* From aus Prefix ermitteln */
-	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
-	else from = Client;
-	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+	/* Get sender from prefix, if any */
+	if( Client_Type( Client ) == CLIENT_SERVER )
+		from = Client_Search( Req->prefix );
+	else
+		from = Client;
+
+	if( ! from )
+		return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG,
+				Client_ID( Client ), Req->prefix );
 
 	if( Req->argc == 2 )
 	{
-		/* an anderen Server forwarden */
+		/* Forward to other server? */
 		target = Client_Search( Req->argv[1] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER ))
+			return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG,
+					Client_ID( Client ), Req->argv[1] );
 
 		if( target != Client_ThisServer( ))
 		{
-			/* Ok, anderer Server ist das Ziel: forwarden */
-			return IRC_WriteStrClientPrefix( target, from, "LIST %s :%s", from, Req->argv[1] );
+			/* Target is indeed an other server, forward it! */
+			return IRC_WriteStrClientPrefix( target, from,
+					"LIST %s :%s", Client_ID( from ),
+					Req->argv[1] );
 		}
 	}
-	
+
 	while( pattern )
 	{
 		/* Loop through all the channels */
@@ -360,28 +565,35 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 				if( ! strchr( Channel_Modes( chan ), 's' ) ||
 				    Channel_IsMemberOf( chan, from ))
 				{
-					if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED;
+					if( ! IRC_WriteStrClient( from,
+					    RPL_LIST_MSG, Client_ID( from ),
+					    Channel_Name( chan ),
+					    Channel_MemberCount( chan ),
+					    Channel_Topic( chan )))
+						return DISCONNECTED;
 				}
 			}
 			chan = Channel_Next( chan );
 		}
-		
-		/* naechsten Namen ermitteln */
-		if( Req->argc > 0 ) pattern = strtok( NULL, "," );
-		else pattern = NULL;
+
+		/* Get next name ... */
+		if( Req->argc > 0 )
+			pattern = strtok( NULL, "," );
+		else
+			pattern = NULL;
 	}
-	
-	return IRC_WriteStrClient( from, RPL_LISTEND_MSG, from );
+
+	return IRC_WriteStrClient( from, RPL_LISTEND_MSG, Client_ID( from ));
 } /* IRC_LIST */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 {
-	CHAR modes_add[COMMAND_LEN], l[16], *ptr;
+	char modes_add[COMMAND_LEN], l[16], *ptr;
 	CLIENT *from;
 	CHANNEL *chan;
-	INT arg_topic;
+	int arg_topic;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -429,7 +641,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 			{
 				if( *ptr == 'l' )
 				{
-					snprintf( l, sizeof( l ), " %ld", Channel_MaxUsers( chan ));
+					snprintf( l, sizeof( l ), " %lu", Channel_MaxUsers( chan ));
 					strlcat( modes_add, l, sizeof( modes_add ));
 				}
 				if( *ptr == 'k' )
@@ -439,9 +651,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 				}
 	     			ptr++;
 			}
-			
+
 			/* Inform members of this channel */
-			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add );
+			IRC_WriteStrChannelPrefix( Client, chan, from, false, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add );
 		}
 	}
 	else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" );
@@ -453,8 +665,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 		if(( ! *ptr ) && ( Req->argv[arg_topic][0] ))
 		{
 			/* OK, there is no topic jet */
-			Channel_SetTopic( chan, Req->argv[arg_topic] );
-			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Channel_Topic( chan ));
+			Channel_SetTopic(chan, Client, Req->argv[arg_topic]);
+			IRC_WriteStrChannelPrefix(Client, chan, from, false,
+			     "TOPIC %s :%s", Req->argv[0], Channel_Topic(chan));
 		}
 	}