commit - d1364ab488ee567f01ded63b51fb7f543eb1adc7
commit + 4add9c29edb943689cd0eb072eea151b6f80bdfd
blob - 5109169b72a068b8ff4655adda8bcb6637c093b1
blob + d3065bf43c62627897056622a44e101728237f84
--- src/ngircd/parse.c
+++ src/ngircd/parse.c
#include "portab.h"
-static char UNUSED id[] = "$Id: parse.c,v 1.69 2007/11/21 12:16:36 alex Exp $";
+static char UNUSED id[] = "$Id: parse.c,v 1.70 2008/01/13 16:12:49 fw Exp $";
/**
* @file
#include "exp.h"
+struct _NUMERIC {
+ int numeric;
+ bool (*function) PARAMS(( CLIENT *Client, REQUEST *Request ));
+};
-COMMAND My_Commands[] =
+
+static COMMAND My_Commands[] =
{
{ "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
{ "AWAY", IRC_AWAY, CLIENT_USER, 0, 0, 0 },
{ NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */
};
-NUMERIC My_Numerics[] =
-{
- { 005, IRC_Num_ISUPPORT },
- { 376, IRC_Num_ENDOFMOTD },
- { 0, NULL } /* end marker */
-};
-
-
static void Init_Request PARAMS(( REQUEST *Req ));
static bool Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
static bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
/**
* Return the pointer to the global "IRC command structure".
} /* Validate_Args */
+/* Command is a status code ("numeric") from another server */
static bool
+Handle_Numeric(CLIENT *client, REQUEST *Req)
+{
+ static const struct _NUMERIC Numerics[] = {
+ { 005, IRC_Num_ISUPPORT },
+ { 376, IRC_Num_ENDOFMOTD }
+ };
+ int i, num;
+ char str[LINE_LEN];
+ CLIENT *prefix, *target = NULL;
+
+ /* Determine target */
+ if (Req->argc > 0)
+ target = Client_Search(Req->argv[0]);
+
+ if (!target) {
+ /* Status code without target!? */
+ if (Req->argc > 0)
+ Log(LOG_WARNING,
+ "Unknown target for status code %s: \"%s\"",
+ Req->command, Req->argv[0]);
+ else
+ Log(LOG_WARNING,
+ "Unknown target for status code %s!",
+ Req->command);
+ return true;
+ }
+ if (target == Client_ThisServer()) {
+ /* This server is the target of the numeric */
+ num = atoi(Req->command);
+
+ for (i = 0; i < (int) ARRAY_SIZE(Numerics); i++) {
+ if (num == Numerics[i].numeric)
+ return Numerics[i].function(client, Req);
+ }
+
+ LogDebug("Ignored status code %s from \"%s\".",
+ Req->command, Client_ID(client));
+ return true;
+ }
+
+ /* Determine source */
+ if (! Req->prefix[0]) {
+ /* Oops, no prefix!? */
+ Log(LOG_WARNING, "Got status code %s from \"%s\" without prefix!?",
+ Req->command, Client_ID(client));
+ return true;
+ }
+
+ prefix = Client_Search(Req->prefix);
+ if (! prefix) { /* Oops, unknown prefix!? */
+ Log(LOG_WARNING, "Got status code %s from unknown source: \"%s\"", Req->command, Req->prefix);
+ return true;
+ }
+
+ /* Forward status code */
+ strlcpy(str, Req->command, sizeof(str));
+ for (i = 0; i < Req->argc; i++) {
+ if (i < Req->argc - 1)
+ strlcat(str, " ", sizeof(str));
+ else
+ strlcat(str, " :", sizeof(str));
+ strlcat(str, Req->argv[i], sizeof(str));
+ }
+ return IRC_WriteStrClientPrefix(target, prefix, "%s", str);
+}
+
+
+static bool
Handle_Request( CONN_ID Idx, REQUEST *Req )
{
/* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler
* wird die Verbindung geschlossen und false geliefert. */
-
- CLIENT *client, *target, *prefix;
- char str[LINE_LEN];
- bool result;
+ CLIENT *client;
+ bool result = true;
COMMAND *cmd;
- NUMERIC *num;
- int i;
assert( Idx >= 0 );
assert( Req != NULL );
/* Numeric? */
if ((Client_Type(client) == CLIENT_SERVER ||
Client_Type(client) == CLIENT_UNKNOWNSERVER)
- && strlen(Req->command) == 3 && atoi(Req->command) > 1) {
- /* Command is a status code ("numeric") from an other server */
-
- /* Determine target */
- if (Req->argc > 0)
- target = Client_Search( Req->argv[0] );
- else
- target = NULL;
- if (!target) {
- /* Status code without target!? */
- if (Req->argc > 0)
- Log(LOG_WARNING,
- "Unknown target for status code %s: \"%s\"",
- Req->command, Req->argv[0]);
- else
- Log(LOG_WARNING,
- "Unknown target for status code %s!",
- Req->command);
- return true;
- }
- if (target == Client_ThisServer()) {
- /* This server is the target of the numeric */
- i = atoi(Req->command);
+ && strlen(Req->command) == 3 && atoi(Req->command) > 1)
+ return Handle_Numeric(client, Req);
- num = My_Numerics;
- while (num->numeric > 0) {
- if (i != num->numeric) {
- num++;
- continue;
- }
- result = (num->function)(client, Req);
- return result;
- }
-
- LogDebug("Ignored status code %s from \"%s\".",
- Req->command, Client_ID(client));
- return true;
- }
-
- /* Determine source */
- if( ! Req->prefix[0] )
- {
- /* Oops, no prefix!? */
- Log( LOG_WARNING, "Got status code %s from \"%s\" without prefix!?", Req->command, Client_ID( client ));
- return true;
- }
- else prefix = Client_Search( Req->prefix );
- if( ! prefix )
- {
- /* Oops, unknown prefix!? */
- Log( LOG_WARNING, "Got status code %s from unknown source: \"%s\"", Req->command, Req->prefix );
- return true;
- }
-
- /* Forward status code */
- strlcpy( str, Req->command, sizeof( str ));
- for( i = 0; i < Req->argc; i++ )
- {
- if( i < Req->argc - 1 ) strlcat( str, " ", sizeof( str ));
- else strlcat( str, " :", sizeof( str ));
- strlcat( str, Req->argv[i], sizeof( str ));
- }
- return IRC_WriteStrClientPrefix( target, prefix, "%s", str );
- }
-
cmd = My_Commands;
- while( cmd->name )
- {
+ while (cmd->name) {
/* Befehl suchen */
- if( strcasecmp( Req->command, cmd->name ) != 0 )
- {
- cmd++; continue;
+ if (strcasecmp(Req->command, cmd->name) != 0) {
+ cmd++;
+ continue;
}
- if( Client_Type( client ) & cmd->type )
- {
- /* Command is allowed for this client: call it and count produced bytes */
- Conn_ResetWCounter( );
- result = (cmd->function)( client, Req );
- cmd->bytes += Conn_WCounter( );
+ if (!(Client_Type(client) & cmd->type))
+ return IRC_WriteStrClient(client, ERR_NOTREGISTERED_MSG, Client_ID(client));
- /* Adjust counters */
- if( Client_Type( client ) != CLIENT_SERVER ) cmd->lcount++;
- else cmd->rcount++;
+ /* Command is allowed for this client: call it and count produced bytes */
+ Conn_ResetWCounter();
+ result = (cmd->function)(client, Req);
+ cmd->bytes += Conn_WCounter();
- return result;
- }
+ /* Adjust counters */
+ if (Client_Type(client) != CLIENT_SERVER)
+ cmd->lcount++;
else
- {
- /* Befehl ist fuer diesen Client-Typ nicht erlaubt! */
- return IRC_WriteStrClient( client, ERR_NOTREGISTERED_MSG, Client_ID( client ));
- }
+ cmd->rcount++;
+ return result;
}
- if( Client_Type( client ) != CLIENT_USER &&
+ if (Client_Type( client ) != CLIENT_USER &&
Client_Type( client ) != CLIENT_SERVER &&
Client_Type( client ) != CLIENT_SERVICE )
return true;
-
+
/* Unknown command and registered connection: generate error: */
- Log( LOG_DEBUG, "Connection %d: Unknown command \"%s\", %d %s,%s prefix.",
+ LogDebug("Connection %d: Unknown command \"%s\", %d %s,%s prefix.",
Client_Conn( client ), Req->command, Req->argc,
Req->argc == 1 ? "parameter" : "parameters",
Req->prefix ? "" : " no" );
result = IRC_WriteStrClient(client, ERR_UNKNOWNCOMMAND_MSG,
Client_ID(client), Req->command);
Conn_SetPenalty(Idx, 1);
- return result;
}
-
- return true;
+ return result;
} /* Handle_Request */
blob - e7a00879b5b826f7bef0dd4d604314fc0114ca09
blob + a3f764ece38587c22fca60ed344b74e6e1e1ca55
--- src/ngircd/parse.h
+++ src/ngircd/parse.h
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
*
- * $Id: parse.h,v 1.12 2007/11/21 12:16:36 alex Exp $
+ * $Id: parse.h,v 1.13 2008/01/13 16:12:49 fw Exp $
*
* IRC command parser and validator (header)
*/
} COMMAND;
-typedef struct _NUMERIC
-{
- int numeric; /* numeric */
- bool (*function) PARAMS(( CLIENT *Client, REQUEST *Request ));
-} NUMERIC;
-
-
GLOBAL bool Parse_Request PARAMS((CONN_ID Idx, char *Request ));
GLOBAL COMMAND *Parse_GetCommandStruct PARAMS(( void ));
-
#endif
