X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=276fc81ec838a93043d0f57a9ed7012fa7075cc9;hb=8adff5922376676c2eeb49de1cbab86cc345b887;hp=1ea1fe741ef3397c35a6d151c1bac575c4c1eec7;hpb=7281b8dd4d917f8b7f7c36460b78b686427ce973;p=ngircd-alex.git diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 1ea1fe74..276fc81e 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -14,12 +14,16 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conf.c,v 1.64 2004/05/07 11:19:21 alex Exp $"; +static char UNUSED id[] = "$Id: conf.c,v 1.72 2005/03/19 18:43:48 fw Exp $"; #include "imp.h" #include #include -#include +#ifdef PROTOTYPES +# include +#else +# include +#endif #include #include #include @@ -46,57 +50,60 @@ static char UNUSED id[] = "$Id: conf.c,v 1.64 2004/05/07 11:19:21 alex Exp $"; #include "conf.h" -LOCAL BOOLEAN Use_Log = TRUE; +LOCAL bool Use_Log = true; LOCAL CONF_SERVER New_Server; -LOCAL INT New_Server_Idx; +LOCAL int New_Server_Idx; -LOCAL VOID Set_Defaults PARAMS(( BOOLEAN InitServers )); -LOCAL VOID Read_Config PARAMS(( VOID )); -LOCAL VOID Validate_Config PARAMS(( BOOLEAN TestOnly )); +LOCAL void Set_Defaults PARAMS(( bool InitServers )); +LOCAL void Read_Config PARAMS(( void )); +LOCAL void Validate_Config PARAMS(( bool TestOnly )); -LOCAL VOID Handle_GLOBAL PARAMS(( INT Line, CHAR *Var, CHAR *Arg )); -LOCAL VOID Handle_OPERATOR PARAMS(( INT Line, CHAR *Var, CHAR *Arg )); -LOCAL VOID Handle_SERVER PARAMS(( INT Line, CHAR *Var, CHAR *Arg )); -LOCAL VOID Handle_CHANNEL PARAMS(( INT Line, CHAR *Var, CHAR *Arg )); +LOCAL void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg )); +LOCAL void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg )); +LOCAL void Handle_SERVER PARAMS(( int Line, char *Var, char *Arg )); +LOCAL void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg )); -LOCAL VOID Config_Error PARAMS(( CONST INT Level, CONST CHAR *Format, ... )); +LOCAL void Config_Error PARAMS(( const int Level, const char *Format, ... )); -LOCAL VOID Init_Server_Struct PARAMS(( CONF_SERVER *Server )); +LOCAL void Config_Error_NaN PARAMS(( const int LINE, const char *Value )); +LOCAL void Config_Error_TooLong PARAMS(( const int LINE, const char *Value )); +LOCAL void Init_Server_Struct PARAMS(( CONF_SERVER *Server )); -GLOBAL VOID -Conf_Init( VOID ) + +GLOBAL void +Conf_Init( void ) { - Set_Defaults( TRUE ); + Set_Defaults( true ); Read_Config( ); - Validate_Config( FALSE ); + Validate_Config( false ); } /* Config_Init */ -GLOBAL VOID -Conf_Rehash( VOID ) +GLOBAL void +Conf_Rehash( void ) { - Set_Defaults( FALSE ); + Set_Defaults( false ); Read_Config( ); - Validate_Config( FALSE ); + Validate_Config( false ); } /* Config_Rehash */ -GLOBAL INT -Conf_Test( VOID ) +GLOBAL int +Conf_Test( void ) { /* Read configuration, validate and output it. */ struct passwd *pwd; struct group *grp; - INT i; + int i; - Use_Log = FALSE; - Set_Defaults( TRUE ); + Use_Log = false; + Set_Defaults( true ); Read_Config( ); - Validate_Config( TRUE ); + Validate_Config( true ); /* If stdin is a valid tty wait for a key: */ if( isatty( fileno( stdout ))) @@ -107,15 +114,16 @@ Conf_Test( VOID ) else puts( "Ok, dump of your server configuration follows:\n" ); puts( "[GLOBAL]" ); - printf( " ServerName = %s\n", Conf_ServerName ); - printf( " ServerInfo = %s\n", Conf_ServerInfo ); + printf( " Name = %s\n", Conf_ServerName ); + printf( " Info = %s\n", Conf_ServerInfo ); printf( " Password = %s\n", Conf_ServerPwd ); printf( " AdminInfo1 = %s\n", Conf_ServerAdmin1 ); printf( " AdminInfo2 = %s\n", Conf_ServerAdmin2 ); printf( " AdminEMail = %s\n", Conf_ServerAdminMail ); printf( " MotdFile = %s\n", Conf_MotdFile ); printf( " MotdPhrase = %s\n", Conf_MotdPhrase ); - printf( " ChrootDir= %s\n", Conf_Chroot ); + printf( " ChrootDir = %s\n", Conf_Chroot ); + printf( " PidFile = %s\n", Conf_PidFile); printf( " Ports = " ); for( i = 0; i < Conf_ListenPorts_Count; i++ ) { @@ -126,14 +134,15 @@ Conf_Test( VOID ) printf( " Listen = %s\n", Conf_ListenAddress ); pwd = getpwuid( Conf_UID ); if( pwd ) printf( " ServerUID = %s\n", pwd->pw_name ); - else printf( " ServerUID = %ld\n", (LONG)Conf_UID ); + else printf( " ServerUID = %ld\n", (long)Conf_UID ); grp = getgrgid( Conf_GID ); if( grp ) printf( " ServerGID = %s\n", grp->gr_name ); - else printf( " ServerGID = %ld\n", (LONG)Conf_GID ); + else printf( " ServerGID = %ld\n", (long)Conf_GID ); printf( " PingTimeout = %d\n", Conf_PingTimeout ); printf( " PongTimeout = %d\n", Conf_PongTimeout ); printf( " ConnectRetry = %d\n", Conf_ConnectRetry ); - printf( " OperCanUseMode = %s\n", Conf_OperCanMode == TRUE ? "yes" : "no" ); + printf( " OperCanUseMode = %s\n", Conf_OperCanMode == true? "yes" : "no" ); + printf( " OperServerMode = %s\n", Conf_OperServerMode == true? "yes" : "no" ); if( Conf_MaxConnections > 0 ) printf( " MaxConnections = %ld\n", Conf_MaxConnections ); else printf( " MaxConnections = -1\n" ); if( Conf_MaxConnectionsIP > 0 ) printf( " MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP ); @@ -150,6 +159,7 @@ Conf_Test( VOID ) puts( "[OPERATOR]" ); printf( " Name = %s\n", Conf_Oper[i].name ); printf( " Password = %s\n", Conf_Oper[i].pwd ); + if ( Conf_Oper[i].mask ) printf( " Mask = %s\n", Conf_Oper[i].mask ); puts( "" ); } @@ -184,7 +194,7 @@ Conf_Test( VOID ) } /* Conf_Test */ -GLOBAL VOID +GLOBAL void Conf_UnsetServer( CONN_ID Idx ) { /* Set next time for next connection attempt, if this is a server @@ -192,7 +202,7 @@ Conf_UnsetServer( CONN_ID Idx ) * "once", delete it from our configuration. * Non-Server-Connections will be silently ignored. */ - INT i; + int i; /* Check all our configured servers */ for( i = 0; i < MAX_SERVERS; i++ ) @@ -220,8 +230,8 @@ Conf_UnsetServer( CONN_ID Idx ) } /* Conf_UnsetServer */ -GLOBAL VOID -Conf_SetServer( INT ConfServer, CONN_ID Idx ) +GLOBAL void +Conf_SetServer( int ConfServer, CONN_ID Idx ) { /* Set connection for specified configured server */ @@ -232,12 +242,12 @@ Conf_SetServer( INT ConfServer, CONN_ID Idx ) } /* Conf_SetServer */ -GLOBAL INT +GLOBAL int Conf_GetServer( CONN_ID Idx ) { /* Get index of server in configuration structure */ - INT i = 0; + int i = 0; assert( Idx > NONE ); @@ -249,12 +259,12 @@ Conf_GetServer( CONN_ID Idx ) } /* Conf_GetServer */ -GLOBAL BOOLEAN -Conf_EnableServer( CHAR *Name, INT Port ) +GLOBAL bool +Conf_EnableServer( char *Name, UINT16 Port ) { /* Enable specified server and adjust port */ - INT i; + int i; assert( Name != NULL ); @@ -265,19 +275,19 @@ Conf_EnableServer( CHAR *Name, INT Port ) /* Gotcha! Set port and enable server: */ Conf_Server[i].port = Port; Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED; - return TRUE; + return true; } } - return FALSE; + return false; } /* Conf_EnableServer */ -GLOBAL BOOLEAN -Conf_DisableServer( CHAR *Name ) +GLOBAL bool +Conf_DisableServer( char *Name ) { /* Enable specified server and adjust port */ - INT i; + int i; assert( Name != NULL ); @@ -287,20 +297,20 @@ Conf_DisableServer( CHAR *Name ) { /* Gotcha! Disable and disconnect server: */ Conf_Server[i].flags |= CONF_SFLAG_DISABLED; - if( Conf_Server[i].conn_id > NONE ) Conn_Close( Conf_Server[i].conn_id, NULL, "Server link terminated on operator request", TRUE ); - return TRUE; + if( Conf_Server[i].conn_id > NONE ) Conn_Close( Conf_Server[i].conn_id, NULL, "Server link terminated on operator request", true); + return true; } } - return FALSE; + return false; } /* Conf_DisableServer */ -GLOBAL BOOLEAN -Conf_AddServer( CHAR *Name, INT Port, CHAR *Host, CHAR *MyPwd, CHAR *PeerPwd ) +GLOBAL bool +Conf_AddServer( char *Name, UINT16 Port, char *Host, char *MyPwd, char *PeerPwd ) { /* Add new server to configuration */ - INT i; + int i; assert( Name != NULL ); assert( Host != NULL ); @@ -313,7 +323,7 @@ Conf_AddServer( CHAR *Name, INT Port, CHAR *Host, CHAR *MyPwd, CHAR *PeerPwd ) /* Is this item used? */ if( ! Conf_Server[i].name[0] ) break; } - if( i >= MAX_SERVERS ) return FALSE; + if( i >= MAX_SERVERS ) return false; Init_Server_Struct( &Conf_Server[i] ); strlcpy( Conf_Server[i].name, Name, sizeof( Conf_Server[i].name )); @@ -323,16 +333,16 @@ Conf_AddServer( CHAR *Name, INT Port, CHAR *Host, CHAR *MyPwd, CHAR *PeerPwd ) Conf_Server[i].port = Port; Conf_Server[i].flags = CONF_SFLAG_ONCE; - return TRUE; + return true; } /* Conf_AddServer */ -LOCAL VOID -Set_Defaults( BOOLEAN InitServers ) +LOCAL void +Set_Defaults( bool InitServers ) { /* Initialize configuration variables with default values. */ - INT i; + int i; strcpy( Conf_ServerName, "" ); sprintf( Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION ); @@ -349,6 +359,8 @@ Set_Defaults( BOOLEAN InitServers ) strlcpy( Conf_Chroot, CHROOT_DIR, sizeof( Conf_Chroot )); + strlcpy( Conf_PidFile, PID_FILE, sizeof( Conf_PidFile )); + Conf_ListenPorts_Count = 0; strcpy( Conf_ListenAddress, "" ); @@ -362,7 +374,8 @@ Set_Defaults( BOOLEAN InitServers ) Conf_Oper_Count = 0; Conf_Channel_Count = 0; - Conf_OperCanMode = FALSE; + Conf_OperCanMode = false; + Conf_OperServerMode = false; Conf_MaxConnections = -1; Conf_MaxConnectionsIP = 5; @@ -373,13 +386,13 @@ Set_Defaults( BOOLEAN InitServers ) } /* Set_Defaults */ -LOCAL VOID -Read_Config( VOID ) +LOCAL void +Read_Config( void ) { /* Read configuration file. */ - CHAR section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; - INT line, i, n; + char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; + int line, i, n; FILE *fd; /* Open configuration file */ @@ -436,7 +449,7 @@ Read_Config( VOID ) New_Server_Idx = NONE; /* Read configuration file */ - while( TRUE ) + while( true ) { if( ! fgets( str, LINE_LEN, fd )) break; ngt_TrimStr( str ); @@ -456,8 +469,12 @@ Read_Config( VOID ) else { /* Initialize new operator structure */ - strcpy( Conf_Oper[Conf_Oper_Count].name, "" ); - strcpy( Conf_Oper[Conf_Oper_Count].pwd, "" ); + Conf_Oper[Conf_Oper_Count].name[0] = '\0'; + Conf_Oper[Conf_Oper_Count].pwd[0] = '\0'; + if (Conf_Oper[Conf_Oper_Count].mask) { + free(Conf_Oper[Conf_Oper_Count].mask ); + Conf_Oper[Conf_Oper_Count].mask = NULL; + } Conf_Oper_Count++; } continue; @@ -546,13 +563,24 @@ Read_Config( VOID ) } /* Read_Config */ -LOCAL VOID -Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) +LOCAL bool +Check_ArgIsTrue( const char *Arg ) +{ + if( strcasecmp( Arg, "yes" ) == 0 ) return true; + if( strcasecmp( Arg, "true" ) == 0 ) return true; + if( atoi( Arg ) != 0 ) return true; + + return false; +} /* Check_ArgIsTrue */ + + +LOCAL void +Handle_GLOBAL( int Line, char *Var, char *Arg ) { struct passwd *pwd; struct group *grp; - CHAR *ptr; - LONG port; + char *ptr; + long port; assert( Line > 0 ); assert( Var != NULL ); @@ -561,37 +589,43 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Name" ) == 0 ) { /* Server name */ - if( strlcpy( Conf_ServerName, Arg, sizeof( Conf_ServerName )) >= sizeof( Conf_ServerName )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Name\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_ServerName, Arg, sizeof( Conf_ServerName )) >= sizeof( Conf_ServerName )) + Config_Error_TooLong( Line, Var ); + return; } if( strcasecmp( Var, "Info" ) == 0 ) { /* Info text of server */ - if( strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo )) >= sizeof( Conf_ServerInfo )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Info\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo )) >= sizeof( Conf_ServerInfo )) + Config_Error_TooLong ( Line, Var ); + return; } if( strcasecmp( Var, "Password" ) == 0 ) { /* Global server password */ - if( strlcpy( Conf_ServerPwd, Arg, sizeof( Conf_ServerPwd )) >= sizeof( Conf_ServerPwd )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Password\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_ServerPwd, Arg, sizeof( Conf_ServerPwd )) >= sizeof( Conf_ServerPwd )) + Config_Error_TooLong( Line, Var ); + return; } if( strcasecmp( Var, "AdminInfo1" ) == 0 ) { /* Administrative info #1 */ - if( strlcpy( Conf_ServerAdmin1, Arg, sizeof( Conf_ServerAdmin1 )) >= sizeof( Conf_ServerAdmin1 )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"AdminInfo1\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_ServerAdmin1, Arg, sizeof( Conf_ServerAdmin1 )) >= sizeof( Conf_ServerAdmin1 )) Config_Error_TooLong ( Line, Var ); return; } if( strcasecmp( Var, "AdminInfo2" ) == 0 ) { /* Administrative info #2 */ - if( strlcpy( Conf_ServerAdmin2, Arg, sizeof( Conf_ServerAdmin2 )) >= sizeof( Conf_ServerAdmin2 )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"AdminInfo2\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_ServerAdmin2, Arg, sizeof( Conf_ServerAdmin2 )) >= sizeof( Conf_ServerAdmin2 )) Config_Error_TooLong ( Line, Var ); return; } if( strcasecmp( Var, "AdminEMail" ) == 0 ) { /* Administrative email contact */ - if( strlcpy( Conf_ServerAdminMail, Arg, sizeof( Conf_ServerAdminMail )) >= sizeof( Conf_ServerAdminMail )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"AdminEMail\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_ServerAdminMail, Arg, sizeof( Conf_ServerAdminMail )) >= sizeof( Conf_ServerAdminMail )) Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "Ports" ) == 0 ) @@ -606,7 +640,7 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) if( Conf_ListenPorts_Count + 1 > MAX_LISTEN_PORTS ) Config_Error( LOG_ERR, "Too many listen ports configured. Port %ld ignored.", port ); else { - if( port > 0 && port < 0xFFFF ) Conf_ListenPorts[Conf_ListenPorts_Count++] = (UINT)port; + if( port > 0 && port < 0xFFFF ) Conf_ListenPorts[Conf_ListenPorts_Count++] = (UINT16)port; else Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, port ); } ptr = strtok( NULL, "," ); @@ -616,21 +650,37 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "MotdFile" ) == 0 ) { /* "Message of the day" (MOTD) file */ - if( strlcpy( Conf_MotdFile, Arg, sizeof( Conf_MotdFile )) >= sizeof( Conf_MotdFile )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MotdFile\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_MotdFile, Arg, sizeof( Conf_MotdFile )) >= sizeof( Conf_MotdFile )) + Config_Error_TooLong( Line, Var ); + return; } if( strcasecmp( Var, "MotdPhrase" ) == 0 ) { /* "Message of the day" phrase (instead of file) */ - if( strlcpy( Conf_MotdPhrase, Arg, sizeof( Conf_MotdPhrase )) >= sizeof( Conf_MotdPhrase )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MotdPhrase\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_MotdPhrase, Arg, sizeof( Conf_MotdPhrase )) >= sizeof( Conf_MotdPhrase )) + Config_Error_TooLong( Line, Var ); + return; } if( strcasecmp( Var, "ChrootDir" ) == 0 ) { /* directory for chroot() */ - if( strlcpy( Conf_Chroot, Arg, sizeof( Conf_Chroot )) >= sizeof( Conf_Chroot )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"ChrootDir\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_Chroot, Arg, sizeof( Conf_Chroot )) >= sizeof( Conf_Chroot )) + Config_Error_TooLong( Line, Var ); + return; } + + if ( strcasecmp( Var, "PidFile" ) == 0 ) + { + /* name of pidfile */ + if( strlcpy( Conf_PidFile, Arg, sizeof( Conf_PidFile )) >= sizeof( Conf_PidFile )) + Config_Error_TooLong( Line, Var ); + + return; + } + if( strcasecmp( Var, "ServerUID" ) == 0 ) { /* UID the daemon should switch to */ @@ -639,10 +689,10 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) else { #ifdef HAVE_ISDIGIT - if( ! isdigit( (INT)*Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"ServerUID\" is not a number!", NGIRCd_ConfFile, Line ); + if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); else #endif - Conf_UID = (UINT)atoi( Arg ); + Conf_UID = (unsigned int)atoi( Arg ); } return; } @@ -654,10 +704,10 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) else { #ifdef HAVE_ISDIGIT - if( ! isdigit( (INT)*Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"ServerGID\" is not a number!", NGIRCd_ConfFile, Line ); + if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); else #endif - Conf_GID = (UINT)atoi( Arg ); + Conf_GID = (unsigned int)atoi( Arg ); } return; } @@ -697,17 +747,20 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "OperCanUseMode" ) == 0 ) { /* Are IRC operators allowed to use MODE in channels they aren't Op in? */ - if( strcasecmp( Arg, "yes" ) == 0 ) Conf_OperCanMode = TRUE; - else if( strcasecmp( Arg, "true" ) == 0 ) Conf_OperCanMode = TRUE; - else if( atoi( Arg ) != 0 ) Conf_OperCanMode = TRUE; - else Conf_OperCanMode = FALSE; + Conf_OperCanMode = Check_ArgIsTrue( Arg ); + return; + } + if( strcasecmp( Var, "OperServerMode" ) == 0 ) + { + /* Mask IRC operator as if coming from the server? (ircd-irc2 compat hack) */ + Conf_OperServerMode = Check_ArgIsTrue( Arg ); return; } if( strcasecmp( Var, "MaxConnections" ) == 0 ) { /* Maximum number of connections. Values <= 0 are equal to "no limit". */ #ifdef HAVE_ISDIGIT - if( ! isdigit( (INT)*Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MaxConnections\" is not a number!", NGIRCd_ConfFile, Line ); + if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var); else #endif Conf_MaxConnections = atol( Arg ); @@ -717,7 +770,7 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) { /* Maximum number of simoultanous connections from one IP. Values <= 0 are equal to "no limit". */ #ifdef HAVE_ISDIGIT - if( ! isdigit( (INT)*Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MaxConnectionsIP\" is not a number!", NGIRCd_ConfFile, Line ); + if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); else #endif Conf_MaxConnectionsIP = atoi( Arg ); @@ -727,7 +780,7 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) { /* Maximum number of channels a user can join. Values <= 0 are equal to "no limit". */ #ifdef HAVE_ISDIGIT - if( ! isdigit( (INT)*Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MaxJoins\" is not a number!", NGIRCd_ConfFile, Line ); + if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); else #endif Conf_MaxJoins = atoi( Arg ); @@ -738,7 +791,7 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) /* IP-Address to bind sockets */ if( strlcpy( Conf_ListenAddress, Arg, sizeof( Conf_ListenAddress )) >= sizeof( Conf_ListenAddress )) { - Config_Error( LOG_WARNING, "%s, line %d: Value of \"Listen\" too long!", NGIRCd_ConfFile, Line ); + Config_Error_TooLong( Line, Var ); } return; } @@ -747,9 +800,10 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) } /* Handle_GLOBAL */ -LOCAL VOID -Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) +LOCAL void +Handle_OPERATOR( int Line, char *Var, char *Arg ) { + unsigned int len; assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); @@ -758,24 +812,36 @@ Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Name" ) == 0 ) { /* Name of IRC operator */ - if( strlcpy( Conf_Oper[Conf_Oper_Count - 1].name, Arg, sizeof( Conf_Oper[Conf_Oper_Count - 1].name )) >= sizeof( Conf_Oper[Conf_Oper_Count - 1].name )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Name\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_Oper[Conf_Oper_Count - 1].name, Arg, sizeof( Conf_Oper[Conf_Oper_Count - 1].name )) >= sizeof( Conf_Oper[Conf_Oper_Count - 1].name )) Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "Password" ) == 0 ) { /* Password of IRC operator */ - if( strlcpy( Conf_Oper[Conf_Oper_Count - 1].pwd, Arg, sizeof( Conf_Oper[Conf_Oper_Count - 1].pwd )) >= sizeof( Conf_Oper[Conf_Oper_Count - 1].pwd )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Password\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_Oper[Conf_Oper_Count - 1].pwd, Arg, sizeof( Conf_Oper[Conf_Oper_Count - 1].pwd )) >= sizeof( Conf_Oper[Conf_Oper_Count - 1].pwd )) Config_Error_TooLong( Line, Var ); + return; + } + if( strcasecmp( Var, "Mask" ) == 0 ) + { + if (Conf_Oper[Conf_Oper_Count - 1].mask) return; /* Hostname already configured */ + len = strlen( Arg ) + 1; + Conf_Oper[Conf_Oper_Count - 1].mask = malloc( len ); + if (! Conf_Oper[Conf_Oper_Count - 1].mask) { + Config_Error( LOG_ERR, "%s, line %d: Cannot allocate memory for operator mask: %s", NGIRCd_ConfFile, Line, strerror(errno) ); + return; + } + + strlcpy( Conf_Oper[Conf_Oper_Count - 1].mask, Arg, len); return; } - Config_Error( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); } /* Handle_OPERATOR */ -LOCAL VOID -Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) +LOCAL void +Handle_SERVER( int Line, char *Var, char *Arg ) { - LONG port; + long port; assert( Line > 0 ); assert( Var != NULL ); @@ -787,32 +853,35 @@ Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Host" ) == 0 ) { /* Hostname of the server */ - if( strlcpy( New_Server.host, Arg, sizeof( New_Server.host )) >= sizeof( New_Server.host )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Host\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( New_Server.host, Arg, sizeof( New_Server.host )) >= sizeof( New_Server.host )) + Config_Error_TooLong ( Line, Var ); + return; } if( strcasecmp( Var, "Name" ) == 0 ) { /* Name of the server ("Nick"/"ID") */ - if( strlcpy( New_Server.name, Arg, sizeof( New_Server.name )) >= sizeof( New_Server.name )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Name\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( New_Server.name, Arg, sizeof( New_Server.name )) >= sizeof( New_Server.name )) + Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "MyPassword" ) == 0 ) { /* 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( LOG_WARNING, "%s, line %d: Value of \"MyPassword\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( New_Server.pwd_in, Arg, sizeof( New_Server.pwd_in )) >= sizeof( New_Server.pwd_in )) Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "PeerPassword" ) == 0 ) { /* 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( LOG_WARNING, "%s, line %d: Value of \"PeerPassword\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( New_Server.pwd_out, Arg, sizeof( New_Server.pwd_out )) >= sizeof( New_Server.pwd_out )) Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "Port" ) == 0 ) { /* Port to which this server should connect */ port = atol( Arg ); - if( port > 0 && port < 0xFFFF ) New_Server.port = (INT)port; + if( port > 0 && port < 0xFFFF ) New_Server.port = (UINT16)port; else Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, port ); return; } @@ -820,7 +889,7 @@ Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) { /* Server group */ #ifdef HAVE_ISDIGIT - if( ! isdigit( (INT)*Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Group\" is not a number!", NGIRCd_ConfFile, Line ); + if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var ); else #endif New_Server.group = atoi( Arg ); @@ -831,8 +900,8 @@ Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) } /* Handle_SERVER */ -LOCAL VOID -Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg ) +LOCAL void +Handle_CHANNEL( int Line, char *Var, char *Arg ) { assert( Line > 0 ); assert( Var != NULL ); @@ -841,19 +910,23 @@ Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Name" ) == 0 ) { /* Name of the channel */ - if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].name, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].name )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].name )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Name\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].name, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].name )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].name )) + Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "Modes" ) == 0 ) { /* Initial modes */ - if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].modes, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].modes )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].modes )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Modes\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].modes, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].modes )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].modes )) + Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "Topic" ) == 0 ) { /* Initial topic */ - if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].topic, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].topic )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].topic )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Topic\" too long!", NGIRCd_ConfFile, Line ); + if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].topic, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].topic )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].topic )) + Config_Error_TooLong( Line, Var ); + return; } @@ -861,13 +934,13 @@ Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg ) } /* Handle_CHANNEL */ -LOCAL VOID -Validate_Config( BOOLEAN Configtest ) +LOCAL void +Validate_Config( bool Configtest ) { /* Validate configuration settings. */ #ifdef DEBUG - INT i, servers, servers_once; + int i, servers, servers_once; #endif if( ! Conf_ServerName[0] ) @@ -911,9 +984,9 @@ Validate_Config( BOOLEAN Configtest ) Config_Error( LOG_WARNING, "No administrative information configured but required by RFC!" ); } #ifdef FD_SETSIZE - if(( Conf_MaxConnections > (LONG)FD_SETSIZE ) || ( Conf_MaxConnections < 1 )) + if(( Conf_MaxConnections > (long)FD_SETSIZE ) || ( Conf_MaxConnections < 1 )) { - Conf_MaxConnections = (LONG)FD_SETSIZE; + Conf_MaxConnections = (long)FD_SETSIZE; Config_Error( LOG_ERR, "Setting MaxConnections to %ld, select() can't handle more file descriptors!", Conf_MaxConnections ); } #else @@ -935,18 +1008,30 @@ Validate_Config( BOOLEAN Configtest ) } /* Validate_Config */ +LOCAL void +Config_Error_TooLong ( const int Line, const char *Item ) +{ + Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" too long!", NGIRCd_ConfFile, Line, Item ); +} + +LOCAL void +Config_Error_NaN( const int Line, const char *Item ) +{ + Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" is not a number!", NGIRCd_ConfFile, Line, Item ); +} + #ifdef PROTOTYPES -LOCAL VOID Config_Error( CONST INT Level, CONST CHAR *Format, ... ) +LOCAL void Config_Error( const int Level, const char *Format, ... ) #else -LOCAL VOID Config_Error( Level, Format, va_alist ) -CONST INT Level; -CONST CHAR *Format; +LOCAL void Config_Error( Level, Format, va_alist ) +const int Level; +const char *Format; va_dcl #endif { /* Error! Write to console and/or logfile. */ - CHAR msg[MAX_LOG_MSG_LEN]; + char msg[MAX_LOG_MSG_LEN]; va_list ap; assert( Format != NULL ); @@ -967,24 +1052,20 @@ va_dcl } /* Config_Error */ -LOCAL VOID +LOCAL void Init_Server_Struct( CONF_SERVER *Server ) { /* Initialize server configuration structur to default values */ assert( Server != NULL ); - strcpy( Server->host, "" ); - strcpy( Server->ip, "" ); - strcpy( Server->name, "" ); - strcpy( Server->pwd_in, "" ); - strcpy( Server->pwd_out, "" ); - Server->port = 0; + memset( Server, 0, sizeof (CONF_SERVER) ); + Server->group = NONE; Server->lasttry = time( NULL ) - Conf_ConnectRetry + STARTUP_DELAY; - Server->res_stat = NULL; + if( NGIRCd_Passive ) Server->flags = CONF_SFLAG_DISABLED; - else Server->flags = 0; + Server->conn_id = NONE; } /* Init_Server_Struct */