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=b17fc547d603acdcef61cadc8079cd1e8c90df57;hp=4d94b31a3f77297309e960fd692742a51fcea464;hb=25ca2b3cc5b5d92f43591bdb2f0076101fa2b79d;hpb=7e1b3b9157b9946d18d252b908fb28a85a0fa0e7 diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 4d94b31a..b17fc547 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.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-mode.c,v 1.10 2002/09/02 14:59:18 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.19 2002/12/14 13:36:19 alex Exp $"; + #include "imp.h" #include #include @@ -26,6 +25,7 @@ #include "channel.h" #include "defines.h" #include "irc-write.h" +#include "lists.h" #include "log.h" #include "parse.h" #include "messages.h" @@ -36,6 +36,15 @@ #include "irc-mode.h" +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 ) { @@ -50,9 +59,6 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) 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? */ if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -69,6 +75,63 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) 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 ); + /* Prefix fuer Antworten etc. ermitteln */ + if( Client_Type( Client ) == CLIENT_SERVER ) + { + prefix = Client_Search( Req->prefix ); + if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + } + else prefix = Client; + + if(( chan ) && (( Req->argc == 2 ) || ( Req->argc == 3 ))) + { + /* pruefen, ob "Listen-Operation": Invite, Ban */ + if(( Req->argv[1][0] == '-' ) || ( Req->argv[1][0] == '+' )) mode_ptr = &Req->argv[1][1]; + else mode_ptr = &Req->argv[1][0]; + + if( Req->argc == 2 ) + { + /* Liste anzeigen */ + if( *mode_ptr == 'I' ) return Lists_ShowInvites( prefix, chan ); + if( *mode_ptr == 'b' ) return Lists_ShowBans( prefix, chan ); + } + else + { + /* Listen veraendern */ + + if( Client_Type( Client ) == CLIENT_USER ) + { + /* Ist der User Channel-Operator? */ + modeok = FALSE; + if( strchr( Channel_UserModes( chan, Client ), 'o' )) modeok = TRUE; + if( Conf_OperCanMode ) + { + /* auch IRC-Operatoren duerfen MODE verwenden */ + if( Client_OperByMe( Client )) modeok = TRUE; + } + + if( ! modeok ) + { + Log( LOG_DEBUG, "Can't change modes: \"%s\" is not operator on %s!", Client_ID( Client ), Channel_Name( chan )); + return IRC_WriteStrClient( Client, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Client ), Channel_Name( chan )); + } + } + + if( Req->argv[1][0] == '+' ) + { + /* Listen-Eintrag hinzufuegen */ + if( *mode_ptr == 'I' ) return Add_Invite( prefix, Client, chan, Req->argv[2] ); + if( *mode_ptr == 'b' ) return Add_Ban( prefix, Client, chan, Req->argv[2] ); + } + else if( Req->argv[1][0] == '-' ) + { + /* Listen-Eintrag loeschen */ + if( *mode_ptr == 'I' ) return Del_Invite( prefix, Client, chan, Req->argv[2] ); + if( *mode_ptr == 'b' ) return Del_Ban( prefix, Client, chan, Req->argv[2] ); + } + } + } + /* Client ermitteln, wenn bei Channel-Modes mit 3 Parametern */ if(( chan ) && (Req->argc == 3 )) { @@ -110,14 +173,6 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) else set = TRUE; if(( *mode_ptr == '-' ) || ( *mode_ptr == '+' )) mode_ptr++; } - - /* Prefix fuer Antworten etc. ermitteln */ - if( Client_Type( Client ) == CLIENT_SERVER ) - { - prefix = Client_Search( Req->prefix ); - if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - } - else prefix = Client; /* Reply-String mit Aenderungen vorbereiten */ if( set ) strcpy( the_modes, "+" ); @@ -153,7 +208,7 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) Client_SetOperByMe( Client, FALSE ); x[0] = 'o'; } - else ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client )); + else ok = IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); break; case 'r': /* restricted (kann nur gesetzt werden) */ @@ -230,8 +285,13 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) x[0] = 't'; break; case 'P': - /* Persistent */ - x[0] = 'P'; + /* Persistent channel */ + if( set && ( ! Client_OperByMe( Client ))) + { + /* there are too many persistent channels in the network! */ + ok = IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); + } + else 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 )); @@ -375,8 +435,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 ); @@ -397,4 +455,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- */