* 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.12 2002/01/03 02:24:49 alex Exp $
+ * $Id: parse.c,v 1.22 2002/01/21 00:01:37 alex Exp $
*
* parse.c: Parsen der Client-Anfragen
*
* $Log: parse.c,v $
+ * 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.
+ *
+ * Revision 1.13 2002/01/04 01:20:02 alex
+ * - Client-Strukruren werden nur noch ueber Funktionen angesprochen.
+ *
* Revision 1.12 2002/01/03 02:24:49 alex
* - neue Befehle NJOIN und SERVER begonnen.
*
#include <imp.h>
#include <assert.h>
+#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include "ngircd.h"
#include "client.h"
#include "conn.h"
#include "irc.h"
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 );
/* Prefix vorhanden */
req.prefix = Request + 1;
ptr = strchr( Request, ' ' );
- if( ! ptr ) return Parse_Error( Idx, "Invalid prefix (command missing!?)" );
+ 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;
/* 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" );
{
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++;
* TRUE: Connection wurde durch diese Funktion nicht geschlossen,
* FALSE: Connection wurde terminiert. */
- CHAR msg[256];
-
assert( Idx >= 0 );
assert( Error != NULL );
- sprintf( msg, "Parse error: %s!", Error );
- return Conn_WriteStr( Idx, msg );
+ Log( LOG_DEBUG, "Connection %d: Parse error: %s", Idx, Error );
+ return Conn_WriteStr( Idx, "ERROR :Parse error: %s", Error );
} /* Parse_Error */
/* 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 );
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 );
else if( strcasecmp( Req->command, "SERVER" ) == 0 ) return IRC_SERVER( client, Req );
else if( strcasecmp( Req->command, "NJOIN" ) == 0 ) return IRC_NJOIN( client, Req );
else if( strcasecmp( Req->command, "QUIT" ) == 0 ) return IRC_QUIT( client, Req );
+ else if( strcasecmp( Req->command, "SQUIT" ) == 0 ) return IRC_SQUIT( client, Req );
else if( strcasecmp( Req->command, "PING" ) == 0 ) return IRC_PING( client, Req );
else if( strcasecmp( Req->command, "PONG" ) == 0 ) return IRC_PONG( client, Req );
else if( strcasecmp( Req->command, "MOTD" ) == 0 ) return IRC_MOTD( client, 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 );
/* Unbekannter Befehl */
- IRC_WriteStrClient( client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Client_Nick( client ), Req->command );
- Log( LOG_DEBUG, "User \"%s!%s@%s\": Unknown command \"%s\", %d %s,%s prefix.", client->nick, client->user, client->host, 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 */