X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=e31b268f509da533bbe888d65e9157fd817e78da;hp=3f140064647f44241609bfb928793ee50670b974;hb=fb0fbe908d97b520cdb6f8180db3d3288339142a;hpb=8a324b6d9c844da4e69875dfebd07dd2af3bc004

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 3f140064..e31b268f 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -1,83 +1,147 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * 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.
  *
- * $Id: channel.c,v 1.6 2002/01/26 18:41:55 alex Exp $
- *
- * channel.c: Management der Channels
- *
- * $Log: channel.c,v $
- * Revision 1.6  2002/01/26 18:41:55  alex
- * - CHANNEL- und CL2CHAN-Strukturen in Header verlegt,
- * - einige neue Funktionen (Channel_GetChannel(), Channel_FirstMember(), ...)
- *
- * Revision 1.5  2002/01/21 00:12:29  alex
- * - begonnen, Channels zu implementieren :-)
- *
- * Revision 1.4  2002/01/16 22:09:07  alex
- * - neue Funktion Channel_Count().
- *
- * Revision 1.3  2002/01/02 02:42:58  alex
- * - Copyright-Texte aktualisiert.
- *
- * Revision 1.2  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.1  2001/12/14 08:13:43  alex
- * - neues Modul begonnen :-)
+ * Channel management
  */
 
 
 #define __channel_c__
 
 
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
 
-#include <imp.h>
+static char UNUSED id[] = "$Id: channel.c,v 1.61 2006/12/07 22:23:39 fw Exp $";
+
+#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
+#include <strings.h>
 
+#include "defines.h"
+#include "conn-func.h"
 #include "client.h"
-#include "irc.h"
+
+#include "exp.h"
+#include "channel.h"
+
+#include "imp.h"
+#include "irc-write.h"
+#include "resolve.h"
+#include "conf.h"
+#include "hash.h"
+#include "lists.h"
 #include "log.h"
 #include "messages.h"
 
-#include <exp.h>
-#include "channel.h"
+#include "exp.h"
+
 
+#define REMOVE_PART 0
+#define REMOVE_QUIT 1
+#define REMOVE_KICK 2
 
-LOCAL CHANNEL *My_Channels;
-LOCAL CL2CHAN *My_Cl2Chan;
 
+static CHANNEL *My_Channels;
+static CL2CHAN *My_Cl2Chan;
 
-LOCAL CHANNEL *New_Chan( CHAR *Name );
-LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client );
-LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client );
-LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason );
-LOCAL CL2CHAN *Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan );
-LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan );
-LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan );
 
+static CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
+static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
+static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
 
-GLOBAL VOID Channel_Init( VOID )
+
+GLOBAL void
+Channel_Init( void )
 {
 	My_Channels = NULL;
 	My_Cl2Chan = NULL;
 } /* Channel_Init */
 
 
-GLOBAL VOID Channel_Exit( VOID )
+GLOBAL struct list_head *
+Channel_GetListBans(CHANNEL *c)
+{
+	assert(c != NULL);
+	return &c->list_bans;
+}
+
+
+GLOBAL struct list_head *
+Channel_GetListInvites(CHANNEL *c)
+{
+	assert(c != NULL);
+	return &c->list_invites;
+}
+
+
+GLOBAL void
+Channel_InitPredefined( void )
+{
+	/* Vordefinierte persistente Channels erzeugen */
+
+	CHANNEL *chan;
+	char *c;
+	unsigned int i;
+	
+	for( i = 0; i < Conf_Channel_Count; i++ )
+	{
+		/* Ist ein Name konfiguriert? */
+		if( ! Conf_Channel[i].name[0] ) continue;
+
+		/* Gueltiger Channel-Name? */
+		if( ! Channel_IsValidName( Conf_Channel[i].name ))
+		{
+			Log( LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"!", Conf_Channel[i].name );
+			array_free(&Conf_Channel[i].topic);
+			continue;
+		}
+
+		/* Gibt es den Channel bereits? */
+		chan = Channel_Search( Conf_Channel[i].name );
+		if( chan )
+		{
+			Log( LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.", Conf_Channel[i].name );
+			array_free(&Conf_Channel[i].topic);
+			continue;
+		}
+
+		/* Create channel */
+		chan = Channel_Create(Conf_Channel[i].name);
+		if (chan) {
+			Channel_ModeAdd(chan, 'P');
+
+			if (array_start(&Conf_Channel[i].topic) != NULL)
+				Channel_SetTopic(chan, NULL,
+					 array_start(&Conf_Channel[i].topic));
+			array_free(&Conf_Channel[i].topic);
+
+			c = Conf_Channel[i].modes;
+			while (*c)
+				Channel_ModeAdd(chan, *c++);
+
+			Log(LOG_INFO, "Created pre-defined channel \"%s\".",
+							Conf_Channel[i].name );
+		}
+		else Log(LOG_ERR, "Can't create pre-defined channel \"%s\"!",
+							Conf_Channel[i].name );
+	}
+} /* Channel_InitPredefined */
+
+
+GLOBAL void
+Channel_Exit( void )
 {
 	CHANNEL *c, *c_next;
 	CL2CHAN *cl2chan, *cl2chan_next;
@@ -87,6 +151,7 @@ GLOBAL VOID Channel_Exit( VOID )
 	while( c )
 	{
 		c_next = c->next;
+		array_free(&c->topic);
 		free( c );
 		c = c_next;
 	}
@@ -102,87 +167,126 @@ GLOBAL VOID Channel_Exit( VOID )
 } /* Channel_Exit */
 
 
-GLOBAL BOOLEAN Channel_Join( CLIENT *Client, CHAR *Name )
+GLOBAL bool
+Channel_Join( CLIENT *Client, char *Name )
 {
 	CHANNEL *chan;
 	
 	assert( Client != NULL );
 	assert( Name != NULL );
 
-	/* Valider Channel-Name? */
-	if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN ))
-	{
+	if( ! Channel_IsValidName( Name )) {
 		IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
-		return FALSE;
+		return false;
 	}
 
-	/* Channel suchen */
 	chan = Channel_Search( Name );
-	if( chan )
-	{
+	if( chan ) {
 		/* Ist der Client bereits Mitglied? */
-		if( Get_Cl2Chan( chan, Client )) return FALSE;
+		if( Get_Cl2Chan( chan, Client )) return false;
 	}
 	else
 	{
 		/* Gibt es noch nicht? Dann neu anlegen: */
-		chan = New_Chan( Name );
-		if( ! chan ) return FALSE;
-
-		/* Verketten */
-		chan->next = My_Channels;
-		My_Channels = chan;
+		chan = Channel_Create( Name );
+		if (!chan) return false;
 	}
 
 	/* User dem Channel hinzufuegen */
-	if( ! Add_Client( chan, Client )) return FALSE;
-	else return TRUE;
+	if( ! Add_Client( chan, Client )) return false;
+	else return true;
 } /* Channel_Join */
 
 
-GLOBAL BOOLEAN Channel_Part( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason )
+GLOBAL bool
+Channel_Part( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
 {
 	CHANNEL *chan;
 
 	assert( Client != NULL );
 	assert( Name != NULL );
+	assert( Reason != NULL );
 
-	/* Channel suchen */
 	chan = Channel_Search( Name );
 	if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client )))
 	{
 		IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
-		return FALSE;
+		return false;
 	}
 
 	/* User aus Channel entfernen */
-	if( ! Remove_Client( chan, Client, Origin, Reason )) return FALSE;
-	else return TRUE;
+	if( ! Remove_Client( REMOVE_PART, chan, Client, Origin, Reason, true)) return false;
+	else return true;
 } /* Channel_Part */
 
 
-GLOBAL VOID Channel_RemoveClient( CLIENT *Client, CHAR *Reason )
+GLOBAL void
+Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
+{
+	CHANNEL *chan;
+
+	assert( Client != NULL );
+	assert( Origin != NULL );
+	assert( Name != NULL );
+	assert( Reason != NULL );
+
+	chan = Channel_Search( Name );
+	if( ! chan )
+	{
+		IRC_WriteStrClient( Origin, ERR_NOSUCHCHANNEL_MSG, Client_ID( Origin ), Name );
+		return;
+	}
+
+	if( ! Channel_IsMemberOf( chan, Origin ))
+	{
+		IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Name );
+		return;
+	}
+
+	/* Is User Channel-Operator? */
+	if( ! strchr( Channel_UserModes( chan, Origin ), 'o' ))
+	{
+		IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Name);
+		return;
+	}
+
+	/* Ist the kickED User member of channel? */
+	if( ! Channel_IsMemberOf( chan, Client ))
+	{
+		IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( Client ), Name );
+		return;
+	}
+
+	Remove_Client( REMOVE_KICK, chan, Client, Origin, Reason, true);
+} /* Channel_Kick */
+
+
+GLOBAL void
+Channel_Quit( CLIENT *Client, char *Reason )
 {
 	CHANNEL *c, *next_c;
 
 	assert( Client != NULL );
+	assert( Reason != NULL );
+
+	IRC_WriteStrRelatedPrefix( Client, Client, false, "QUIT :%s", Reason );
 
 	c = My_Channels;
 	while( c )
 	{
 		next_c = c->next;
-		Remove_Client( c, Client, Client_ThisServer( ), Reason );
+		Remove_Client( REMOVE_QUIT, c, Client, Client, Reason, false );
 		c = next_c;
 	}
-} /* Channel_RemoveClient */
+} /* Channel_Quit */
 
 
-GLOBAL INT Channel_Count( VOID )
+GLOBAL unsigned long
+Channel_Count( void )
 {
 	CHANNEL *c;
-	INT count;
+	unsigned long count = 0;
 	
-	count = 0;
 	c = My_Channels;
 	while( c )
 	{
@@ -193,31 +297,128 @@ GLOBAL INT Channel_Count( VOID )
 } /* Channel_Count */
 
 
-GLOBAL CHANNEL *Channel_Search( CHAR *Name )
+GLOBAL unsigned long
+Channel_MemberCount( CHANNEL *Chan )
+{
+	CL2CHAN *cl2chan;
+	unsigned long count = 0;
+
+	assert( Chan != NULL );
+
+	cl2chan = My_Cl2Chan;
+	while( cl2chan )
+	{
+		if( cl2chan->channel == Chan ) count++;
+		cl2chan = cl2chan->next;
+	}
+	return count;
+} /* Channel_MemberCount */
+
+
+GLOBAL int
+Channel_CountForUser( CLIENT *Client )
+{
+	/* Count number of channels a user is member of. */
+
+	CL2CHAN *cl2chan;
+	int count = 0;
+	
+	assert( Client != NULL );
+	
+	cl2chan = My_Cl2Chan;
+	while( cl2chan )
+	{
+		if( cl2chan->client == Client ) count++;
+		cl2chan = cl2chan->next;
+	}
+
+	return count;
+} /* Channel_CountForUser */
+
+
+
+GLOBAL const char *
+Channel_Name( const CHANNEL *Chan )
+{
+	assert( Chan != NULL );
+	return Chan->name;
+} /* Channel_Name */
+
+
+GLOBAL char *
+Channel_Modes( CHANNEL *Chan )
+{
+	assert( Chan != NULL );
+	return Chan->modes;
+} /* Channel_Modes */
+
+
+GLOBAL char *
+Channel_Key( CHANNEL *Chan )
+{
+	assert( Chan != NULL );
+	return Chan->key;
+} /* Channel_Key */
+
+
+GLOBAL unsigned long
+Channel_MaxUsers( CHANNEL *Chan )
+{
+	assert( Chan != NULL );
+	return Chan->maxusers;
+} /* Channel_MaxUsers */
+
+
+GLOBAL CHANNEL *
+Channel_First( void )
+{
+	return My_Channels;
+} /* Channel_First */
+
+
+GLOBAL CHANNEL *
+Channel_Next( CHANNEL *Chan )
+{
+	assert( Chan != NULL );
+	return Chan->next;
+} /* Channel_Next */
+
+
+GLOBAL CHANNEL *
+Channel_Search( char *Name )
 {
 	/* Channel-Struktur suchen */
 	
 	CHANNEL *c;
+	UINT32 search_hash;
 
 	assert( Name != NULL );
+
+	search_hash = Hash( Name );
 	c = My_Channels;
 	while( c )
 	{
-		if( strcasecmp( Name, c->name ) == 0 ) return c;
+		if( search_hash == c->hash )
+		{
+			/* lt. Hash-Wert: Treffer! */
+			if( strcasecmp( Name, c->name ) == 0 ) return c;
+		}
 		c = c->next;
 	}
 	return NULL;
 } /* Channel_Search */
 
 
-GLOBAL CL2CHAN *Channel_FirstMember( CHANNEL *Chan )
+GLOBAL CL2CHAN *
+Channel_FirstMember( CHANNEL *Chan )
 {
 	assert( Chan != NULL );
 	return Get_First_Cl2Chan( NULL, Chan );
-} /* Channel_IsMember */
+} /* Channel_FirstMember */
 
 
-GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
+GLOBAL CL2CHAN *
+Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
 {
 	assert( Chan != NULL );
 	assert( Cl2Chan != NULL );
@@ -225,46 +426,332 @@ GLOBAL CL2CHAN *Channel_NextMember( CHANNEL *Chan, CL2CHAN *Cl2Chan )
 } /* Channel_NextMember */
 
 
-GLOBAL CLIENT *Channel_GetClient( CL2CHAN *Cl2Chan )
+GLOBAL CL2CHAN *
+Channel_FirstChannelOf( CLIENT *Client )
+{
+	assert( Client != NULL );
+	return Get_First_Cl2Chan( Client, NULL );
+} /* Channel_FirstChannelOf */
+
+
+GLOBAL CL2CHAN *
+Channel_NextChannelOf( CLIENT *Client, CL2CHAN *Cl2Chan )
+{
+	assert( Client != NULL );
+	assert( Cl2Chan != NULL );
+	return Get_Next_Cl2Chan( Cl2Chan->next, Client, NULL );
+} /* Channel_NextChannelOf */
+
+
+GLOBAL CLIENT *
+Channel_GetClient( CL2CHAN *Cl2Chan )
 {
 	assert( Cl2Chan != NULL );
 	return Cl2Chan->client;
 } /* Channel_GetClient */
 
 
-GLOBAL CHANNEL *Channel_GetChannel( CL2CHAN *Cl2Chan )
+GLOBAL CHANNEL *
+Channel_GetChannel( CL2CHAN *Cl2Chan )
 {
 	assert( Cl2Chan != NULL );
 	return Cl2Chan->channel;
 } /* Channel_GetChannel */
 
 
-LOCAL CHANNEL *New_Chan( CHAR *Name )
+GLOBAL bool
+Channel_IsValidName( const char *Name )
+{
+	assert( Name != NULL );
+
+	if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false;
+
+	return Name[strcspn(Name, " ,:\007")] == 0;
+} /* Channel_IsValidName */
+
+
+GLOBAL bool
+Channel_ModeAdd( CHANNEL *Chan, char Mode )
+{
+	/* set Mode.
+	 * If the channel already had this mode, return false.
+	 * If the channel mode was newly set return true.
+	 */
+
+	char x[2];
+
+	assert( Chan != NULL );
+
+	x[0] = Mode; x[1] = '\0';
+	if( ! strchr( Chan->modes, x[0] ))
+	{
+		/* Channel does not have this mode yet, set it */
+		strlcat( Chan->modes, x, sizeof( Chan->modes ));
+		return true;
+	}
+	else return false;
+} /* Channel_ModeAdd */
+
+
+GLOBAL bool
+Channel_ModeDel( CHANNEL *Chan, char Mode )
 {
-	/* Neue Channel-Struktur anlegen */
+	/* Delete mode.
+	 * if the mode was removed return true.
+	 * if the channel did not have the mode, return false.
+	*/
+	char *p;
+
+	assert( Chan != NULL );
+
+	p = strchr( Chan->modes, Mode );
+	if( ! p ) return false;
+
+	/* Channel has mode -> delete */
+	while( *p )
+	{
+		*p = *(p + 1);
+		p++;
+	}
+	return true;
+} /* Channel_ModeDel */
+
+
+GLOBAL bool
+Channel_UserModeAdd( CHANNEL *Chan, CLIENT *Client, char Mode )
+{
+	/* Set Channel-User-Mode.
+	 * if mode was newly set, return true.
+	 * if the User already had this channel-mode, return false.
+	 */
+
+	CL2CHAN *cl2chan;
+	char x[2];
+
+	assert( Chan != NULL );
+	assert( Client != NULL );
+
+	cl2chan = Get_Cl2Chan( Chan, Client );
+	assert( cl2chan != NULL );
+
+	x[0] = Mode; x[1] = '\0';
+	if( ! strchr( cl2chan->modes, x[0] ))
+	{
+		/* mode not set, -> set it */
+		strlcat( cl2chan->modes, x, sizeof( cl2chan->modes ));
+		return true;
+	}
+	else return false;
+} /* Channel_UserModeAdd */
+
+
+GLOBAL bool
+Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, char Mode )
+{
+	/* Delete Channel-User-Mode.
+	 * If Mode was removed, return true.
+	 * If User did not have the Channel-Mode, return false.
+	 */
+
+	CL2CHAN *cl2chan;
+	char *p;
+
+	assert( Chan != NULL );
+	assert( Client != NULL );
+
+	cl2chan = Get_Cl2Chan( Chan, Client );
+	assert( cl2chan != NULL );
+
+	p = strchr( cl2chan->modes, Mode );
+	if( ! p ) return false;
+
+	/* Client has Mode -> delete */
+	while( *p )
+	{
+		*p = *(p + 1);
+		p++;
+	}
+	return true;
+} /* Channel_UserModeDel */
+
+
+GLOBAL char *
+Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
+{
+	/* return Users' Channel-Modes */
+
+	CL2CHAN *cl2chan;
+
+	assert( Chan != NULL );
+	assert( Client != NULL );
+
+	cl2chan = Get_Cl2Chan( Chan, Client );
+	assert( cl2chan != NULL );
+
+	return cl2chan->modes;
+} /* Channel_UserModes */
+
+
+GLOBAL bool
+Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
+{
+	/* Test if Client is on Channel Chan */
+
+	assert( Chan != NULL );
+	assert( Client != NULL );
+	return Get_Cl2Chan(Chan, Client);
+} /* Channel_IsMemberOf */
+
+
+GLOBAL char *
+Channel_Topic( CHANNEL *Chan )
+{
+	char *ret;
+	assert( Chan != NULL );
+	ret = array_start(&Chan->topic);
+	return ret ? ret : "";
+} /* Channel_Topic */
+
 	
+#ifndef STRICT_RFC
+
+GLOBAL unsigned int
+Channel_TopicTime(CHANNEL *Chan)
+{
+	assert(Chan != NULL);
+	return (unsigned int) Chan->topic_time;
+} /* Channel_TopicTime */
+
+
+GLOBAL char *
+Channel_TopicWho(CHANNEL *Chan)
+{
+	assert(Chan != NULL);
+	return Chan->topic_who;
+} /* Channel_TopicWho */
+
+#endif
+
+
+GLOBAL void
+Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, char *Topic)
+{
+	size_t len;
+	assert( Chan != NULL );
+	assert( Topic != NULL );
+
+	len = strlen(Topic);
+	if (len < array_bytes(&Chan->topic))
+		array_free(&Chan->topic);
+
+	if (len >= COMMAND_LEN || !array_copyb(&Chan->topic, Topic, len+1))
+		Log(LOG_WARNING, "could not set new Topic \"%s\" on %s: %s",
+					Topic, Chan->name, strerror(errno));
+#ifndef STRICT_RFC
+	Chan->topic_time = time(NULL);
+	if (Client != NULL && Client_Type(Client) != CLIENT_SERVER)
+		strlcpy(Chan->topic_who, Client_ID(Client),
+			sizeof Chan->topic_who);
+	else
+		strlcpy(Chan->topic_who, DEFAULT_TOPIC_ID,
+			sizeof Chan->topic_who);
+#else
+	(void) Client;
+#endif
+} /* Channel_SetTopic */
+
+
+GLOBAL void
+Channel_SetModes( CHANNEL *Chan, char *Modes )
+{
+	assert( Chan != NULL );
+	assert( Modes != NULL );
+
+	strlcpy( Chan->modes, Modes, sizeof( Chan->modes ));
+} /* Channel_SetModes */
+
+
+GLOBAL void
+Channel_SetKey( CHANNEL *Chan, char *Key )
+{
+	assert( Chan != NULL );
+	assert( Key != NULL );
+
+	strlcpy( Chan->key, Key, sizeof( Chan->key ));
+	LogDebug("Channel %s: Key is now \"%s\".", Chan->name, Chan->key );
+} /* Channel_SetKey */
+
+
+GLOBAL void
+Channel_SetMaxUsers(CHANNEL *Chan, unsigned long Count)
+{
+	assert( Chan != NULL );
+
+	Chan->maxusers = Count;
+	LogDebug("Channel %s: Member limit is now %lu.", Chan->name, Chan->maxusers );
+} /* Channel_SetMaxUsers */
+
+
+GLOBAL bool
+Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, char *Text )
+{
+	bool is_member, has_voice, is_op, ok;
+
+	/* Okay, target is a channel */
+	is_member = has_voice = is_op = false;
+	if( Channel_IsMemberOf( Chan, From ))
+	{
+		is_member = true;
+		if( strchr( Channel_UserModes( Chan, From ), 'v' )) has_voice = true;
+		if( strchr( Channel_UserModes( Chan, From ), 'o' )) is_op = true;
+	}
+
+	/* Is the client allowed to write to channel? */
+	ok = true;
+	if( strchr( Channel_Modes( Chan ), 'n' ) && ( ! is_member )) ok = false;
+	if( strchr( Channel_Modes( Chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = false;
+
+	/* Is the client banned? */
+	if( Lists_Check(&Chan->list_bans, From))
+	{
+		/* Client is banned, but is he channel operator or has voice? */
+		if(( ! has_voice ) && ( ! is_op )) ok = false;
+	}
+
+	if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan ));
+
+	/* Send text */
+	if( Client_Conn( From ) > NONE ) Conn_UpdateIdle( Client_Conn( From ));
+	return IRC_WriteStrChannelPrefix( Client, Chan, From, true, "PRIVMSG %s :%s", Channel_Name( Chan ), Text );
+} /* Channel_Write */
+
+
+GLOBAL CHANNEL *
+Channel_Create( char *Name )
+{
+	/* Create new CHANNEL structure and add it to linked list */
 	CHANNEL *c;
 
 	assert( Name != NULL );
-	
-	c = malloc( sizeof( CHANNEL ));
+
+	c = (CHANNEL *)malloc( sizeof( CHANNEL ));
 	if( ! c )
 	{
-		Log( LOG_EMERG, "Can't allocate memory!" );
+		Log( LOG_EMERG, "Can't allocate memory! [New_Chan]" );
 		return NULL;
 	}
-	c->next = NULL;
-	strncpy( c->name, Name, CHANNEL_NAME_LEN );
-	c->name[CHANNEL_NAME_LEN - 1] = '\0';
-	strcpy( c->modes, "" );
-
-	Log( LOG_DEBUG, "Created new channel structure for \"%s\".", Name );
-	
+	memset( c, 0, sizeof( CHANNEL ));
+	strlcpy( c->name, Name, sizeof( c->name ));
+	c->hash = Hash( c->name );
+	c->next = My_Channels;
+	My_Channels = c;
+	LogDebug("Created new channel structure for \"%s\".", Name);
 	return c;
-} /* New_Chan */
+} /* Channel_Create */
 
 
-LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
+static CL2CHAN *
+Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 {
 	CL2CHAN *cl2chan;
 
@@ -281,31 +768,37 @@ LOCAL CL2CHAN *Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 } /* Get_Cl2Chan */
 
 
-LOCAL CL2CHAN *Add_Client( CHANNEL *Chan, CLIENT *Client )
+static CL2CHAN *
+Add_Client( CHANNEL *Chan, CLIENT *Client )
 {
 	CL2CHAN *cl2chan;
 
 	assert( Chan != NULL );
 	assert( Client != NULL );
 
-	cl2chan = malloc( sizeof( CL2CHAN ));
+	/* neue CL2CHAN-Struktur anlegen */
+	cl2chan = (CL2CHAN *)malloc( sizeof( CL2CHAN ));
 	if( ! cl2chan )
 	{
-		Log( LOG_EMERG, "Can't allocate memory!" );
+		Log( LOG_EMERG, "Can't allocate memory! [Add_Client]" );
 		return NULL;
 	}
 	cl2chan->channel = Chan;
 	cl2chan->client = Client;
+	strcpy( cl2chan->modes, "" );
 
 	/* Verketten */
 	cl2chan->next = My_Cl2Chan;
 	My_Cl2Chan = cl2chan;
-	
+
+	Log( LOG_DEBUG, "User \"%s\" joined channel \"%s\".", Client_Mask( Client ), Chan->name );
+
 	return cl2chan;
 } /* Add_Client */
 
 
-LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR *Reason )
+static bool
+Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer )
 {
 	CL2CHAN *cl2chan, *last_cl2chan;
 	CHANNEL *c;
@@ -323,7 +816,7 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR
 		last_cl2chan = cl2chan;
 		cl2chan = cl2chan->next;
 	}
-	if( ! cl2chan ) return FALSE;
+	if( ! cl2chan ) return false;
 
 	c = cl2chan->channel;
 	assert( c != NULL );
@@ -333,26 +826,128 @@ LOCAL BOOLEAN Remove_Client( CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, CHAR
 	else My_Cl2Chan = cl2chan->next;
 	free( cl2chan );
 
-	if( Client_Conn( Origin ) > NONE ) IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
-	IRC_WriteStrServersPrefix( Origin, Client, "PART %s :%s", c->name, Reason );
-	IRC_WriteStrChannelPrefix( Origin, c, Client, "PART %s :%s", c->name, Reason );
-
-	Log( LOG_DEBUG, "User \"%s\" left channel \"%s\" (%s).", Client_Mask( Client ), c->name, Reason );
+	switch( Type )
+	{
+		case REMOVE_QUIT:
+			/* QUIT: other servers have already been notified, see Client_Destroy();
+			 * so only inform other clients in same channel. */
+			assert( InformServer == false );
+			LogDebug("User \"%s\" left channel \"%s\" (%s).",
+					Client_Mask( Client ), c->name, Reason );
+			break;
+		case REMOVE_KICK:
+			/* User was KICKed: inform other servers and all users in channel */
+			if( InformServer )
+				IRC_WriteStrServersPrefix( Client_NextHop( Origin ),
+					Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason);
+			IRC_WriteStrChannelPrefix(Client, c, Origin, false, "KICK %s %s :%s",
+							c->name, Client_ID( Client ), Reason );
+			if ((Client_Conn(Client) > NONE) &&
+					(Client_Type(Client) == CLIENT_USER))
+			{
+				IRC_WriteStrClientPrefix(Client, Origin, "KICK %s %s :%s",
+								c->name, Client_ID( Client ), Reason);
+			}
+			LogDebug("User \"%s\" has been kicked of \"%s\" by \"%s\": %s.",
+				Client_Mask( Client ), c->name, Client_ID(Origin), Reason);
+			break;
+		default: /* PART */
+			if (InformServer)
+				IRC_WriteStrServersPrefix(Origin, Client, "PART %s :%s", c->name, Reason);
+
+			IRC_WriteStrChannelPrefix(Origin, c, Client, false, "PART %s :%s",
+									c->name, Reason);
+
+			if ((Client_Conn(Origin) > NONE) &&
+					(Client_Type(Origin) == CLIENT_USER))
+			{
+				IRC_WriteStrClientPrefix( Origin, Client, "PART %s :%s", c->name, Reason);
+				LogDebug("User \"%s\" left channel \"%s\" (%s).",
+					Client_Mask(Client), c->name, Reason);
+			}
+	}
 
-	/* Wenn Channel nun leer: loeschen */
-	if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
+	/* Wenn Channel nun leer und nicht pre-defined: loeschen */
+	if( ! strchr( Channel_Modes( Chan ), 'P' ))
+	{
+		if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
+	}
 		
-	return TRUE;
+	return true;
 } /* Remove_Client */
 
 
-LOCAL CL2CHAN *Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
+GLOBAL bool
+Channel_AddBan(CHANNEL *c, const char *mask )
+{
+	struct list_head *h = Channel_GetListBans(c);
+	return Lists_Add(h, mask, false);
+}
+
+
+GLOBAL bool
+Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce)
+{
+	struct list_head *h = Channel_GetListInvites(c);
+	return Lists_Add(h, mask, onlyonce);
+}
+
+
+static bool
+ShowInvitesBans(struct list_head *head, CLIENT *Client, CHANNEL *Channel, bool invite)
+{
+	struct list_elem *e;
+	char *msg = invite ? RPL_INVITELIST_MSG : RPL_BANLIST_MSG;
+	char *msg_end;
+
+	assert( Client != NULL );
+	assert( Channel != NULL );
+
+	e = Lists_GetFirst(head);
+	while (e) {
+		if( ! IRC_WriteStrClient( Client, msg, Client_ID( Client ),
+				Channel_Name( Channel ), Lists_GetMask(e) )) return DISCONNECTED;
+		e = Lists_GetNext(e);
+	}
+
+	msg_end = invite ? RPL_ENDOFINVITELIST_MSG : RPL_ENDOFBANLIST_MSG;
+	return IRC_WriteStrClient( Client, msg_end, Client_ID( Client ), Channel_Name( Channel ));
+}
+
+
+GLOBAL bool
+Channel_ShowBans( CLIENT *Client, CHANNEL *Channel )
+{
+	struct list_head *h;
+
+	assert( Channel != NULL );
+
+	h = Channel_GetListBans(Channel);
+	return ShowInvitesBans(h, Client, Channel, false);
+}
+
+
+GLOBAL bool
+Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel )
+{
+	struct list_head *h;
+
+	assert( Channel != NULL );
+
+	h = Channel_GetListInvites(Channel);
+	return ShowInvitesBans(h, Client, Channel, true);
+}
+
+
+static CL2CHAN *
+Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
 	return Get_Next_Cl2Chan( My_Cl2Chan, Client, Chan );
 } /* Get_First_Cl2Chan */
 
 
-LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
+static CL2CHAN *
+Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 {
 	CL2CHAN *cl2chan;
 
@@ -369,10 +964,11 @@ LOCAL CL2CHAN *Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channe
 } /* Get_Next_Cl2Chan */
 
 
-LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan )
+static bool
+Delete_Channel( CHANNEL *Chan )
 {
 	/* Channel-Struktur loeschen */
-	
+
 	CHANNEL *chan, *last_chan;
 
 	last_chan = NULL;
@@ -383,16 +979,20 @@ LOCAL BOOLEAN Delete_Channel( CHANNEL *Chan )
 		last_chan = chan;
 		chan = chan->next;
 	}
-	if( ! chan ) return FALSE;
+	if( ! chan ) return false;
 
 	Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
 
+	/* Invite- und Ban-Lists aufraeumen */
+	Lists_Free( &chan->list_bans );
+	Lists_Free( &chan->list_invites );
+
 	/* Neu verketten und freigeben */
 	if( last_chan ) last_chan->next = chan->next;
 	else My_Channels = chan->next;
 	free( chan );
-		
-	return TRUE;
+
+	return true;
 } /* Delete_Channel */