albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reformatted Handle_SERVER()

This commit is contained in:
Florian Westphal 2005-09-02 13:50:52 +00:00
parent af9123fd82
commit 9275dc4dc4
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/ngircd/conf.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: conf.c,v 1.83 2005/07/31 20:13:08 alex Exp $"; static char UNUSED id[] = "$Id: conf.c,v 1.84 2005/09/02 13:50:52 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -885,6 +885,7 @@ static void
Handle_SERVER( int Line, char *Var, char *Arg ) Handle_SERVER( int Line, char *Var, char *Arg )
{ {
long port; long port;
size_t len;
assert( Line > 0 ); assert( Line > 0 );
assert( Var != NULL ); assert( Var != NULL );
@ -893,53 +894,57 @@ Handle_SERVER( int Line, char *Var, char *Arg )
/* Ignore server block if no space is left in server configuration structure */ /* Ignore server block if no space is left in server configuration structure */
if( New_Server_Idx <= NONE ) return; if( New_Server_Idx <= NONE ) return;
if( strcasecmp( Var, "Host" ) == 0 ) if( strcasecmp( Var, "Host" ) == 0 ) {
{
/* Hostname of the server */ /* Hostname of the server */
if( strlcpy( New_Server.host, Arg, sizeof( New_Server.host )) >= sizeof( New_Server.host )) len = strlcpy( New_Server.host, Arg, sizeof( New_Server.host ));
if (len >= sizeof( New_Server.host ))
Config_Error_TooLong ( Line, Var ); Config_Error_TooLong ( Line, Var );
return; return;
} }
if( strcasecmp( Var, "Name" ) == 0 ) if( strcasecmp( Var, "Name" ) == 0 ) {
{
/* Name of the server ("Nick"/"ID") */ /* Name of the server ("Nick"/"ID") */
if( strlcpy( New_Server.name, Arg, sizeof( New_Server.name )) >= sizeof( New_Server.name )) len = strlcpy( New_Server.name, Arg, sizeof( New_Server.name ));
if (len >= sizeof( New_Server.name ))
Config_Error_TooLong( Line, Var ); Config_Error_TooLong( Line, Var );
return; return;
} }
if( strcasecmp( Var, "MyPassword" ) == 0 ) if( strcasecmp( Var, "MyPassword" ) == 0 ) {
{
/* Password of this server which is sent to the peer */ /* Password of this server which is sent to the peer */
if( strlcpy( New_Server.pwd_in, Arg, sizeof( New_Server.pwd_in )) >= sizeof( New_Server.pwd_in )) Config_Error_TooLong( Line, Var ); len = strlcpy( New_Server.pwd_in, Arg, sizeof( New_Server.pwd_in ));
if (len >= sizeof( New_Server.pwd_in ))
Config_Error_TooLong( Line, Var );
return; return;
} }
if( strcasecmp( Var, "PeerPassword" ) == 0 ) if( strcasecmp( Var, "PeerPassword" ) == 0 ) {
{
/* Passwort of the peer which must be received */ /* Passwort of the peer which must be received */
if( strlcpy( New_Server.pwd_out, Arg, sizeof( New_Server.pwd_out )) >= sizeof( New_Server.pwd_out )) Config_Error_TooLong( Line, Var ); len = strlcpy( New_Server.pwd_out, Arg, sizeof( New_Server.pwd_out ));
if (len >= sizeof( New_Server.pwd_out ))
Config_Error_TooLong( Line, Var );
return; return;
} }
if( strcasecmp( Var, "Port" ) == 0 ) if( strcasecmp( Var, "Port" ) == 0 ) {
{
/* Port to which this server should connect */ /* Port to which this server should connect */
port = atol( Arg ); port = atol( Arg );
if( port > 0 && port < 0xFFFF ) New_Server.port = (UINT16)port; if( port > 0 && port < 0xFFFF )
else Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, port ); New_Server.port = (UINT16)port;
else
Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!",
NGIRCd_ConfFile, Line, port );
return; return;
} }
if( strcasecmp( Var, "Group" ) == 0 ) if( strcasecmp( Var, "Group" ) == 0 ) {
{
/* Server group */ /* Server group */
#ifdef HAVE_ISDIGIT #ifdef HAVE_ISDIGIT
if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); if( ! isdigit( (int)*Arg ))
Config_Error_NaN( Line, Var );
else else
#endif #endif
New_Server.group = atoi( Arg ); New_Server.group = atoi( Arg );
return; return;
} }
Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!",
NGIRCd_ConfFile, Line, Var );
} /* Handle_SERVER */ } /* Handle_SERVER */