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=e5b912b4eb62110bb35bab850db731eda9f62f17;hp=aa41b7de4af527bd3bd774b122867a29c7b00c3c;hb=ae6a7e7c0be06a19d8a46bc4a90b076879db814d;hpb=005391ca5bf5f8a989cf4934fe53eb3bb18a1dd1 diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index aa41b7de..e5b912b4 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -2,21 +2,20 @@ * ngIRCd -- The Next Generation IRC Daemon * Copyright (c)2001,2002 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: irc-channel.c,v 1.15 2002/09/16 09:16:17 alex Exp $ - * - * irc-channel.c: IRC-Channel-Befehle + * IRC channel commands */ #include "portab.h" +static char UNUSED id[] = "$Id: irc-channel.c,v 1.23 2003/01/01 13:29:40 alex Exp $"; + #include "imp.h" #include #include @@ -30,8 +29,10 @@ #include "match.h" #include "messages.h" #include "parse.h" -#include "irc.h" +#include "irc-info.h" #include "irc-write.h" +#include "resolve.h" +#include "conf.h" #include "exp.h" #include "irc-channel.h" @@ -40,7 +41,7 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req ) { - CHAR *channame, *flags, *topic, modes[8]; + CHAR *channame, *key, *flags, *topic, modes[8]; BOOLEAN is_new_chan, is_invited, is_banned; CLIENT *target; CHANNEL *chan; @@ -48,16 +49,18 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - - /* Falsche Anzahl Parameter? */ - if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Bad number of arguments? */ + if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - /* Wer ist der Absender? */ + /* 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 ); + /* Are channel keys given? */ + if( Req->argc > 1 ) key = Req->argv[1]; + else key = NULL; + /* Channel-Namen durchgehen */ chan = NULL; channame = strtok( Req->argv[0], "," ); @@ -84,6 +87,16 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* Lokaler 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; + } + } + /* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */ if( is_new_chan ) { @@ -105,18 +118,40 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* Client ist gebanned (und nicht invited): */ IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame ); - /* naechsten Namen ermitteln */ + /* Try next name, if any */ channame = strtok( NULL, "," ); continue; } /* Ist der Channel "invite-only"? */ - if(( strchr( Channel_Modes( chan ), 'i' ) != NULL ) && ( is_invited == FALSE )) + 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 ); - /* naechsten Namen ermitteln */ + /* 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; } @@ -144,7 +179,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) if(( strchr( Channel_Modes( chan ), 'P' )) && ( strchr( Client_Modes( target ), 'o' ))) Channel_UserModeAdd( chan, target, 'o' ); /* Muessen Modes an andere Server gemeldet werden? */ - strcpy( &modes[1], Channel_UserModes( chan, target )); + strlcpy( &modes[1], Channel_UserModes( chan, target ), sizeof( modes ) - 1 ); if( modes[1] ) modes[0] = 0x7; else modes[0] = '\0'; @@ -189,8 +224,6 @@ IRC_PART( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -227,8 +260,6 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -280,8 +311,6 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -297,7 +326,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) { /* an anderen Server forwarden */ target = Client_Search( Req->argv[1] ); - if( ! target ) 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( )) { @@ -340,8 +369,6 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Falsche Anzahl Parameter? */ if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );