X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fchannel.c;h=d774e576af95882ae134c9b2341a205752709dc9;hb=3913de3cffaa4a3641075d4b4df4aea388bc3717;hp=35922c2b13838bd3bf20fa25192b8b9628667dde;hpb=cb0d594e6184694f8563f1e3116e3aac34606a86;p=ngircd-alex.git diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 35922c2b..d774e576 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 #include @@ -89,18 +87,18 @@ 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? */ + /* Check for Name configuration */ if( ! Conf_Channel[i].name[0] ) continue; - /* Gueltiger Channel-Name? */ + /* Check for invalid 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 ); @@ -108,7 +106,7 @@ Channel_InitPredefined( void ) continue; } - /* Gibt es den Channel bereits? */ + /* Check if the channel name is already in use */ chan = Channel_Search( Conf_Channel[i].name ); if( chan ) { @@ -149,7 +147,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 +157,7 @@ Channel_Exit( void ) c = c_next; } - /* Channel-Zuordnungstabelle freigeben */ + /* Free Channel allocation table */ cl2chan = My_Cl2Chan; while( c ) { @@ -170,61 +168,92 @@ 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 */ +/** + * 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(). + */ GLOBAL bool -Channel_Part( CLIENT *Client, CLIENT *Origin, const char *Name, const char *Reason ) +Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Reason) { CHANNEL *chan; - assert( Client != NULL ); - assert( Name != NULL ); - assert( Reason != NULL ); + assert(Client != NULL); + assert(Name != NULL); + assert(Reason != NULL); - chan = Channel_Search( Name ); - if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client ))) - { - IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name ); + /* 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; } - /* User aus Channel entfernen */ - if( ! Remove_Client( REMOVE_PART, chan, Client, Origin, Reason, true)) return false; - else return true; + /* Part client from channel */ + if (!Remove_Client(REMOVE_PART, chan, Client, Origin, Reason, true)) + return false; + else + return true; } /* Channel_Part */ +/* Kick user from Channel */ GLOBAL void -Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason ) +Channel_Kick( CLIENT *Client, CLIENT *Origin, const char *Name, const char *Reason ) { CHANNEL *chan; @@ -233,6 +262,7 @@ Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason ) assert( Name != NULL ); assert( Reason != NULL ); + /* Check that channel exists */ chan = Channel_Search( Name ); if( ! chan ) { @@ -240,26 +270,28 @@ Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason ) return; } + /* 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? */ + /* 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? */ + /* Check that the client to be kicked is on the specified channel */ if( ! Channel_IsMemberOf( chan, Client )) { IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( Client ), Name ); return; } + /* Kick Client from channel */ Remove_Client( REMOVE_KICK, chan, Client, Origin, Reason, true); } /* Channel_Kick */ @@ -289,7 +321,7 @@ Channel_Count( void ) { CHANNEL *c; unsigned long count = 0; - + c = My_Channels; while( c ) { @@ -325,9 +357,9 @@ Channel_CountForUser( CLIENT *Client ) CL2CHAN *cl2chan; int count = 0; - + assert( Client != NULL ); - + cl2chan = My_Cl2Chan; while( cl2chan ) { @@ -339,7 +371,6 @@ Channel_CountForUser( CLIENT *Client ) } /* Channel_CountForUser */ - GLOBAL const char * Channel_Name( const CHANNEL *Chan ) { @@ -390,8 +421,8 @@ Channel_Next( CHANNEL *Chan ) GLOBAL CHANNEL * Channel_Search( const char *Name ) { - /* Channel-Struktur suchen */ - + /* Search channel structure */ + CHANNEL *c; UINT32 search_hash; @@ -403,7 +434,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; @@ -467,7 +498,14 @@ Channel_IsValidName( const char *Name ) { assert( Name != NULL ); - if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false; +#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; return Name[strcspn(Name, " ,:\007")] == 0; } /* Channel_IsValidName */ @@ -615,7 +653,7 @@ Channel_Topic( CHANNEL *Chan ) return ret ? ret : ""; } /* Channel_Topic */ - + #ifndef STRICT_RFC GLOBAL unsigned int @@ -730,30 +768,21 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From) GLOBAL bool -Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, 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) +Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, + bool SendErrors, 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); } @@ -807,7 +836,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 ) { @@ -818,7 +847,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client ) cl2chan->client = Client; strcpy( cl2chan->modes, "" ); - /* Verketten */ + /* concatenate */ cl2chan->next = My_Cl2Chan; My_Cl2Chan = cl2chan; @@ -833,7 +862,7 @@ 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 ); @@ -852,7 +881,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 ); @@ -879,7 +908,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch 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.", + LogDebug("User \"%s\" has been kicked off \"%s\" by \"%s\": %s.", Client_Mask( Client ), c->name, Client_ID(Origin), Reason); break; default: /* PART */ @@ -898,7 +927,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 ); @@ -983,7 +1012,7 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel ) CL2CHAN *cl2chan; assert( Client != NULL || Channel != NULL ); - + cl2chan = Start; while( cl2chan ) { @@ -998,7 +1027,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; @@ -1014,11 +1043,11 @@ Delete_Channel( CHANNEL *Chan ) Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name ); - /* Invite- und Ban-Lists aufraeumen */ + /* free invite and ban lists */ 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 );