mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-10-30 21:42:59 +00:00
Code Issues Releases Wiki Activity

Little code cleanups, better comments

Browse Source
This commit is contained in:
Alexander Barton
2018-02-25 21:43:39 +01:00
parent 03acae970d
commit 13761f1ec9
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ngircd/parse.c
View File

@@ -1,6 +1,6 @@
/* /*
* ngIRCd -- The Next Generation IRC Daemon * ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001-2015 Alexander Barton (alex@barton.de) and Contributors. * Copyright (c)2001-2018 Alexander Barton (alex@barton.de) and Contributors.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -169,8 +169,8 @@ Parse_GetCommandStruct( void )
* *
* @param Idx Index of the connection from which the command has been received. * @param Idx Index of the connection from which the command has been received.
* @param Request NULL terminated line of text (the "command"). * @param Request NULL terminated line of text (the "command").
* @return true on success (valid command or "regular" error), false if a * @return CONNECTED on success (valid command or "regular" error), DISCONNECTED
* fatal error occurred and the connection has been shut down. * if a fatal error occurred and the connection has been shut down.
*/ */
GLOBAL bool GLOBAL bool
Parse_Request( CONN_ID Idx, char *Request ) Parse_Request( CONN_ID Idx, char *Request )
@@ -257,11 +257,14 @@ Parse_Request( CONN_ID Idx, char *Request )
} }
} }
if( ! Validate_Prefix( Idx, &req, &closed )) return ! closed; if(!Validate_Prefix(Idx, &req, &closed))
if( ! Validate_Command( Idx, &req, &closed )) return ! closed; return !closed;
if( ! Validate_Args( Idx, &req, &closed )) return ! closed; if(!Validate_Command(Idx, &req, &closed))
return !closed;
if(!Validate_Args(Idx, &req, &closed))
return !closed;
return Handle_Request( Idx, &req ); return Handle_Request(Idx, &req);
} /* Parse_Request */ } /* Parse_Request */
@@ -490,7 +493,7 @@ static bool
Handle_Request( CONN_ID Idx, REQUEST *Req ) Handle_Request( CONN_ID Idx, REQUEST *Req )
{ {
CLIENT *client; CLIENT *client;
bool result = true; bool result = CONNECTED;
int client_type; int client_type;
COMMAND *cmd; COMMAND *cmd;
@@ -546,6 +549,8 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
cmd->lcount++; cmd->lcount++;
else else
cmd->rcount++; cmd->rcount++;
/* Return result of command (CONNECTED/DISCONNECTED). */
return result; return result;
} }
@@ -554,13 +559,13 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
client_type != CLIENT_SERVICE ) client_type != CLIENT_SERVICE )
return true; return true;
/* Unknown command and registered connection: generate error: */
LogDebug("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, Client_Conn( client ), Req->command, Req->argc,
Req->argc == 1 ? "parameter" : "parameters", Req->argc == 1 ? "parameter" : "parameters",
Req->prefix ? "" : " no" ); Req->prefix ? "" : " no" );
if (Client_Type(client) != CLIENT_SERVER) /* Unknown command and registered connection: generate error: */
if (client_type != CLIENT_SERVER)
result = IRC_WriteErrClient(client, ERR_UNKNOWNCOMMAND_MSG, result = IRC_WriteErrClient(client, ERR_UNKNOWNCOMMAND_MSG,
Client_ID(client), Req->command); Client_ID(client), Req->command);