X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=6958831ad79ce678db1c3c58366cf54b328dd75a;hb=18efc7469c5923a298a218ee2d17f518cff184fa;hp=1b0e4424b2ff8882cbbfafd7b04aca65b0924b53;hpb=f7c2e8223f95fd984e7b96308905eef505c01680;p=ngircd-alex.git

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 1b0e4424..6958831a 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 by 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
@@ -17,8 +17,6 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.65 2008/02/05 16:31:35 fw Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -65,8 +63,16 @@ static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
 GLOBAL void
 Channel_Init( void )
 {
+	CHANNEL *sc;
+
 	My_Channels = NULL;
 	My_Cl2Chan = NULL;
+
+	sc = Channel_Create("&SERVER");
+	if (sc) {
+		Channel_SetModes(sc, "mnPt");
+		Channel_SetTopic(sc, Client_ThisServer(), "Server Messages");
+	}
 } /* Channel_Init */
 
 
@@ -89,57 +95,54 @@ Channel_GetListInvites(CHANNEL *c)
 GLOBAL void
 Channel_InitPredefined( void )
 {
-	/* Vordefinierte persistente Channels erzeugen */
+	/* Generate predefined persistent channels */
 
-	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;
+	CHANNEL *new_chan;
+	const struct Conf_Channel *conf_chan;
+	const char *c;
+	size_t i, channel_count = array_length(&Conf_Channels, sizeof(*conf_chan));
 
-		/* 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);
+	conf_chan = array_start(&Conf_Channels);
+
+	assert(channel_count == 0 || conf_chan != NULL);
+
+	for (i = 0; i < channel_count; i++, conf_chan++) {
+		if (!conf_chan->name[0] || !Channel_IsValidName(conf_chan->name)) {
+			Log(LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"",
+									conf_chan->name);
 			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);
+		new_chan = Channel_Search(conf_chan->name);
+		if (new_chan) {
+			Log(LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.",
+										conf_chan->name);
 			continue;
 		}
 
-		/* Create channel */
-		chan = Channel_Create(Conf_Channel[i].name);
-		if (chan) {
-			Channel_ModeAdd(chan, 'P');
+		new_chan = Channel_Create(conf_chan->name);
+		if (!new_chan) {
+			Log(LOG_ERR, "Can't create pre-defined channel \"%s\"",
+							conf_chan->name);
+			continue;
+		}
 
-			if (array_start(&Conf_Channel[i].topic) != NULL)
-				Channel_SetTopic(chan, NULL,
-					 array_start(&Conf_Channel[i].topic));
-			array_free(&Conf_Channel[i].topic);
+		Channel_ModeAdd(new_chan, 'P');
 
-			c = Conf_Channel[i].modes;
-			while (*c)
-				Channel_ModeAdd(chan, *c++);
+		if (conf_chan->topic[0])
+			Channel_SetTopic(new_chan, NULL, conf_chan->topic);
 
-			Channel_SetKey(chan, Conf_Channel[i].key);
-			Channel_SetMaxUsers(chan, Conf_Channel[i].maxusers);
+		c = conf_chan->modes;
+		while (*c)
+			Channel_ModeAdd(new_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_SetKey(new_chan, conf_chan->key);
+		Channel_SetMaxUsers(new_chan, conf_chan->maxusers);
+		Log(LOG_INFO, "Created pre-defined channel \"%s\"",
+						conf_chan->name);
 	}
+	if (channel_count)
+		array_free(&Conf_Channels);
 } /* Channel_InitPredefined */
 
 
@@ -149,7 +152,7 @@ Channel_Exit( void )
 	CHANNEL *c, *c_next;
 	CL2CHAN *cl2chan, *cl2chan_next;
 
-	/* Channel-Strukturen freigeben */
+	/* free struct Channel */
 	c = My_Channels;
 	while( c )
 	{
@@ -159,7 +162,7 @@ Channel_Exit( void )
 		c = c_next;
 	}
 
-	/* Channel-Zuordnungstabelle freigeben */
+	/* Free Channel allocation table */
 	cl2chan = My_Cl2Chan;
 	while( c )
 	{
@@ -170,40 +173,53 @@ Channel_Exit( void )
 } /* Channel_Exit */
 
 
+/**
+ * Join Channel
+ * This function lets a client join a channel.  First, the function
+ * checks that the specified channel name is valid and that the client
+ * isn't already a member.  If the specified channel doesn't exist,
+ * a new channel is created.  Client is added to channel by function
+ * Add_Client().
+ */
 GLOBAL bool
 Channel_Join( CLIENT *Client, char *Name )
 {
 	CHANNEL *chan;
-	
-	assert( Client != NULL );
-	assert( Name != NULL );
 
-	if( ! Channel_IsValidName( Name )) {
-		IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
+	assert(Client != NULL);
+	assert(Name != NULL);
+
+	/* Check that the channel name is valid */
+	if (! Channel_IsValidName(Name)) {
+		IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
+				   Client_ID(Client), Name);
 		return false;
 	}
 
-	chan = Channel_Search( Name );
-	if( chan ) {
-		/* Ist der Client bereits Mitglied? */
-		if( Get_Cl2Chan( chan, Client )) return false;
-	}
-	else
-	{
-		/* Gibt es noch nicht? Dann neu anlegen: */
-		chan = Channel_Create( Name );
-		if (!chan) return false;
+	chan = Channel_Search(Name);
+	if(chan) {
+		/* Check if the client is already in the channel */
+		if (Get_Cl2Chan(chan, Client))
+			return false;
+	} else {
+		/* If the specified channel does not exist, the channel
+		 * is now created */
+		chan = Channel_Create(Name);
+		if (!chan)
+			return false;
 	}
 
-	/* User dem Channel hinzufuegen */
-	if( ! Add_Client( chan, Client )) return false;
-	else return true;
+	/* Add user to Channel */
+	if (! Add_Client(chan, Client))
+		return false;
+
+	return true;
 } /* Channel_Join */
 
 
 /**
- * Remove client from channel.
- * This function lets a client lead a channel. First, the function checks
+ * Part client from channel.
+ * This function lets a client part from a channel. First, the function checks
  * if the channel exists and the client is a member of it and sends out
  * appropriate error messages if not. The real work is done by the function
  * Remove_Client().
@@ -217,18 +233,22 @@ Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Rea
 	assert(Name != NULL);
 	assert(Reason != NULL);
 
+	/* Check that specified channel exists */
 	chan = Channel_Search(Name);
 	if (!chan) {
 		IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
 				   Client_ID(Client), Name);
 		return false;
 	}
+
+	/* Check that the client is in the channel */
 	if (!Get_Cl2Chan(chan, Client)) {
 		IRC_WriteStrClient(Client, ERR_NOTONCHANNEL_MSG,
 				   Client_ID(Client), Name);
 		return false;
 	}
 
+	/* Part client from channel */
 	if (!Remove_Client(REMOVE_PART, chan, Client, Origin, Reason, true))
 		return false;
 	else
@@ -236,16 +256,22 @@ Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Rea
 } /* Channel_Part */
 
 
+/**
+ * Kick user from Channel
+ */
 GLOBAL void
-Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
+Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
+	     const char *Reason )
 {
 	CHANNEL *chan;
 
-	assert( Client != NULL );
-	assert( Origin != NULL );
-	assert( Name != NULL );
-	assert( Reason != NULL );
+	assert(Peer != NULL);
+	assert(Target != NULL);
+	assert(Origin != NULL);
+	assert(Name != NULL);
+	assert(Reason != NULL);
 
+	/* Check that channel exists */
 	chan = Channel_Search( Name );
 	if( ! chan )
 	{
@@ -253,27 +279,32 @@ Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
 		return;
 	}
 
-	if( ! Channel_IsMemberOf( chan, Origin ))
-	{
-		IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Name );
-		return;
-	}
+	if (Client_Type(Peer) != CLIENT_SERVER &&
+	    Client_Type(Origin) != CLIENT_SERVICE) {
+		/* Check that user is on the specified channel */
+		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;
+		/* Check if user has operator status */
+		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 );
+	/* Check that the client to be kicked is on the specified channel */
+	if (!Channel_IsMemberOf(chan, Target)) {
+		IRC_WriteStrClient(Origin, ERR_USERNOTINCHANNEL_MSG,
+				   Client_ID(Origin), Client_ID(Target), Name );
 		return;
 	}
 
-	Remove_Client( REMOVE_KICK, chan, Client, Origin, Reason, true);
+	/* Kick Client from channel */
+	Remove_Client( REMOVE_KICK, chan, Target, Origin, Reason, true);
 } /* Channel_Kick */
 
 
@@ -302,7 +333,7 @@ Channel_Count( void )
 {
 	CHANNEL *c;
 	unsigned long count = 0;
-	
+
 	c = My_Channels;
 	while( c )
 	{
@@ -338,9 +369,9 @@ Channel_CountForUser( CLIENT *Client )
 
 	CL2CHAN *cl2chan;
 	int count = 0;
-	
+
 	assert( Client != NULL );
-	
+
 	cl2chan = My_Cl2Chan;
 	while( cl2chan )
 	{
@@ -352,7 +383,6 @@ Channel_CountForUser( CLIENT *Client )
 } /* Channel_CountForUser */
 
 
-
 GLOBAL const char *
 Channel_Name( const CHANNEL *Chan )
 {
@@ -403,8 +433,8 @@ Channel_Next( CHANNEL *Chan )
 GLOBAL CHANNEL *
 Channel_Search( const char *Name )
 {
-	/* Channel-Struktur suchen */
-	
+	/* Search channel structure */
+
 	CHANNEL *c;
 	UINT32 search_hash;
 
@@ -416,7 +446,7 @@ Channel_Search( const char *Name )
 	{
 		if( search_hash == c->hash )
 		{
-			/* lt. Hash-Wert: Treffer! */
+			/* hash hit */
 			if( strcasecmp( Name, c->name ) == 0 ) return c;
 		}
 		c = c->next;
@@ -480,7 +510,11 @@ Channel_IsValidName( const char *Name )
 {
 	assert( Name != NULL );
 
-	if (strchr("+#", Name[0]) == NULL)
+#ifdef STRICT_RFC
+	if (strlen(Name) <= 1)
+		return false;
+#endif
+	if (strchr("#&+", Name[0]) == NULL)
 		return false;
 	if (strlen(Name) >= CHANNEL_NAME_LEN)
 		return false;
@@ -631,7 +665,7 @@ Channel_Topic( CHANNEL *Chan )
 	return ret ? ret : "";
 } /* Channel_Topic */
 
-	
+
 #ifndef STRICT_RFC
 
 GLOBAL unsigned int
@@ -653,7 +687,7 @@ Channel_TopicWho(CHANNEL *Chan)
 
 
 GLOBAL void
-Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, char *Topic)
+Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, const char *Topic)
 {
 	size_t len;
 	assert( Chan != NULL );
@@ -691,7 +725,7 @@ Channel_SetModes( CHANNEL *Chan, char *Modes )
 
 
 GLOBAL void
-Channel_SetKey( CHANNEL *Chan, char *Key )
+Channel_SetKey( CHANNEL *Chan, const char *Key )
 {
 	assert( Chan != NULL );
 	assert( Key != NULL );
@@ -718,6 +752,10 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
 
 	is_member = has_voice = is_op = false;
 
+	/* The server itself always can send messages :-) */
+	if (Client_ThisServer() == From)
+		return true;
+
 	if (Channel_IsMemberOf(Chan, From)) {
 		is_member = true;
 		if (strchr(Channel_UserModes(Chan, From), 'v'))
@@ -746,35 +784,26 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
 
 
 GLOBAL bool
-Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text)
+Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command,
+	      bool SendErrors, const char *Text)
 {
-	if (!Can_Send_To_Channel(Chan, From))
-		return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID(From), Channel_Name(Chan));
-
-	if (Client_Conn(From) > NONE)
-		Conn_UpdateIdle(Client_Conn(From));
-
-	return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
-			"PRIVMSG %s :%s", Channel_Name(Chan), Text);
-}
-
-
-GLOBAL bool
-Channel_Notice(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text)
-{
-	if (!Can_Send_To_Channel(Chan, From))
-		return true; /* no error, see RFC 2812 */
+	if (!Can_Send_To_Channel(Chan, From)) {
+		if (! SendErrors)
+			return CONNECTED;	/* no error, see RFC 2812 */
+		return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
+					  Client_ID(From), Channel_Name(Chan));
+	}
 
 	if (Client_Conn(From) > NONE)
 		Conn_UpdateIdle(Client_Conn(From));
 
 	return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
-			"NOTICE %s :%s", Channel_Name(Chan), Text);
+			"%s %s :%s", Command, Channel_Name(Chan), Text);
 }
 
 
 GLOBAL CHANNEL *
-Channel_Create( char *Name )
+Channel_Create( const char *Name )
 {
 	/* Create new CHANNEL structure and add it to linked list */
 	CHANNEL *c;
@@ -823,7 +852,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
 	assert( Chan != NULL );
 	assert( Client != NULL );
 
-	/* neue CL2CHAN-Struktur anlegen */
+	/* Create new CL2CHAN structure */
 	cl2chan = (CL2CHAN *)malloc( sizeof( CL2CHAN ));
 	if( ! cl2chan )
 	{
@@ -834,7 +863,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
 	cl2chan->client = Client;
 	strcpy( cl2chan->modes, "" );
 
-	/* Verketten */
+	/* concatenate */
 	cl2chan->next = My_Cl2Chan;
 	My_Cl2Chan = cl2chan;
 
@@ -849,12 +878,17 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
 {
 	CL2CHAN *cl2chan, *last_cl2chan;
 	CHANNEL *c;
-	
+
 	assert( Chan != NULL );
 	assert( Client != NULL );
 	assert( Origin != NULL );
 	assert( Reason != NULL );
 
+	/* Do not inform other servers if the channel is local to this server,
+	 * regardless of what the caller requested! */
+	if(InformServer)
+		InformServer = !Channel_IsLocal(Chan);
+
 	last_cl2chan = NULL;
 	cl2chan = My_Cl2Chan;
 	while( cl2chan )
@@ -868,7 +902,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
 	c = cl2chan->channel;
 	assert( c != NULL );
 
-	/* Aus Verkettung loesen und freigeben */
+	/* maintain cl2chan list */
 	if( last_cl2chan ) last_cl2chan->next = cl2chan->next;
 	else My_Cl2Chan = cl2chan->next;
 	free( cl2chan );
@@ -876,14 +910,16 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
 	switch( Type )
 	{
 		case REMOVE_QUIT:
-			/* QUIT: other servers have already been notified, see Client_Destroy();
-			 * so only inform other clients in same channel. */
+			/* 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 */
+			/* User was KICKed: inform other servers (public
+			 * channels) and all users in the channel */
 			if( InformServer )
 				IRC_WriteStrServersPrefix( Client_NextHop( Origin ),
 					Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason);
@@ -914,7 +950,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
 			}
 	}
 
-	/* Wenn Channel nun leer und nicht pre-defined: loeschen */
+	/* When channel is empty and is not pre-defined, delete */
 	if( ! strchr( Channel_Modes( Chan ), 'P' ))
 	{
 		if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
@@ -986,6 +1022,26 @@ Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel )
 }
 
 
+/**
+ * Log a message to the local &SERVER channel, if it exists.
+ */
+GLOBAL void
+Channel_LogServer(char *msg)
+{
+	CHANNEL *sc;
+	CLIENT *c;
+
+	assert(msg != NULL);
+
+	sc = Channel_Search("&SERVER");
+	if (!sc)
+		return;
+
+	c = Client_ThisServer();
+	Channel_Write(sc, c, c, "PRIVMSG", false, msg);
+} /* Channel_LogServer */
+
+
 static CL2CHAN *
 Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
@@ -999,7 +1055,7 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 	CL2CHAN *cl2chan;
 
 	assert( Client != NULL || Channel != NULL );
-	
+
 	cl2chan = Start;
 	while( cl2chan )
 	{
@@ -1014,7 +1070,7 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 static bool
 Delete_Channel( CHANNEL *Chan )
 {
-	/* Channel-Struktur loeschen */
+	/* delete channel structure */
 
 	CHANNEL *chan, *last_chan;
 
@@ -1030,11 +1086,11 @@ Delete_Channel( CHANNEL *Chan )
 
 	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 );
+	array_free(&chan->topic);
+	Lists_Free(&chan->list_bans);
+	Lists_Free(&chan->list_invites);
 
-	/* Neu verketten und freigeben */
+	/* maintain channel list */
 	if( last_chan ) last_chan->next = chan->next;
 	else My_Channels = chan->next;
 	free( chan );
@@ -1042,5 +1098,4 @@ Delete_Channel( CHANNEL *Chan )
 	return true;
 } /* Delete_Channel */
 
-
 /* -eof- */