X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=1c4212c11d0892bd3d6527f7f8e0143553c5e220;hp=4c9dc139d6a35110faf3ed90405e706596b560a4;hb=b8d7dcec7739aab840fc1ccae8e4dfaa8db330a1;hpb=9aa241f0e69acb83586666939331b8438fb5eac0 diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 4c9dc139..bd44f467 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -1,194 +1,176 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001 by Alexander Barton (alex@barton.de) + * 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 comBase 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.c,v 1.3 2001/12/24 01:34:06 alex Exp $ - * - * irc.c: IRC-Befehle - * - * $Log: irc.c,v $ - * Revision 1.3 2001/12/24 01:34:06 alex - * - USER und NICK wird nun in beliebiger Reihenfolge akzeptiert (wg. BitchX) - * - MOTD-Ausgabe begonnen zu implementieren. - * - * Revision 1.2 2001/12/23 21:57:16 alex - * - erste IRC-Befehle zu implementieren begonnen. - * - * Revision 1.1 2001/12/14 08:13:43 alex - * - neues Modul begonnen :-) + * IRC commands */ -#include -#include "global.h" +#include "portab.h" + +static char UNUSED id[] = "$Id: irc.c,v 1.113 2002/12/30 17:15:42 alex Exp $"; -#include +#include "imp.h" #include -#include #include #include +#include "conn-func.h" #include "client.h" +#include "channel.h" +#include "defines.h" +#include "irc-write.h" #include "log.h" #include "messages.h" #include "parse.h" -#include +#include "exp.h" #include "irc.h" -LOCAL BOOLEAN Check_Valid_User( CLIENT *Client ); - -LOCAL VOID Hello_User( CLIENT *Client ); -LOCAL VOID Show_MOTD( CLIENT *Client ); - - -GLOBAL VOID IRC_Init( VOID ) +GLOBAL BOOLEAN +IRC_ERROR( CLIENT *Client, REQUEST *Req ) { -} /* IRC_Init */ + assert( Client != NULL ); + assert( Req != NULL ); + if( Req->argc < 1 ) Log( LOG_NOTICE, "Got ERROR from \"%s\"!", Client_Mask( Client )); + else Log( LOG_NOTICE, "Got ERROR from \"%s\": %s!", Client_Mask( Client ), Req->argv[0] ); -GLOBAL VOID IRC_Exit( VOID ) -{ -} /* IRC_Exit */ + return CONNECTED; +} /* IRC_ERROR */ -GLOBAL VOID IRC_WriteStr_Client( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... ) +GLOBAL BOOLEAN +IRC_KILL( CLIENT *Client, REQUEST *Req ) { - /* Text an Clients, lokal bzw. remote, senden. */ - - CHAR buffer[1000]; - va_list ap; + CLIENT *prefix, *c; + CHAR reason[COMMAND_LEN]; + CONN_ID conn; assert( Client != NULL ); - assert( Format != NULL ); + assert( Req != NULL ); - va_start( ap, Format ); + /* Is the user an IRC operator? */ + if(( Client_Type( Client ) != CLIENT_SERVER ) && ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - if( Client->conn_id != NONE ) - { - /* Lokaler Client */ - vsnprintf( buffer, 1000, Format, ap ); - if( Prefix ) Conn_WriteStr( Client->conn_id, ":%s %s", Prefix->host, buffer ); - else Conn_WriteStr( Client->conn_id, buffer ); - } - else + /* Bad number of parameters? */ + if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + if( Req->prefix ) prefix = Client_Search( Req->prefix ); + else prefix = Client; + if( ! prefix ) { - /* Remote-Client */ - Log( LOG_DEBUG, "not implemented: IRC_WriteStr_Client()" ); + Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", Req->prefix ); + prefix = Client_ThisServer( ); } - va_end( ap ); -} /* IRC_WriteStr_Client */ + Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] ); -GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); - - IRC_WriteStr_Client( Client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Req->command ); - return TRUE; -} /* IRC_PASS */ + /* Build reason string */ + if( Client_Type( Client ) == CLIENT_USER ) snprintf( reason, sizeof( reason ), "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] ); + else strlcpy( reason, Req->argv[1], sizeof( reason )); + /* Inform other servers */ + IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason ); -GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); - - if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_PASS || Client->type == CLIENT_USER ) + /* Do we host such a client? */ + c = Client_Search( Req->argv[0] ); + if( c ) { - /* Neuer Client */ - if( Req->argc == 1 ) + /* Yes, there is such a client -- but is it a valid user? */ + if( Client_Type( c ) == CLIENT_SERVER ) IRC_WriteStrClient( Client, ERR_CANTKILLSERVER_MSG, Client_ID( Client )); + else if( Client_Type( c ) != CLIENT_USER )IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); + else { - if( strlen( Req->argv[0] ) <= CLIENT_NICK_LEN ) - { - /* Client-Nick registrieren */ - strcpy( Client->nick, Req->argv[0] ); - if( Client->type == CLIENT_USER ) Hello_User( Client ); - Client->type = CLIENT_NICK; - } - else IRC_WriteStr_Client( Client, This_Server, ERR_ERRONEUSNICKNAME_MSG, Req->argv[0] ); + /* Kill user NOW! */ + conn = Client_Conn( c ); + Client_Destroy( c, NULL, reason, FALSE ); + if( conn != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, TRUE ); } - else IRC_WriteStr_Client( Client, This_Server, ERR_NEEDMOREPARAMS_MSG ); - } - else if( Client->type == CLIENT_USER ) - { - /* Nick-Aenderung eines Users */ - if( ! Check_Valid_User( Client )) return TRUE; - Log( LOG_DEBUG, "not implemented: IRC_NICK()" ); } - else IRC_WriteStr_Client( Client, This_Server, ERR_ALREADYREGISTRED_MSG ); + else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] ); - return TRUE; -} /* IRC_NICK */ + /* Are we still connected or were we killed, too? */ + if( Client_Search( Req->argv[0] )) return CONNECTED; + else return DISCONNECTED; +} /* IRC_KILL */ -GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_NOTICE( CLIENT *Client, REQUEST *Req ) { + CLIENT *to, *from; + assert( Client != NULL ); assert( Req != NULL ); - if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_NICK ) - { - if( Req->argc == 4 ) - { - strncpy( Client->user, Req->argv[0], CLIENT_USER_LEN ); - Client->user[CLIENT_USER_LEN] = '\0'; - strncpy( Client->name, Req->argv[3], CLIENT_NAME_LEN ); - Client->name[CLIENT_NAME_LEN] = '\0'; - if( Client->type == CLIENT_NICK ) Hello_User( Client ); - Client->type = CLIENT_USER; - } - else IRC_WriteStr_Client( Client, This_Server, ERR_NEEDMOREPARAMS_MSG ); - } - else if( Client->type == CLIENT_USER || Client->type == CLIENT_SERVER || Client->type == CLIENT_SERVICE ) + if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return CONNECTED; + + /* Falsche Anzahl Parameter? */ + if( Req->argc != 2 ) return CONNECTED; + + if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); + else from = Client; + if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + + to = Client_Search( Req->argv[0] ); + if(( to ) && ( Client_Type( to ) == CLIENT_USER )) { - IRC_WriteStr_Client( Client, This_Server, ERR_ALREADYREGISTRED_MSG ); + /* Okay, Ziel ist ein User */ + return IRC_WriteStrClientPrefix( to, from, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] ); } - else IRC_WriteStr_Client( Client, This_Server, ERR_NOTREGISTERED_MSG ); - - return TRUE; -} /* IRC_USER */ + else return CONNECTED; +} /* IRC_NOTICE */ -LOCAL BOOLEAN Check_Valid_User( CLIENT *Client ) +GLOBAL BOOLEAN +IRC_PRIVMSG( CLIENT *Client, REQUEST *Req ) { + CLIENT *cl, *from; + CHANNEL *chan; + assert( Client != NULL ); + assert( Req != NULL ); - if( Client->type != CLIENT_USER ) + /* Falsche Anzahl Parameter? */ + if( Req->argc == 0 ) return IRC_WriteStrClient( Client, ERR_NORECIPIENT_MSG, Client_ID( Client ), Req->command ); + if( Req->argc == 1 ) return IRC_WriteStrClient( Client, ERR_NOTEXTTOSEND_MSG, Client_ID( Client )); + if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); + else from = Client; + if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + + cl = Client_Search( Req->argv[0] ); + if( cl ) { - IRC_WriteStr_Client( Client, This_Server, ERR_NOTREGISTERED_MSG ); - return FALSE; - } - else return TRUE; -} /* Check_Valid_User */ + /* Okay, Ziel ist ein Client. Aber ist es auch ein User? */ + if( Client_Type( cl ) != CLIENT_USER ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] ); + /* Okay, Ziel ist ein User */ + if(( Client_Type( Client ) != CLIENT_SERVER ) && ( strchr( Client_Modes( cl ), 'a' ))) + { + /* Ziel-User ist AWAY: Meldung verschicken */ + if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( cl ), Client_Away( cl ))) return DISCONNECTED; + } -LOCAL VOID Hello_User( CLIENT *Client ) -{ - Log( LOG_INFO, "User \"%s!%s@%s\" (%s) registered.", Client->nick, Client->user, Client->host, Client->name ); - IRC_WriteStr_Client( Client, This_Server, RPL_WELCOME_MSG, Client->nick, Client->nick, Client->user, Client->host ); - IRC_WriteStr_Client( Client, This_Server, RPL_YOURHOST_MSG, Client->nick, This_Server->host ); - IRC_WriteStr_Client( Client, This_Server, RPL_CREATED_MSG, Client->nick ); - IRC_WriteStr_Client( Client, This_Server, RPL_MYINFO_MSG, Client->nick, This_Server->host ); - Show_MOTD( Client ); -} /* Hello_User */ + /* Text senden */ + if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from )); + return IRC_WriteStrClientPrefix( cl, from, "PRIVMSG %s :%s", Client_ID( cl ), Req->argv[1] ); + } + chan = Channel_Search( Req->argv[0] ); + if( chan ) return Channel_Write( chan, from, Client, Req->argv[1] ); -LOCAL VOID Show_MOTD( CLIENT *Client ) -{ - IRC_WriteStr_Client( Client, This_Server, RPL_MOTDSTART_MSG, Client->nick, This_Server->host ); - IRC_WriteStr_Client( Client, This_Server, RPL_MOTD_MSG, Client->nick, "Some cool IRC server welcome message ;-)" ); - IRC_WriteStr_Client( Client, This_Server, RPL_ENDOFMOTD_MSG, Client->nick ); -} /* Show_MOTD */ + return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] ); +} /* IRC_PRIVMSG */ /* -eof- */