X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=dfa0e94d35822b89fe830ec5a07cafb868f2b81a;hp=2ede2e69d86726b2186eb4982c8bf2eb64e3992f;hb=b99af4fa47ed531c4410018db54734604fd286ab;hpb=574ae82ca411afb56bb1688ce3c17f254f57522f diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 2ede2e69..dfa0e94d 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -1,316 +1,166 @@ /* * 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. + * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: irc.c,v 1.10 2001/12/26 22:48:53 alex Exp $ + * $Id: irc.c,v 1.105 2002/12/06 17:02:39 alex Exp $ * * irc.c: IRC-Befehle - * - * $Log: irc.c,v $ - * Revision 1.10 2001/12/26 22:48:53 alex - * - MOTD-Datei ist nun konfigurierbar und wird gelesen. - * - * Revision 1.9 2001/12/26 14:45:37 alex - * - "Code Cleanups". - * - * Revision 1.8 2001/12/26 03:21:46 alex - * - PING/PONG-Befehle implementiert, - * - Meldungen ueberarbeitet: enthalten nun (fast) immer den Nick. - * - * Revision 1.7 2001/12/25 23:25:18 alex - * - und nochmal Aenderungen am Logging ;-) - * - * Revision 1.6 2001/12/25 23:13:33 alex - * - Debug-Meldungen angepasst. - * - * Revision 1.5 2001/12/25 22:02:42 alex - * - neuer IRC-Befehl "/QUIT". Verbessertes Logging & Debug-Ausgaben. - * - * Revision 1.4 2001/12/25 19:19:30 alex - * - bessere Fehler-Abfragen, diverse Bugfixes. - * - Nicks werden nur einmal vergeben :-) - * - /MOTD wird unterstuetzt. - * - * 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 :-) */ -#include -#include "global.h" +#include "portab.h" -#include +#include "imp.h" #include -#include -#include -#include #include +#include "conn.h" #include "client.h" -#include "conf.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" -#define CONNECTED TRUE -#define DISCONNECTED FALSE - - -LOCAL BOOLEAN Check_Valid_User( CLIENT *Client ); - -LOCAL BOOLEAN Hello_User( CLIENT *Client ); -LOCAL BOOLEAN Show_MOTD( CLIENT *Client ); - - -GLOBAL VOID IRC_Init( VOID ) -{ -} /* IRC_Init */ - - -GLOBAL VOID IRC_Exit( VOID ) +GLOBAL BOOLEAN +IRC_ERROR( CLIENT *Client, REQUEST *Req ) { -} /* IRC_Exit */ - - -GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... ) -{ - /* Text an Clients, lokal bzw. remote, senden. */ - - CHAR buffer[1000]; - BOOLEAN ok = CONNECTED; - va_list ap; - assert( Client != NULL ); - assert( Format != NULL ); - - va_start( ap, Format ); + assert( Req != NULL ); - if( Client->conn_id != NONE ) - { - /* Lokaler Client */ - vsnprintf( buffer, 1000, Format, ap ); - if( Prefix ) ok = Conn_WriteStr( Client->conn_id, ":%s %s", Prefix->host, buffer ); - else ok = Conn_WriteStr( Client->conn_id, buffer ); - } - else - { - /* Remote-Client */ - Log( LOG_EMERG, "not implemented: IRC_WriteStrClient()" ); - } + 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] ); - va_end( ap ); - return ok; -} /* IRC_WriteStrClient */ + return CONNECTED; +} /* IRC_ERROR */ -GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_KILL( CLIENT *Client, REQUEST *Req ) { - assert( Client != NULL ); - assert( Req != NULL ); - - if( Client->type == CLIENT_UNKNOWN ) - { - Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client->conn_id ); - return IRC_WriteStrClient( Client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Client_Name( Client ), Req->command ); - } - else return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Name( Client )); -} /* IRC_PASS */ - + CLIENT *prefix, *c; + CHAR reason[COMMAND_LEN]; -GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) -{ assert( Client != NULL ); assert( Req != NULL ); - if( Client->type != CLIENT_SERVER && Client->type != CLIENT_SERVICE ) - { - /* Falsche Anzahl Parameter? */ - if( Req->argc != 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command ); - - /* pruefen, ob Nick bereits vergeben */ - if( ! Client_CheckNick( Client, Req->argv[0] )) return CONNECTED; + /* 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 )); - /* Client-Nick registrieren */ - strcpy( Client->nick, Req->argv[0] ); - - if( Client->type != CLIENT_USER ) - { - /* Neuer Client */ - Log( LOG_DEBUG, "Connection %d: got NICK command ...", Client->conn_id ); - if( Client->type == CLIENT_GOTUSER ) return Hello_User( Client ); - else Client->type = CLIENT_GOTNICK; - } - return CONNECTED; - } - else return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Name( Client )); -} /* IRC_NICK */ - - -GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); + /* Falsche Anzahl Parameter? */ + if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTPASS ) - { - /* Falsche Anzahl Parameter? */ - if( Req->argc != 4 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command ); - - 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'; - - Log( LOG_DEBUG, "Connection %d: got USER command ...", Client->conn_id ); - if( Client->type == CLIENT_GOTNICK ) return Hello_User( Client ); - else Client->type = CLIENT_GOTUSER; - return CONNECTED; - } - else if( Client->type == CLIENT_USER || Client->type == CLIENT_SERVER || Client->type == CLIENT_SERVICE ) + if( Req->prefix ) prefix = Client_Search( Req->prefix ); + else prefix = Client; + if( ! prefix ) { - return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Name( Client )); + Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", Req->prefix ); + prefix = Client_ThisServer( ); } - else return IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Name( Client )); -} /* IRC_USER */ + 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_QUIT( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); + /* build reason string */ + if( Client_Type( Client ) == CLIENT_USER ) sprintf( reason, "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] ); + else strcpy( reason, Req->argv[1] ); - if( Client->type != CLIENT_SERVER && Client->type != CLIENT_SERVICE ) - { - /* Falsche Anzahl Parameter? */ - if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command ); + /* andere Server benachrichtigen */ + IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason ); - Conn_Close( Client->conn_id, "Client wants to quit." ); - return DISCONNECTED; + /* haben wir selber einen solchen Client? */ + c = Client_Search( Req->argv[0] ); + if( c ) + { + /* Ja, wir haben einen solchen Client */ + if( Client_Conn( c ) != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, TRUE ); + else Client_Destroy( c, NULL, reason, TRUE ); } - else return IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Name( Client )); -} /* IRC_QUIT */ - - -GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); - - return IRC_WriteStrClient( Client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Client_Name( Client ), Req->command ); -} /* IRC_PING */ - - -GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); - - if( ! Check_Valid_User( Client )) return CONNECTED; - - /* Falsche Anzahl Parameter? */ - if( Req->argc < 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NOORIGIN_MSG, Client_Name( Client )); - if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command ); + else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] ); - /* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket - * aktualisiert, daher muss das hier nicht mehr gemacht werden. */ - - Log( LOG_DEBUG, "Connection %d: received PONG.", Client->conn_id ); return CONNECTED; -} /* IRC_PONG */ +} /* IRC_KILL */ -GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_NOTICE( CLIENT *Client, REQUEST *Req ) { + CLIENT *to, *from; + assert( Client != NULL ); assert( Req != NULL ); - if( ! Check_Valid_User( Client )) return CONNECTED; + if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return CONNECTED; /* Falsche Anzahl Parameter? */ - if( Req->argc != 0 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command ); - - return Show_MOTD( Client ); -} /* IRC_MOTD */ + 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 ); -LOCAL BOOLEAN Check_Valid_User( CLIENT *Client ) -{ - assert( Client != NULL ); - - if( Client->type != CLIENT_USER ) + to = Client_Search( Req->argv[0] ); + if(( to ) && ( Client_Type( to ) == CLIENT_USER )) { - IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Name( Client )); - return FALSE; + /* Okay, Ziel ist ein User */ + return IRC_WriteStrClientPrefix( to, from, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] ); } - else return TRUE; -} /* Check_Valid_User */ + else return CONNECTED; +} /* IRC_NOTICE */ -LOCAL BOOLEAN Hello_User( CLIENT *Client ) +GLOBAL BOOLEAN +IRC_PRIVMSG( CLIENT *Client, REQUEST *Req ) { - assert( Client != NULL ); - assert( Client->nick[0] ); + CLIENT *cl, *from; + CHANNEL *chan; - Log( LOG_NOTICE, "User \"%s!%s@%s\" (%s) registered.", Client->nick, Client->user, Client->host, Client->name ); - - IRC_WriteStrClient( Client, This_Server, RPL_WELCOME_MSG, Client->nick, Client->nick, Client->user, Client->host ); - IRC_WriteStrClient( Client, This_Server, RPL_YOURHOST_MSG, Client->nick, This_Server->host ); - IRC_WriteStrClient( Client, This_Server, RPL_CREATED_MSG, Client->nick ); - IRC_WriteStrClient( Client, This_Server, RPL_MYINFO_MSG, Client->nick, This_Server->host ); + assert( Client != NULL ); + assert( Req != NULL ); - 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 ); - return Show_MOTD( Client ); -} /* Hello_User */ + 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 ) + { + /* 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] ); -LOCAL BOOLEAN Show_MOTD( CLIENT *Client ) -{ - BOOLEAN ok; - CHAR line[127]; - FILE *fd; - - assert( Client != NULL ); - assert( Client->nick[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; + } - fd = fopen( Conf_MotdFile, "r" ); - if( ! fd ) - { - Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno )); - return IRC_WriteStrClient( Client, This_Server, ERR_NOMOTD_MSG, Client->nick ); + /* 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] ); } - - IRC_WriteStrClient( Client, This_Server, RPL_MOTDSTART_MSG, Client->nick, This_Server->host ); - while( TRUE ) - { - if( ! fgets( line, 126, fd )) break; - if( line[strlen( line ) - 1] == '\n' ) line[strlen( line ) - 1] = '\0'; - IRC_WriteStrClient( Client, This_Server, RPL_MOTD_MSG, Client->nick, line ); - } - ok = IRC_WriteStrClient( Client, This_Server, RPL_ENDOFMOTD_MSG, Client->nick ); - fclose( fd ); - - return ok; -} /* Show_MOTD */ + chan = Channel_Search( Req->argv[0] ); + if( chan ) return Channel_Write( chan, from, Client, Req->argv[1] ); + + return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] ); +} /* IRC_PRIVMSG */ /* -eof- */