simplify IRC_Show_MOTD()

[ngircd-alex.git] / src / ngircd / parse.c

diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c
index e36b3e7e14b2cc1c3ad4e4a97bf77d13175a5cb4..5896a027718d8544fdb987fd38f45dcdac14b8aa 100644 (file)
--- a/src/ngircd/parse.c
+++ b/src/ngircd/parse.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: parse.c,v 1.62 2005/06/01 21:52:18 alex Exp $";
+static char UNUSED id[] = "$Id: parse.c,v 1.66 2005/09/04 23:42:24 alex Exp $";
 
 /**
  * @file
@@ -103,13 +103,13 @@ COMMAND My_Commands[] =
 };
 
 
-LOCAL void Init_Request PARAMS(( REQUEST *Req ));
+static void Init_Request PARAMS(( REQUEST *Req ));
 
-LOCAL bool Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
-LOCAL bool Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
-LOCAL bool Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
+static bool Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
+static bool Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
+static bool Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed ));
 
-LOCAL bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
+static bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
 
 
 /**
@@ -247,7 +247,7 @@ Parse_Request( CONN_ID Idx, char *Request )
  * Initialize request structure.
  * @param Req Request structure to be initialized.
  */
-LOCAL void
+static void
 Init_Request( REQUEST *Req )
 {
        /* Neue Request-Struktur initialisieren */
@@ -263,7 +263,7 @@ Init_Request( REQUEST *Req )
 } /* Init_Request */
 
 
-LOCAL bool
+static bool
 Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
 {
        CLIENT *client, *c;
@@ -316,8 +316,8 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed )
 } /* Validate_Prefix */
 
 
-LOCAL bool
-Validate_Command( CONN_ID Idx, REQUEST *Req, bool *Closed )
+static bool
+Validate_Command( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
 {
        assert( Idx >= 0 );
        assert( Req != NULL );
@@ -327,8 +327,8 @@ Validate_Command( CONN_ID Idx, REQUEST *Req, bool *Closed )
 } /* Validate_Comman */
 
 
-LOCAL bool
-Validate_Args( CONN_ID Idx, REQUEST *Req, bool *Closed )
+static bool
+Validate_Args( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
 {
        assert( Idx >= 0 );
        assert( Req != NULL );
@@ -338,7 +338,7 @@ Validate_Args( CONN_ID Idx, REQUEST *Req, bool *Closed )
 } /* Validate_Args */
 
 
-LOCAL bool
+static bool
 Handle_Request( CONN_ID Idx, REQUEST *Req )
 {
        /* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler
@@ -433,11 +433,26 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
                        return IRC_WriteStrClient( client, ERR_NOTREGISTERED_MSG, Client_ID( client ));
                }
        }
+
+       if( Client_Type( client ) != CLIENT_USER &&
+           Client_Type( client ) != CLIENT_SERVER &&
+           Client_Type( client ) != CLIENT_SERVICE )
+               return true;
        
-       /* Unbekannter Befehl */
-       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" );
-       if( Client_Type( client ) != CLIENT_SERVER ) return IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command );
-       else return true;
+       /* Unknown command and registered connection: generate error: */
+       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" );
+
+       if (Client_Type(client) != CLIENT_SERVER) {
+               result = IRC_WriteStrClient(client, ERR_UNKNOWNCOMMAND_MSG,
+                               Client_ID(client), Req->command);
+               Conn_SetPenalty(Idx, 1);
+               return result;
+       }
+
+       return true;
 } /* Handle_Request */