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=f60f9be410ddf8ea8a3520a1ce1a31ed3d02abdd;hp=5700f2e3d47bd8ed29c57a4970aea55f6ea07ab0;hb=0b91df05e0b85980292956973b339ecce31e28ed;hpb=a1ded68a4938f55e9a44ba5f048aebc786e463ef diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 5700f2e3..f60f9be4 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -2,23 +2,24 @@ * 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.14 2002/09/08 00:50:25 alex Exp $ - * - * irc-channel.c: IRC-Channel-Befehle + * IRC channel commands */ #include "portab.h" +static char UNUSED id[] = "$Id: irc-channel.c,v 1.25 2003/01/08 22:04:05 alex Exp $"; + #include "imp.h" #include +#include +#include #include #include "defines.h" @@ -30,8 +31,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 +43,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 +51,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 +89,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 +120,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 +181,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 +226,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 +262,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 ); @@ -275,17 +308,34 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) { CHAR *pattern; CHANNEL *chan; + CLIENT *from, *target; assert( Client != NULL ); assert( Req != NULL ); - if( Client_Type( Client ) != CLIENT_USER ) 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 ); + 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 = "*"; + + /* 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 ); + + if( Req->argc == 2 ) + { + /* an anderen Server forwarden */ + 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_ThisServer( )) + { + /* Ok, anderer Server ist das Ziel: forwarden */ + return IRC_WriteStrClientPrefix( target, from, "LIST %s :%s", from, Req->argv[1] ); + } + } while( pattern ) { @@ -297,7 +347,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) if( Match( pattern, Channel_Name( chan ))) { /* Treffer! */ - if( ! IRC_WriteStrClient( Client, RPL_LIST_MSG, Client_ID( Client), Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED; + if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED; } chan = Channel_Next( chan ); } @@ -307,30 +357,34 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) else pattern = NULL; } - return IRC_WriteStrClient( Client, RPL_LISTEND_MSG, Client_ID( Client )); + return IRC_WriteStrClient( from, RPL_LISTEND_MSG, from ); } /* IRC_LIST */ GLOBAL BOOLEAN IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) { + CHAR modes_add[COMMAND_LEN], l[16], *ptr; CLIENT *from; CHANNEL *chan; - CHAR *ptr; + INT arg_topic; assert( Client != NULL ); assert( Req != NULL ); - if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); + /* Bad number of parameters? */ + if(( Req->argc < 2 ) || ( Req->argc == 4 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - /* Falsche Anzahl Parameter? */ - if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Compatibility kludge */ + if( Req->argc == 5 ) arg_topic = 4; + else if( Req->argc == 3 ) arg_topic = 2; + else arg_topic = -1; - /* From-Server suchen */ + /* Search origin */ from = Client_Search( Req->prefix ); if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - /* Channel suchen bzw. erzeugen */ + /* Search or create channel */ chan = Channel_Search( Req->argv[0] ); if( ! chan ) chan = Channel_Create( Req->argv[0] ); if( ! chan ) return CONNECTED; @@ -340,27 +394,61 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) ptr = Channel_Modes( chan ); if( ! *ptr ) { - /* OK, es sind noch keine Modes gesetzt */ + /* OK, this channel doesn't have modes jet, set the received ones: */ Channel_SetModes( chan, &Req->argv[1][1] ); - IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], &Req->argv[1][1] ); + + if( Req->argc == 5 ) + { + if( strchr( Channel_Modes( chan ), 'k' )) Channel_SetKey( chan, Req->argv[2] ); + if( strchr( Channel_Modes( chan ), 'l' )) Channel_SetMaxUsers( chan, atol( Req->argv[3] )); + } + else + { + /* Delete modes which we never want to inherit */ + Channel_ModeDel( chan, 'l' ); + Channel_ModeDel( chan, 'k' ); + } + + strcpy( modes_add, "" ); + ptr = Channel_Modes( chan ); + while( *ptr ) + { + if( *ptr == 'l' ) + { + snprintf( l, sizeof( l ), " %ld", Channel_MaxUsers( chan )); + strlcat( modes_add, l, sizeof( modes_add )); + } + if( *ptr == 'k' ) + { + strlcat( modes_add, " ", sizeof( modes_add )); + strlcat( modes_add, Channel_Key( chan ), sizeof( modes_add )); + } + ptr++; + } + + /* Inform members of this channel */ + IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add ); } } - else Log( LOG_WARNING, "CHANNELINFO: invalid MODE format ignored!" ); + else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" ); - if( Req->argc == 3 ) + if( arg_topic > 0 ) { - /* Es wurde auch ein Topic mit uebermittelt */ + /* We got a topic */ ptr = Channel_Topic( chan ); - if( ! *ptr ) + if(( ! *ptr ) && ( Req->argv[arg_topic][0] )) { - /* OK, es ist bisher kein Topic gesetzt */ - Channel_SetTopic( chan, Req->argv[2] ); - IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[2] ); + /* 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 )); } } - /* an andere Server forwarden */ - IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] ); + /* Forward CHANINFO to other serevrs */ + if( Req->argc == 5 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2], Req->argv[3], Req->argv[4] ); + else if( Req->argc == 3 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] ); + else IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s", Req->argv[0], Req->argv[1] ); + return CONNECTED; } /* IRC_CHANINFO */