X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-mode.c;h=05664949a6a968283b1df72b18cbda7796cf42f2;hp=c47345ae457e693b824b43131408c0036d63d7e9;hb=8841d87365ae75fdc5aea398554a6f08cbb2ce79;hpb=74b120578337b6852d03a62b9913923a2cabe709 diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index c47345ae..05664949 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.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-mode.c,v 1.7 2002/06/02 15:14:22 alex Exp $ - * - * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...) + * IRC commands for mode changes (MODE, AWAY, ...) */ #include "portab.h" +static char UNUSED id[] = "$Id: irc-mode.c,v 1.24 2002/12/18 14:16:21 alex Exp $"; + #include "imp.h" #include +#include +#include #include #include "conn.h" @@ -26,337 +27,533 @@ #include "channel.h" #include "defines.h" #include "irc-write.h" +#include "lists.h" #include "log.h" #include "parse.h" #include "messages.h" +#include "resolve.h" +#include "conf.h" #include "exp.h" #include "irc-mode.h" +LOCAL BOOLEAN Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )); +LOCAL BOOLEAN Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )); + +LOCAL BOOLEAN Add_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )); +LOCAL BOOLEAN Add_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )); + +LOCAL BOOLEAN Del_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )); +LOCAL BOOLEAN Del_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )); + +LOCAL BOOLEAN Send_ListChange PARAMS(( CHAR *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Mask )); + + GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req ) { - CHAR *mode_ptr, the_modes[CLIENT_MODE_LEN], x[2]; - CLIENT *cl, *chan_cl, *prefix; - BOOLEAN set, ok; + CLIENT *cl, *origin; CHANNEL *chan; - + assert( Client != NULL ); assert( Req != NULL ); - cl = chan_cl = prefix = NULL; - chan = NULL; - - /* Valider Client? */ - if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - - /* Keine Parameter? */ + /* No parameters? */ if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - /* Ziel suchen: Client bzw. Channel */ + /* Origin for answers */ + if( Client_Type( Client ) == CLIENT_SERVER ) + { + origin = Client_Search( Req->prefix ); + if( ! origin ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + } + else origin = Client; + + /* Channel or user mode? */ + cl = chan = NULL; if( Client_IsValidNick( Req->argv[0] )) cl = Client_Search( Req->argv[0] ); if( Channel_IsValidName( Req->argv[0] )) chan = Channel_Search( Req->argv[0] ); - /* Kein Ziel gefunden? */ - if(( ! cl ) && ( ! chan )) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); + if( cl ) return Client_Mode( Client, Req, origin, cl ); + if( chan ) return Channel_Mode( Client, Req, origin, chan ); - assert(( cl && chan ) != TRUE ); + /* No target found! */ + return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); +} /* IRC_MODE */ - /* Falsche Anzahl Parameter? */ - if(( cl ) && ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - if(( chan ) && ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - /* Client ermitteln, wenn bei Channel-Modes mit 3 Parametern */ - if(( chan ) && (Req->argc == 3 )) +LOCAL BOOLEAN +Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) +{ + /* Handle client mode requests */ + + CHAR the_modes[COMMAND_LEN], x[2], *mode_ptr; + BOOLEAN ok, set; + INT mode_arg; + + /* Is the client allowed to request or change the modes? */ + if( Client_Type( Client ) == CLIENT_USER ) { - chan_cl = Client_Search( Req->argv[2] ); - if( ! chan_cl ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); + /* Users are only allowed to manipulate their own modes! */ + if( Target != Client ) return IRC_WriteStrClient( Client, ERR_USERSDONTMATCH_MSG, Client_ID( Client )); } - - /* Wenn Anfragender ein User ist: Zugriff erlaubt? */ - if( Client_Type( Client ) == CLIENT_USER ) + + /* Mode request: let's answer it :-) */ + if( Req->argc == 1 ) return IRC_WriteStrClient( Origin, RPL_UMODEIS_MSG, Client_ID( Origin ), Client_Modes( Target )); + + mode_arg = 1; + mode_ptr = Req->argv[mode_arg]; + + /* Initial state: set or unset modes? */ + if( *mode_ptr == '+' ) set = TRUE; + else if( *mode_ptr == '-' ) set = FALSE; + else return IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Origin )); + + /* Prepare reply string */ + if( set ) strcpy( the_modes, "+" ); + else strcpy( the_modes, "-" ); + + x[1] = '\0'; + ok = CONNECTED; + while( mode_ptr ) { - if( cl ) + mode_ptr++; + if( ! *mode_ptr ) { - /* MODE ist nur fuer sich selber zulaessig! */ - if( cl != Client ) return IRC_WriteStrClient( Client, ERR_USERSDONTMATCH_MSG, Client_ID( Client )); + /* Try next argument if there's any */ + mode_arg++; + if( mode_arg < Req->argc ) mode_ptr = Req->argv[mode_arg]; + else break; + } + + switch( *mode_ptr ) + { + case '+': + case '-': + if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set ))) + { + /* Action modifier ("+"/"-") must be changed ... */ + if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) + { + /* Adjust last action modifier in result */ + the_modes[strlen( the_modes ) - 1] = *mode_ptr; + } + else + { + /* Append modifier character to result string */ + x[0] = *mode_ptr; strcat( the_modes, x ); + } + if( *mode_ptr == '+' ) set = TRUE; + else set = FALSE; + } + continue; } - if( chan ) + + /* Validate modes */ + x[0] = '\0'; + switch( *mode_ptr ) { - /* Darf der User die Channel-Modes ermitteln? */ + case 'a': + /* Away */ + if( Client_Type( Client ) == CLIENT_SERVER ) x[0] = 'a'; + else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin )); + break; + case 'i': + /* Invisible */ + x[0] = 'i'; + break; + case 'o': + /* IRC operator (only unsetable!) */ + if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER )) + { + Client_SetOperByMe( Target, FALSE ); + x[0] = 'o'; + } + else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin )); + break; + case 'r': + /* Restricted (only setable) */ + if(( set ) || ( Client_Type( Client ) == CLIENT_SERVER )) x[0] = 'r'; + else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin )); + break; + case 's': + /* Server messages */ + x[0] = 's'; + break; + default: + Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin )); + if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr ); + x[0] = '\0'; + goto client_exit; } - } + if( ! ok ) break; - /* Werden die Modes "nur" erfragt? */ - if(( cl ) && ( Req->argc == 1 )) return IRC_WriteStrClient( Client, RPL_UMODEIS_MSG, Client_ID( Client ), Client_Modes( cl )); - if(( chan ) && ( Req->argc == 1 )) return IRC_WriteStrClient( Client, RPL_CHANNELMODEIS_MSG, Client_ID( Client ), Channel_Name( chan ), Channel_Modes( chan )); + /* Is there a valid mode change? */ + if( ! x[0] ) continue; - mode_ptr = Req->argv[1]; + if( set ) + { + /* Set mode */ + if( Client_ModeAdd( Target, x[0] )) strcat( the_modes, x ); - /* Sollen Modes gesetzt oder geloescht werden? */ - if( cl ) - { - if( *mode_ptr == '+' ) set = TRUE; - else if( *mode_ptr == '-' ) set = FALSE; - else return IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client )); - mode_ptr++; + } + else + { + /* Unset mode */ + if( Client_ModeDel( Target, x[0] )) strcat( the_modes, x ); + } } - else +client_exit: + + /* Are there changed modes? */ + if( the_modes[1] ) { - if( *mode_ptr == '-' ) set = FALSE; - else set = TRUE; - if(( *mode_ptr == '-' ) || ( *mode_ptr == '+' )) mode_ptr++; + /* Remoce needless action modifier characters */ + if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) the_modes[strlen( the_modes ) - 1] = '\0'; + + if( Client_Type( Client ) == CLIENT_SERVER ) + { + /* Forward modes to other servers */ + IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); + } + else + { + /* Send reply to client and inform other servers */ + ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s %s", Client_ID( Target ), the_modes ); + IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); + } + Log( LOG_DEBUG, "User \"%s\": Mode change, now \"%s\".", Client_Mask( Target ), Client_Modes( Target )); } - - /* Prefix fuer Antworten etc. ermitteln */ - if( Client_Type( Client ) == CLIENT_SERVER ) + + return ok; +} /* Client_Mode */ + + +LOCAL BOOLEAN +Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) +{ + /* Handle channel and channel-user modes */ + + CHAR the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr; + BOOLEAN ok, set, modeok, skiponce; + INT mode_arg, arg_arg; + CLIENT *client; + LONG l; + + /* Mode request: let's answer it :-) */ + if( Req->argc == 1 ) return IRC_WriteStrClient( Origin, RPL_CHANNELMODEIS_MSG, Client_ID( Origin ), Channel_Name( Channel ), Channel_Modes( Channel )); + + /* Is the user allowed to change modes? */ + if( Client_Type( Client ) == CLIENT_USER ) { - prefix = Client_Search( Req->prefix ); - if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + if( strchr( Channel_UserModes( Channel, Origin ), 'o' )) modeok = TRUE; + else modeok = FALSE; + if( Conf_OperCanMode ) + { + /* auch IRC-Operatoren duerfen MODE verwenden */ + if( Client_OperByMe( Origin )) modeok = TRUE; + } } - else prefix = Client; + else modeok = TRUE; + + mode_arg = 1; + mode_ptr = Req->argv[mode_arg]; + if( Req->argc > mode_arg + 1 ) arg_arg = mode_arg + 1; + else arg_arg = -1; - /* Reply-String mit Aenderungen vorbereiten */ + /* Initial state: set or unset modes? */ + skiponce = FALSE; + if( *mode_ptr == '-' ) set = FALSE; + else if( *mode_ptr == '+' ) set = TRUE; + else set = skiponce = TRUE; + + /* Prepare reply string */ if( set ) strcpy( the_modes, "+" ); else strcpy( the_modes, "-" ); + strcpy( the_args, " " ); - ok = TRUE; x[1] = '\0'; - while( *mode_ptr ) + ok = CONNECTED; + while( mode_ptr ) { - x[0] = '\0'; - if( Client_Type( Client ) == CLIENT_SERVER ) + if( ! skiponce ) mode_ptr++; + if( ! *mode_ptr ) { - /* Befehl kommt von einem Server, daher - * trauen wir ihm "unbesehen" ... */ - x[0] = *mode_ptr; + /* Try next argument if there's any */ + if( arg_arg > mode_arg ) mode_arg = arg_arg; + else mode_arg++; + if( mode_arg < Req->argc ) mode_ptr = Req->argv[mode_arg]; + else break; + if( Req->argc > mode_arg + 1 ) arg_arg = mode_arg + 1; + else arg_arg = -1; } - else + skiponce = FALSE; + + switch( *mode_ptr ) { - /* Modes validieren */ - if( cl ) - { - /* User-Modes */ - switch( *mode_ptr ) + case '+': + case '-': + if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set ))) { - case 'i': - /* invisible */ - x[0] = 'i'; - break; - case 'o': - /* operator (kann nur geloescht werden) */ - if( ! set ) - { - Client_SetOperByMe( Client, FALSE ); - x[0] = 'o'; - } - else ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client )); - break; - case 'r': - /* restricted (kann nur gesetzt werden) */ - if( set ) x[0] = 'r'; - else ok = IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client )); - break; - case 's': - /* server messages */ - x[0] = 's'; - break; - default: - Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Client )); - ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr ); - x[0] = '\0'; + /* Action modifier ("+"/"-") must be changed ... */ + if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) + { + /* Adjust last action modifier in result */ + the_modes[strlen( the_modes ) - 1] = *mode_ptr; + } + else + { + /* Append modifier character to result string */ + x[0] = *mode_ptr; strcat( the_modes, x ); + } + if( *mode_ptr == '+' ) set = TRUE; + else set = FALSE; } - } - if( chan ) - { - /* Ist der User ein Channel Operator? */ - if( ! strchr( Channel_UserModes( chan, Client ), 'o' )) + continue; + } + + /* Are there arguments left? */ + if( arg_arg >= Req->argc ) arg_arg = -1; + + /* Validate modes */ + x[0] = '\0'; + argadd[0] = '\0'; + client = NULL; + switch( *mode_ptr ) + { + /* Channel modes */ + case 'i': + /* Invite-Only */ + if( modeok ) x[0] = 'i'; + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + break; + case 'm': + /* Moderated */ + if( modeok ) x[0] = 'm'; + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + break; + case 'n': + /* kein Schreiben in den Channel von aussen */ + if( modeok ) x[0] = 'n'; + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + break; + case 't': + /* Topic Lock */ + if( modeok ) x[0] = 't'; + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + break; + case 'P': + /* Persistent channel */ + if( modeok ) + { + if( set && ( ! Client_OperByMe( Client ))) + { + /* Only IRC operators are allowed to set P mode */ + ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin )); + } + else x[0] = 'P'; + } + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + break; + + /* Channel user modes */ + case 'o': + /* Channel operator */ + case 'v': + /* Voice */ + if( arg_arg > mode_arg ) + { + if( modeok ) + { + client = Client_Search( Req->argv[arg_arg] ); + if( client ) x[0] = *mode_ptr; + else ok = IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[arg_arg] ); + } + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + Req->argv[arg_arg][0] = '\0'; + arg_arg++; + } + else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command ); + break; + case 'k': + /* Channel key */ + if( ! set ) { - Log( LOG_DEBUG, "Can't change modes: \"%s\" is not operator on %s!", Client_ID( Client ), Channel_Name( chan )); - ok = IRC_WriteStrClient( Client, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Client ), Channel_Name( chan )); + if( modeok ) x[0] = *mode_ptr; + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); break; } - - /* Channel-Modes oder Channel-User-Modes */ - if( chan_cl ) + if( arg_arg > mode_arg ) { - /* Channel-User-Modes */ - switch( *mode_ptr ) + if( modeok ) { - case 'o': - /* Channel Operator */ - x[0] = 'o'; - break; - case 'v': - /* Voice */ - x[0] = 'v'; - break; - default: - Log( LOG_DEBUG, "Unknown channel-user-mode \"%c%c\" from \"%s\" on \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Client_ID( chan_cl ), Channel_Name( chan )); - ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr ); - x[0] = '\0'; + Channel_ModeDel( Channel, 'k' ); + Channel_SetKey( Channel, Req->argv[arg_arg] ); + strcpy( argadd, Channel_Key( Channel )); + x[0] = *mode_ptr; } + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + Req->argv[arg_arg][0] = '\0'; + arg_arg++; } - else + else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command ); + break; + case 'l': + /* Member limit */ + if( ! set ) { - /* Channel-Modes */ - switch( *mode_ptr ) + if( modeok ) x[0] = *mode_ptr; + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + break; + } + if( arg_arg > mode_arg ) + { + if( modeok ) { - case 'i': - /* Invite-Only */ - x[0] = 'i'; - break; - case 'm': - /* Moderated */ - x[0] = 'm'; - break; - case 'n': - /* kein Schreiben in den Channel von aussen */ - x[0] = 'n'; - break; - case 't': - /* Topic Lock */ - x[0] = 't'; - break; - case 'P': - /* Persistent */ - x[0] = 'P'; - break; - default: - Log( LOG_DEBUG, "Unknown channel-mode \"%c%c\" from \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Channel_Name( chan )); - ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr ); - x[0] = '\0'; + l = atol( Req->argv[arg_arg] ); + if( l > 0 && l < 0xFFFF ) + { + Channel_ModeDel( Channel, 'l' ); + Channel_SetMaxUsers( Channel, l ); + sprintf( argadd, "%ld", l ); + x[0] = *mode_ptr; + } } + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + Req->argv[arg_arg][0] = '\0'; + arg_arg++; } - } + else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command ); + break; + + /* Channel lists */ + case 'I': + /* Invite lists */ + if( arg_arg > mode_arg ) + { + /* modify list */ + if( modeok ) + { + if( set ) Add_Invite( Origin, Client, Channel, Req->argv[arg_arg] ); + else Del_Invite( Origin, Client, Channel, Req->argv[arg_arg] ); + } + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + Req->argv[arg_arg][0] = '\0'; + arg_arg++; + } + else Lists_ShowInvites( Origin, Channel ); + break; + case 'b': + /* Ban lists */ + if( arg_arg > mode_arg ) + { + /* modify list */ + if( modeok ) + { + if( set ) Add_Ban( Origin, Client, Channel, Req->argv[arg_arg] ); + else Del_Ban( Origin, Client, Channel, Req->argv[arg_arg] ); + } + else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + Req->argv[arg_arg][0] = '\0'; + arg_arg++; + } + else Lists_ShowBans( Origin, Channel ); + break; + + default: + Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\" on %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ), Channel_Name( Channel )); + if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr ); + x[0] = '\0'; + goto chan_exit; } if( ! ok ) break; - - mode_ptr++; + + /* Is there a valid mode change? */ if( ! x[0] ) continue; - /* Okay, gueltigen Mode gefunden */ - if( cl ) + if( set ) { - /* Es geht um User-Modes */ - if( set ) + /* Set mode */ + if( client ) { - /* Mode setzen. Wenn der Client ihn noch nicht hatte: merken */ - if( Client_ModeAdd( cl, x[0] )) strcat( the_modes, x ); - + /* Channel-User-Mode */ + if( Channel_UserModeAdd( Channel, client, x[0] )) + { + strcat( the_args, Client_ID( client )); + strcat( the_args, " " ); strcat( the_modes, x ); + Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client )); + } } else { - /* Modes geloescht. Wenn der Client ihn hatte: merken */ - if( Client_ModeDel( cl, x[0] )) strcat( the_modes, x ); - } - - /* "nachbearbeiten" */ - if( x[0] == 'a' ) - { - /* away */ - if( set ) Client_SetAway( cl, DEFAULT_AWAY_MSG ); - else Client_SetAway( cl, NULL ); + /* Channel-Mode */ + if( Channel_ModeAdd( Channel, x[0] )) + { + strcat( the_modes, x ); + Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel )); + } } } - if( chan ) + else { - /* Es geht um Channel-Modes oder Channel-User-Modes */ - if( chan_cl ) + /* Unset mode */ + if( client ) { - /* Channel-User-Modes */ - if( set ) - { - /* Mode setzen. Wenn der Channel ihn noch nicht hatte: merken */ - if( Channel_UserModeAdd( chan, chan_cl, x[0] )) strcat( the_modes, x ); - } - else + /* Channel-User-Mode */ + if( Channel_UserModeDel( Channel, client, x[0] )) { - /* Mode setzen. Wenn der Channel ihn noch nicht hatte: merken */ - if( Channel_UserModeDel( chan, chan_cl, x[0] )) strcat( the_modes, x ); + strcat( the_args, Client_ID( client )); + strcat( the_args, " " ); strcat( the_modes, x ); + Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client )); } } else { /* Channel-Mode */ - if( set ) - { - /* Mode setzen. Wenn der Channel ihn noch nicht hatte: merken */ - if( Channel_ModeAdd( chan, x[0] )) strcat( the_modes, x ); - } - else + if( Channel_ModeDel( Channel, x[0] )) { - /* Mode setzen. Wenn der Channel ihn noch nicht hatte: merken */ - if( Channel_ModeDel( chan, x[0] )) strcat( the_modes, x ); + strcat( the_modes, x ); + Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel )); } } } + + /* Are there additional arguments to add? */ + if( argadd[0] ) + { + if( the_args[strlen( the_args ) - 1] != ' ' ) strcat( the_args, " " ); + strcat( the_args, argadd ); + } } +chan_exit: - /* Wurden Modes geaendert? */ + /* Are there changed modes? */ if( the_modes[1] ) { - if( cl ) + /* Clean up mode string */ + if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) the_modes[strlen( the_modes ) - 1] = '\0'; + + /* Clean up argument string if there are none */ + if( ! the_args[1] ) the_args[0] = '\0'; + + if( Client_Type( Client ) == CLIENT_SERVER ) { - /* Client-Mode */ - if( Client_Type( Client ) == CLIENT_SERVER ) - { - /* Modes an andere Server forwarden */ - IRC_WriteStrServersPrefix( Client, prefix, "MODE %s :%s", Client_ID( cl ), the_modes ); - } - else - { - /* Bestaetigung an Client schicken & andere Server informieren */ - ok = IRC_WriteStrClientPrefix( Client, prefix, "MODE %s %s", Client_ID( cl ), the_modes ); - IRC_WriteStrServersPrefix( Client, prefix, "MODE %s :%s", Client_ID( cl ), the_modes ); - } - Log( LOG_DEBUG, "User \"%s\": Mode change, now \"%s\".", Client_Mask( cl ), Client_Modes( cl )); + /* Forward mode changes to channel users and other servers */ + IRC_WriteStrServersPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args ); + IRC_WriteStrChannelPrefix( Client, Channel, Origin, FALSE, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args ); } - if( chan ) + else { - /* Channel-Modes oder Channel-User-Mode */ - if( chan_cl ) - { - /* Channel-User-Mode */ - if( Client_Type( Client ) == CLIENT_SERVER ) - { - /* Modes an andere Server und Channel-User forwarden */ - IRC_WriteStrServersPrefix( Client, prefix, "MODE %s %s :%s", Channel_Name( chan ), the_modes, Client_ID( chan_cl)); - IRC_WriteStrChannelPrefix( Client, chan, prefix, FALSE, "MODE %s %s %s", Channel_Name( chan ), the_modes, Client_ID( chan_cl)); - } - else - { - /* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */ - ok = IRC_WriteStrClientPrefix( Client, prefix, "MODE %s %s %s", Channel_Name( chan ), the_modes, Client_ID( chan_cl)); - IRC_WriteStrServersPrefix( Client, prefix, "MODE %s %s :%s", Channel_Name( chan ), the_modes, Client_ID( chan_cl)); - IRC_WriteStrChannelPrefix( Client, chan, prefix, FALSE, "MODE %s %s %s", Channel_Name( chan ), the_modes, Client_ID( chan_cl)); - } - Log( LOG_DEBUG, "User \"%s\" on %s: Mode change, now \"%s\".", Client_Mask( chan_cl), Channel_Name( chan ), Channel_UserModes( chan, chan_cl )); - } - else - { - /* Channel-Mode */ - if( Client_Type( Client ) == CLIENT_SERVER ) - { - /* Modes an andere Server und Channel-User forwarden */ - IRC_WriteStrServersPrefix( Client, prefix, "MODE %s :%s", Channel_Name( chan ), the_modes ); - IRC_WriteStrChannelPrefix( Client, chan, prefix, FALSE, "MODE %s %s", Channel_Name( chan ), the_modes ); - } - else - { - /* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */ - ok = IRC_WriteStrClientPrefix( Client, prefix, "MODE %s %s", Channel_Name( chan ), the_modes ); - IRC_WriteStrServersPrefix( Client, prefix, "MODE %s :%s", Channel_Name( chan ), the_modes ); - IRC_WriteStrChannelPrefix( Client, chan, prefix, FALSE, "MODE %s %s", Channel_Name( chan ), the_modes ); - } - Log( LOG_DEBUG, "Channel \"%s\": Mode change, now \"%s\".", Channel_Name( chan ), Channel_Modes( chan )); - } + /* Send reply to client and inform other servers and channel users */ + ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args ); + IRC_WriteStrServersPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args ); + IRC_WriteStrChannelPrefix( Client, Channel, Origin, FALSE, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args ); } } - return ok; -} /* IRC_MODE */ + return CONNECTED; +} /* Channel_Mode */ GLOBAL BOOLEAN @@ -365,8 +562,6 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) 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 ); @@ -387,4 +582,90 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) } /* IRC_AWAY */ +LOCAL BOOLEAN +Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ) +{ + CHAR *mask; + + assert( Client != NULL ); + assert( Channel != NULL ); + assert( Pattern != NULL ); + + mask = Lists_MakeMask( Pattern ); + + if( ! Lists_AddInvited( Prefix, mask, Channel, FALSE )) return CONNECTED; + return Send_ListChange( "+I", Prefix, Client, Channel, mask ); +} /* Add_Invite */ + + +LOCAL BOOLEAN +Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ) +{ + CHAR *mask; + + assert( Client != NULL ); + assert( Channel != NULL ); + assert( Pattern != NULL ); + + mask = Lists_MakeMask( Pattern ); + + if( ! Lists_AddBanned( Prefix, mask, Channel )) return CONNECTED; + return Send_ListChange( "+b", Prefix, Client, Channel, mask ); +} /* Add_Ban */ + + +LOCAL BOOLEAN +Del_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ) +{ + CHAR *mask; + + assert( Client != NULL ); + assert( Channel != NULL ); + assert( Pattern != NULL ); + + mask = Lists_MakeMask( Pattern ); + Lists_DelInvited( mask, Channel ); + return Send_ListChange( "-I", Prefix, Client, Channel, mask ); +} /* Del_Invite */ + + +LOCAL BOOLEAN +Del_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ) +{ + CHAR *mask; + + assert( Client != NULL ); + assert( Channel != NULL ); + assert( Pattern != NULL ); + + mask = Lists_MakeMask( Pattern ); + Lists_DelBanned( mask, Channel ); + return Send_ListChange( "-b", Prefix, Client, Channel, mask ); +} /* Del_Ban */ + + +LOCAL BOOLEAN +Send_ListChange( CHAR *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Mask ) +{ + /* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */ + + BOOLEAN ok; + + if( Client_Type( Client ) == CLIENT_USER ) + { + /* Bestaetigung an Client */ + ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); + } + else ok = TRUE; + + /* an andere Server */ + IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); + + /* und lokale User im Channel */ + IRC_WriteStrChannelPrefix( Client, Channel, Prefix, FALSE, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); + + return ok; +} /* Send_ListChange */ + + /* -eof- */