X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fparse.c;h=79c5d16f4e048bfde7bcffa6b7c723b958bef7a4;hp=fefe794985bb15652f5174a27f234d483494766d;hb=458174ffb0401c15fac9a69d48d956f3297a895f;hpb=5ff42762cd46395692f792ea5f4b50fc412088cb diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index fefe7949..79c5d16f 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -9,11 +9,38 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: parse.c,v 1.14 2002/01/04 17:56:45 alex Exp $ + * $Id: parse.c,v 1.23 2002/02/17 23:38:58 alex Exp $ * * parse.c: Parsen der Client-Anfragen * * $Log: parse.c,v $ + * Revision 1.23 2002/02/17 23:38:58 alex + * - neuer IRC-Befehl VERSION implementiert: IRC_VERSION(). + * + * Revision 1.22 2002/01/21 00:01:37 alex + * - neue Befehle JOIN und PART. + * + * Revision 1.21 2002/01/18 11:12:11 alex + * - der Sniffer wird nun nur noch aktiviert, wenn auf Kommandozeile angegeben. + * + * Revision 1.20 2002/01/11 23:50:55 alex + * - LINKS implementiert, LUSERS begonnen. + * + * Revision 1.19 2002/01/09 01:08:42 alex + * - Parses handhabt Leerzeichen zw. Parametern nun etwas "lockerer". + * + * Revision 1.18 2002/01/07 15:29:11 alex + * - Status-Codes an den Server selber werden ignoriert, besseres Logging. + * + * Revision 1.17 2002/01/06 17:41:44 alex + * - die Fehlermeldung "unbekannter Befehl" hatte ein falsches Format. + * + * Revision 1.16 2002/01/05 23:23:20 alex + * - generisches Forwarding von Zahlen-Statuscodes implementiert. + * + * Revision 1.15 2002/01/05 01:42:08 alex + * - an Server werden keine ERRORS mehr wegen unbekannter Befehle geschickt. + * * Revision 1.14 2002/01/04 17:56:45 alex * - neuer Befehl SQUIT. * @@ -72,9 +99,11 @@ #include #include +#include #include #include +#include "ngircd.h" #include "client.h" #include "conn.h" #include "irc.h" @@ -120,7 +149,7 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request ) assert( Request != NULL ); #ifdef SNIFFER - Log( LOG_DEBUG, " <- connection %d: '%s'.", Idx, Request ); + if( NGIRCd_Sniffer ) Log( LOG_DEBUG, " <- connection %d: '%s'.", Idx, Request ); #endif Init_Request( &req ); @@ -136,6 +165,11 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request ) ptr = strchr( Request, ' ' ); if( ! ptr ) return Parse_Error( Idx, "Prefix without command!?" ); *ptr = '\0'; +#ifndef STRICT_RFC + /* multiple Leerzeichen als Trenner zwischen + * Prefix und Befehl ignorieren */ + while( *(ptr + 1) == ' ' ) ptr++; +#endif start = ptr + 1; } else start = Request; @@ -144,7 +178,15 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request ) /* Befehl */ ptr = strchr( start, ' ' ); - if( ptr ) *ptr = '\0'; + if( ptr ) + { + *ptr = '\0'; +#ifndef STRICT_RFC + /* multiple Leerzeichen als Trenner vor + *Parametertrennern ignorieren */ + while( *(ptr + 1) == ' ' ) ptr++; +#endif + } req.command = start; if( ! Validate_Command( &req )) return Parse_Error( Idx, "Invalid command" ); @@ -166,7 +208,15 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request ) { req.argv[req.argc] = start; ptr = strchr( start, ' ' ); - if( ptr ) *ptr = '\0'; + if( ptr ) + { + *ptr = '\0'; +#ifndef STRICT_RFC + /* multiple Leerzeichen als + * Parametertrenner ignorieren */ + while( *(ptr + 1) == ' ' ) ptr++; +#endif + } } req.argc++; @@ -240,7 +290,9 @@ LOCAL BOOLEAN Handle_Request( CONN_ID Idx, REQUEST *Req ) /* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler * wird die Verbindung geschlossen und FALSE geliefert. */ - CLIENT *client; + CLIENT *client, *target, *prefix; + CHAR str[LINE_LEN]; + INT i; assert( Idx >= 0 ); assert( Req != NULL ); @@ -249,6 +301,50 @@ LOCAL BOOLEAN Handle_Request( CONN_ID Idx, REQUEST *Req ) client = Client_GetFromConn( Idx ); assert( client != NULL ); + /* Statuscode, der geforwarded werden muss? */ + if(( strlen( Req->command ) == 3 ) && ( atoi( Req->command ) > 100 )) + { + /* Befehl ist ein Statuscode */ + + /* Zielserver ermitteln */ + if(( Client_Type( client ) == CLIENT_SERVER ) && ( Req->argc > 0 )) target = Client_GetFromID( Req->argv[0] ); + else target = NULL; + if( ! target ) + { + if( target ) Log( LOG_WARNING, "Unknown target for status code: \"%s\"", Req->argv[0] ); + else Log( LOG_WARNING, "Unknown target for status code!" ); + return TRUE; + } + if( target == Client_ThisServer( )) + { + Log( LOG_DEBUG, "Ignored status code %s from \"%s\".", Req->command, Client_ID( client )); + return TRUE; + } + + /* Quell-Client ermitteln */ + if( ! Req->prefix[0] ) + { + Log( LOG_WARNING, "Got status code without prefix!?" ); + return TRUE; + } + else prefix = Client_GetFromID( Req->prefix ); + if( ! prefix ) + { + Log( LOG_WARNING, "Got status code from unknown source: \"%s\"", Req->prefix ); + return TRUE; + } + + /* Statuscode weiterleiten */ + strcpy( str, Req->command ); + for( i = 0; i < Req->argc; i++ ) + { + if( i < Req->argc - 1 ) strcat( str, " " ); + else strcat( str, " :" ); + strcat( str, Req->argv[i] ); + } + return IRC_WriteStrClientPrefix( target, prefix, str ); + } + if( strcasecmp( Req->command, "PASS" ) == 0 ) return IRC_PASS( client, Req ); else if( strcasecmp( Req->command, "NICK" ) == 0 ) return IRC_NICK( client, Req ); else if( strcasecmp( Req->command, "USER" ) == 0 ) return IRC_USER( client, Req ); @@ -270,10 +366,15 @@ LOCAL BOOLEAN Handle_Request( CONN_ID Idx, REQUEST *Req ) else if( strcasecmp( Req->command, "DIE" ) == 0 ) return IRC_DIE( client, Req ); else if( strcasecmp( Req->command, "RESTART" ) == 0 ) return IRC_RESTART( client, Req ); else if( strcasecmp( Req->command, "ERROR" ) == 0 ) return IRC_ERROR( client, Req ); + else if( strcasecmp( Req->command, "LUSERS" ) == 0 ) return IRC_LUSERS( client, Req ); + else if( strcasecmp( Req->command, "LINKS" ) == 0 ) return IRC_LINKS( client, Req ); + else if( strcasecmp( Req->command, "JOIN" ) == 0 ) return IRC_JOIN( client, Req ); + else if( strcasecmp( Req->command, "PART" ) == 0 ) return IRC_PART( client, Req ); + else if( strcasecmp( Req->command, "VERSION" ) == 0 ) return IRC_VERSION( client, Req ); /* Unbekannter Befehl */ - IRC_WriteStrClient( client, Client_ThisServer( ), ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command ); - Log( LOG_DEBUG, "User \"%s\": Unknown command \"%s\", %d %s,%s prefix.", Client_Mask( client ), Req->command, Req->argc, Req->argc == 1 ? "parameter" : "parameters", Req->prefix ? "" : " no" ); + if( Client_Type( client ) != CLIENT_SERVER ) IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command ); + Log( LOG_DEBUG, "Connection %d: Unknown command \"%s\", %d %s,%s prefix.", Client_Conn( client ), Req->command, Req->argc, Req->argc == 1 ? "parameter" : "parameters", Req->prefix ? "" : " no" ); return TRUE; } /* Handle_Request */