X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fparse.c;h=a470dff2b946bb09a6d88f01dbb17a7770244c62;hb=57c7e2362284c8c9937f32944ec985b53b1b07d6;hp=9a48194483ad1e543cecb20e403454eb8689bd50;hpb=490f28ffd1b42ee2076ce89c62d0e672ee7e541e;p=ngircd-alex.git diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 9a481944..a470dff2 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -14,17 +14,18 @@ #include "portab.h" -static char UNUSED id[] = "$Id: parse.c,v 1.51 2002/12/12 12:24:18 alex Exp $"; +static char UNUSED id[] = "$Id: parse.c,v 1.60 2004/01/17 03:17:49 alex Exp $"; #include "imp.h" #include #include #include #include +#include #include "ngircd.h" #include "defines.h" -#include "conn.h" +#include "conn-func.h" #include "client.h" #include "channel.h" #include "log.h" @@ -48,60 +49,54 @@ static char UNUSED id[] = "$Id: parse.c,v 1.51 2002/12/12 12:24:18 alex Exp $"; #include "exp.h" -typedef struct _COMMAND -{ - CHAR *name; /* Name des Befehls */ - BOOLEAN (*function)( CLIENT *Client, REQUEST *Request ); - CLIENT_TYPE type; /* Erlaubte Client-Typen (Bitmaske) */ - LONG count; /* Anzahl der Aufrufe */ -} COMMAND; - - COMMAND My_Commands[] = { - { "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0 }, - { "AWAY", IRC_AWAY, CLIENT_USER, 0 }, - { "CONNECT", IRC_CONNECT, CLIENT_USER, 0 }, - { "DIE", IRC_DIE, CLIENT_USER, 0 }, - { "ERROR", IRC_ERROR, 0xFFFF, 0 }, - { "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 0 }, - { "ISON", IRC_ISON, CLIENT_USER, 0 }, - { "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 0 }, - { "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 0 }, - { "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 0 }, - { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0 }, - { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0 }, - { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0 }, - { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 0 }, - { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0 }, - { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0 }, - { "NICK", IRC_NICK, 0xFFFF, 0 }, - { "NJOIN", IRC_NJOIN, CLIENT_SERVER, 0 }, - { "NOTICE", IRC_NOTICE, 0xFFFF, 0 }, - { "OPER", IRC_OPER, CLIENT_USER, 0 }, - { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 0 }, - { "PASS", IRC_PASS, 0xFFFF, 0 }, - { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0 }, - { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0 }, - { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0 }, - { "QUIT", IRC_QUIT, 0xFFFF, 0 }, - { "REHASH", IRC_REHASH, CLIENT_USER, 0 }, - { "RESTART", IRC_RESTART, CLIENT_USER, 0 }, - { "SERVER", IRC_SERVER, 0xFFFF, 0 }, - { "SQUIT", IRC_SQUIT, CLIENT_SERVER, 0 }, - { "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0 }, - { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0 }, - { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 0 }, - { "USER", IRC_USER, 0xFFFF, 0 }, - { "USERHOST", IRC_USERHOST, CLIENT_USER, 0 }, - { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0 }, - { "WHO", IRC_WHO, CLIENT_USER, 0 }, - { "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0 }, - { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0 }, + { "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "AWAY", IRC_AWAY, CLIENT_USER, 0, 0, 0 }, + { "CONNECT", IRC_CONNECT, CLIENT_USER, 0, 0, 0 }, + { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0 }, + { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 0, 0, 0 }, + { "ERROR", IRC_ERROR, 0xFFFF, 0, 0, 0 }, + { "HELP", IRC_HELP, CLIENT_USER, 0, 0, 0 }, + { "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "ISON", IRC_ISON, CLIENT_USER, 0, 0, 0 }, + { "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "NICK", IRC_NICK, 0xFFFF, 0, 0, 0 }, + { "NJOIN", IRC_NJOIN, CLIENT_SERVER, 0, 0, 0 }, + { "NOTICE", IRC_NOTICE, 0xFFFF, 0, 0, 0 }, + { "OPER", IRC_OPER, CLIENT_USER, 0, 0, 0 }, + { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "PASS", IRC_PASS, 0xFFFF, 0, 0, 0 }, + { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 }, + { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 }, + { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 }, + { "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 }, + { "SQUIT", IRC_SQUIT, CLIENT_SERVER, 0, 0, 0 }, + { "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "USER", IRC_USER, 0xFFFF, 0, 0, 0 }, + { "USERHOST", IRC_USERHOST, CLIENT_USER, 0, 0, 0 }, + { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "WHO", IRC_WHO, CLIENT_USER, 0, 0, 0 }, + { "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, #ifdef IRCPLUS - { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0 }, + { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 }, #endif - { NULL, NULL, 0 } /* Ende-Marke */ + { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */ }; @@ -114,6 +109,13 @@ LOCAL BOOLEAN Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed LOCAL BOOLEAN Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req )); +GLOBAL COMMAND * +Parse_GetCommandStruct( VOID ) +{ + return My_Commands; +} /* Parse_GetCommandStruct */ + + GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request ) { @@ -165,7 +167,7 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) *ptr = '\0'; #ifndef STRICT_RFC /* multiple Leerzeichen als Trenner vor - *Parametertrennern ignorieren */ + * Parametern ignorieren */ while( *(ptr + 1) == ' ' ) ptr++; #endif } @@ -317,6 +319,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) CLIENT *client, *target, *prefix; CHAR str[LINE_LEN]; + BOOLEAN result; COMMAND *cmd; INT i; @@ -327,46 +330,50 @@ 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 )) + /* Statuscode? */ + if(( Client_Type( client ) == CLIENT_SERVER ) && ( strlen( Req->command ) == 3 ) && ( atoi( Req->command ) > 100 )) { - /* Befehl ist ein Statuscode */ + /* Command is a status code from an other server */ - /* Zielserver ermitteln */ - if(( Client_Type( client ) == CLIENT_SERVER ) && ( Req->argc > 0 )) target = Client_Search( Req->argv[0] ); + /* 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, ignore it */ Log( LOG_DEBUG, "Ignored status code %s from \"%s\".", Req->command, Client_ID( client )); return TRUE; } - /* Quell-Client ermitteln */ + /* Determine source */ if( ! Req->prefix[0] ) { - Log( LOG_WARNING, "Got status code without prefix!?" ); + /* 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 ) { - Log( LOG_WARNING, "Got status code from unknown source: \"%s\"", Req->prefix ); + /* Oops, unknown prefix!? */ + Log( LOG_WARNING, "Got status code %s from unknown source: \"%s\"", Req->command, Req->prefix ); return TRUE; } - /* Statuscode weiterleiten */ - strcpy( str, Req->command ); + /* Forward status code */ + strlcpy( str, Req->command, sizeof( str )); for( i = 0; i < Req->argc; i++ ) { - if( i < Req->argc - 1 ) strcat( str, " " ); - else strcat( str, " :" ); - strcat( str, Req->argv[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 ); } @@ -382,10 +389,16 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) if( Client_Type( client ) & cmd->type ) { - /* Der Befehl ist fuer diesen Client-Typ erlaubt. - * Entsprechende Funktion zaehlen nun aufrufen: */ - cmd->count++; - return (cmd->function)( client, Req ); + /* Command is allowed for this client: call it and count produced bytes */ + Conn_ResetWCounter( ); + result = (cmd->function)( client, Req ); + cmd->bytes += Conn_WCounter( ); + + /* Adjust counters */ + if( Client_Type( client ) != CLIENT_SERVER ) cmd->lcount++; + else cmd->rcount++; + + return result; } else {