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=7d7fe45a944b0742f76e11c47b50923d2adb7382;hp=d817bf3c3957b6f6410afc412b08e24de8b6dbd9;hb=296ddebed11c0ded9d5ccc0257485a0ffae9265d;hpb=c2f60abe55b5a8d320a27df0ce41790fa1141081 diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index d817bf3c..7d7fe45a 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: irc-mode.c,v 1.6 2002/05/27 13:09:27 alex Exp $ + * $Id: irc-mode.c,v 1.12 2002/09/08 01:16:58 alex Exp $ * * irc-mode.c: IRC-Befehle zur Mode-Aenderung (MODE, AWAY, ...) */ @@ -26,20 +26,32 @@ #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 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; + BOOLEAN set, ok, modeok; CHANNEL *chan; assert( Client != NULL ); @@ -67,6 +79,43 @@ 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 + { + 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 )) { @@ -108,14 +157,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, "+" ); @@ -171,7 +212,15 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) if( chan ) { /* Ist der User ein Channel Operator? */ - if( ! strchr( Channel_UserModes( chan, Client ), 'o' )) + 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 )); ok = IRC_WriteStrClient( Client, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Client ), Channel_Name( chan )); @@ -203,10 +252,6 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) /* Channel-Modes */ switch( *mode_ptr ) { - case 'a': - /* Anonymous */ - x[0] = 'a'; - break; case 'i': /* Invite-Only */ x[0] = 'i'; @@ -219,18 +264,6 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) /* kein Schreiben in den Channel von aussen */ x[0] = 'n'; break; - case 'p': - /* Private */ - x[0] = 'p'; - break; - case 'q': - /* Quiet */ - x[0] = 'q'; - break; - case 's': - /* Secret */ - x[0] = 's'; - break; case 't': /* Topic Lock */ x[0] = 't'; @@ -403,4 +436,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( 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( 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- */