X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=976d2e0d0f1bcb6f81ab8d8461f4a230b11fbc7f;hp=d17168c3348e731c75433478947f91084beb8f3a;hb=bc09a3e4876bd92b1c5c8706203ce85c54e180d6;hpb=2981fe9eb707b340107b5131018805ee2a469950 diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index d17168c3..976d2e0d 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -14,15 +14,20 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conf.c,v 1.61 2003/11/05 21:41:02 alex Exp $"; +static char UNUSED id[] = "$Id: conf.c,v 1.88 2005/10/11 19:29:23 alex Exp $"; #include "imp.h" #include #include -#include +#ifdef PROTOTYPES +# include +#else +# include +#endif #include #include #include +#include #include #include #include @@ -33,6 +38,7 @@ static char UNUSED id[] = "$Id: conf.c,v 1.61 2003/11/05 21:41:02 alex Exp $"; # include #endif +#include "array.h" #include "ngircd.h" #include "conn.h" #include "client.h" @@ -45,113 +51,172 @@ static char UNUSED id[] = "$Id: conf.c,v 1.61 2003/11/05 21:41:02 alex Exp $"; #include "conf.h" -LOCAL BOOLEAN Use_Log = TRUE; -LOCAL CONF_SERVER New_Server; -LOCAL INT New_Server_Idx; +static bool Use_Log = true; +static CONF_SERVER New_Server; +static int New_Server_Idx; + + +static void Set_Defaults PARAMS(( bool InitServers )); +static void Read_Config PARAMS(( void )); +static void Validate_Config PARAMS(( bool TestOnly )); + +static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg )); +static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg )); +static void Handle_SERVER PARAMS(( int Line, char *Var, char *Arg )); +static void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg )); + +static void Config_Error PARAMS(( const int Level, const char *Format, ... )); + +static void Config_Error_NaN PARAMS(( const int LINE, const char *Value )); +static void Config_Error_TooLong PARAMS(( const int LINE, const char *Value )); + +static void Init_Server_Struct PARAMS(( CONF_SERVER *Server )); + + +static char * +strdup_warn(const char *str) +{ + char *ptr = strdup(str); + if (!ptr) + Config_Error(LOG_ERR, "Could not allocate mem for string: %s", str); + return ptr; +} -LOCAL VOID Set_Defaults PARAMS(( BOOLEAN InitServers )); -LOCAL VOID Read_Config PARAMS(( VOID )); -LOCAL VOID Validate_Config PARAMS(( BOOLEAN TestOnly )); +static void +ports_puts(array *a) +{ + unsigned int len; + UINT16 *ports; + len = array_length(a, sizeof(UINT16)); + if (len--) { + ports = (UINT16*) array_start(a); + printf("%u", (unsigned int) *ports); + while (len--) { + ports++; + printf(", %u", (unsigned int) *ports); + } + } + putc('\n', stdout); +} -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, ... )); +static void +ports_parse(array *a, int Line, char *Arg) +{ + char *ptr; + int port; + UINT16 port16; + + array_trunc(a); + + /* Ports on that the server should listen. More port numbers + * must be separated by "," */ + ptr = strtok( Arg, "," ); + while (ptr) { + ngt_TrimStr( ptr ); + port = atol( ptr ); + if (port > 0 && port < 0xFFFF) { + port16 = (UINT16) port; + if (!array_catb(a, (char*)&port16, sizeof port16)) + Config_Error(LOG_ERR, "%s, line %d Could not add port number %ld: %s", + NGIRCd_ConfFile, Line, port, strerror(errno)); + } else { + Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!", + NGIRCd_ConfFile, Line, port ); + } -LOCAL VOID Init_Server_Struct PARAMS(( CONF_SERVER *Server )); + ptr = strtok( NULL, "," ); + } +} -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; + unsigned int i; + char *topic; - 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 ))) - { + /* If stdin and stdout ("you can read our nice message and we can + * read in your keypress") are valid tty's, wait for a key: */ + if( isatty( fileno( stdin )) && isatty( fileno( stdout ))) { puts( "OK, press enter to see a dump of your service configuration ..." ); getchar( ); + } else { + puts( "Ok, dump of your server configuration follows:\n" ); } - 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( " Ports = " ); - for( i = 0; i < Conf_ListenPorts_Count; i++ ) - { - if( i != 0 ) printf( ", " ); - printf( "%u", Conf_ListenPorts[i] ); - } - puts( "" ); + printf( " MotdPhrase = %s\n", Conf_MotdPhrase ); + printf( " ChrootDir = %s\n", Conf_Chroot ); + printf( " PidFile = %s\n", Conf_PidFile); + fputs(" Ports = ", stdout); + + ports_puts(&Conf_ListenPorts); + 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" ); - 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 ); - else printf( " MaxConnectionsIP = -1\n" ); - if( Conf_MaxJoins > 0 ) printf( " MaxJoins = %d\n", Conf_MaxJoins ); - else printf( " MaxJoins = -1\n" ); - puts( "" ); - - for( i = 0; i < Conf_Oper_Count; i++ ) - { + printf( " OperCanUseMode = %s\n", Conf_OperCanMode == true? "yes" : "no" ); + printf( " OperServerMode = %s\n", Conf_OperServerMode == true? "yes" : "no" ); + printf( " MaxConnections = %ld\n", Conf_MaxConnections>0 ? Conf_MaxConnections : -1); + printf( " MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP>0 ? Conf_MaxConnectionsIP : -1); + printf( " MaxJoins = %d\n\n", Conf_MaxJoins>0 ? Conf_MaxJoins : -1); + + for( i = 0; i < Conf_Oper_Count; i++ ) { if( ! Conf_Oper[i].name[0] ) continue; /* Valid "Operator" section */ 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( "" ); } - for( i = 0; i < MAX_SERVERS; i++ ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { if( ! Conf_Server[i].name[0] ) continue; /* Valid "Server" section */ @@ -161,27 +226,26 @@ Conf_Test( VOID ) printf( " Port = %d\n", Conf_Server[i].port ); printf( " MyPassword = %s\n", Conf_Server[i].pwd_in ); printf( " PeerPassword = %s\n", Conf_Server[i].pwd_out ); - printf( " Group = %d\n", Conf_Server[i].group ); - puts( "" ); + printf( " Group = %d\n\n", Conf_Server[i].group ); } - for( i = 0; i < Conf_Channel_Count; i++ ) - { + for( i = 0; i < Conf_Channel_Count; i++ ) { if( ! Conf_Channel[i].name[0] ) continue; /* Valid "Channel" section */ puts( "[CHANNEL]" ); printf( " Name = %s\n", Conf_Channel[i].name ); printf( " Modes = %s\n", Conf_Channel[i].modes ); - printf( " Topic = %s\n", Conf_Channel[i].topic ); - puts( "" ); + + topic = (char*)array_start(&Conf_Channel[i].topic); + printf( " Topic = %s\n\n", topic ? topic : ""); } return 0; } /* Conf_Test */ -GLOBAL VOID +GLOBAL void Conf_UnsetServer( CONN_ID Idx ) { /* Set next time for next connection attempt, if this is a server @@ -189,36 +253,36 @@ Conf_UnsetServer( CONN_ID Idx ) * "once", delete it from our configuration. * Non-Server-Connections will be silently ignored. */ - INT i; + int i; + time_t t; /* Check all our configured servers */ - for( i = 0; i < MAX_SERVERS; i++ ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { if( Conf_Server[i].conn_id != Idx ) continue; /* Gotcha! Mark server configuration as "unused": */ Conf_Server[i].conn_id = NONE; - if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) - { + if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) { /* Delete configuration here */ Init_Server_Struct( &Conf_Server[i] ); - } - else - { + } else { /* Set time for next connect attempt */ - if( Conf_Server[i].lasttry < time( NULL ) - Conf_ConnectRetry ) - { - /* Okay, the connection was established "long enough": */ - Conf_Server[i].lasttry = time( NULL ) - Conf_ConnectRetry + RECONNECT_DELAY; - } + t = time(NULL); + if (Conf_Server[i].lasttry < t - Conf_ConnectRetry) { + /* The connection has been "long", so we don't + * require the next attempt to be delayed. */ + Conf_Server[i].lasttry = + t - Conf_ConnectRetry + RECONNECT_DELAY; + } else + Conf_Server[i].lasttry = t; } } } /* 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 */ @@ -229,75 +293,70 @@ 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 ); - for( i = 0; i < MAX_SERVERS; i++ ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { if( Conf_Server[i].conn_id == Idx ) return i; } return NONE; } /* 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 ); - for( i = 0; i < MAX_SERVERS; i++ ) - { - if( strcasecmp( Conf_Server[i].name, Name ) == 0 ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { + if( strcasecmp( Conf_Server[i].name, Name ) == 0 ) { /* 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 ); - for( i = 0; i < MAX_SERVERS; i++ ) - { - if( strcasecmp( Conf_Server[i].name, Name ) == 0 ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { + if( strcasecmp( Conf_Server[i].name, Name ) == 0 ) { /* 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 ); @@ -305,12 +364,11 @@ Conf_AddServer( CHAR *Name, INT Port, CHAR *Host, CHAR *MyPwd, CHAR *PeerPwd ) assert( PeerPwd != NULL ); /* Search unused item in server configuration structure */ - for( i = 0; i < MAX_SERVERS; i++ ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { /* 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 )); @@ -320,19 +378,19 @@ 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 ) +static 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 ); + snprintf( Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION ); strcpy( Conf_ServerPwd, "" ); strcpy( Conf_ServerAdmin1, "" ); @@ -342,7 +400,12 @@ Set_Defaults( BOOLEAN InitServers ) strlcpy( Conf_MotdFile, SYSCONFDIR, sizeof( Conf_MotdFile )); strlcat( Conf_MotdFile, MOTD_FILE, sizeof( Conf_MotdFile )); - Conf_ListenPorts_Count = 0; + strlcpy( Conf_MotdPhrase, MOTD_PHRASE, sizeof( Conf_MotdPhrase )); + + strlcpy( Conf_Chroot, CHROOT_DIR, sizeof( Conf_Chroot )); + + strlcpy( Conf_PidFile, PID_FILE, sizeof( Conf_PidFile )); + strcpy( Conf_ListenAddress, "" ); Conf_UID = Conf_GID = 0; @@ -355,7 +418,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; @@ -366,21 +430,22 @@ Set_Defaults( BOOLEAN InitServers ) } /* Set_Defaults */ -LOCAL VOID -Read_Config( VOID ) +static 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; + const UINT16 defaultport = 6667; + int line, i, n; FILE *fd; /* Open configuration file */ fd = fopen( NGIRCd_ConfFile, "r" ); - if( ! fd ) - { + if( ! fd ) { /* No configuration file found! */ - Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s", NGIRCd_ConfFile, strerror( errno )); + Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s", + NGIRCd_ConfFile, strerror( errno )); Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); exit( 1 ); } @@ -393,28 +458,24 @@ Read_Config( VOID ) * And delete all servers which are "duplicates" of servers * that are already marked as "once" (such servers have been * created by the last rehash but are now useless). */ - for( i = 0; i < MAX_SERVERS; i++ ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { if( Conf_Server[i].conn_id == NONE ) Init_Server_Struct( &Conf_Server[i] ); - else - { + else { /* This structure is in use ... */ - if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) - { + if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) { /* Check for duplicates */ - for( n = 0; n < MAX_SERVERS; n++ ) - { + for( n = 0; n < MAX_SERVERS; n++ ) { if( n == i ) continue; - if( Conf_Server[i].conn_id == Conf_Server[n].conn_id ) - { + if( Conf_Server[i].conn_id == Conf_Server[n].conn_id ) { Init_Server_Struct( &Conf_Server[n] ); - Log( LOG_DEBUG, "Deleted unused duplicate server %d (kept %d).", n, i ); +#ifdef DEBUG + Log(LOG_DEBUG,"Deleted unused duplicate server %d (kept %d).", + n, i ); +#endif } } - } - else - { + } else { /* Mark server as "once" */ Conf_Server[i].flags |= CONF_SFLAG_ONCE; Log( LOG_DEBUG, "Marked server %d as \"once\"", i ); @@ -429,8 +490,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 ); line++; @@ -439,27 +499,29 @@ Read_Config( VOID ) if( str[0] == ';' || str[0] == '#' || str[0] == '\0' ) continue; /* Is this the beginning of a new section? */ - if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' )) - { + if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' )) { strlcpy( section, str, sizeof( section )); - if( strcasecmp( section, "[GLOBAL]" ) == 0 ) continue; - if( strcasecmp( section, "[OPERATOR]" ) == 0 ) - { - if( Conf_Oper_Count + 1 > MAX_OPERATORS ) Config_Error( LOG_ERR, "Too many operators configured." ); - else - { + if( strcasecmp( section, "[GLOBAL]" ) == 0 ) + continue; + + if( strcasecmp( section, "[OPERATOR]" ) == 0 ) { + if( Conf_Oper_Count + 1 > MAX_OPERATORS ) + Config_Error( LOG_ERR, "Too many operators configured."); + 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; } - if( strcasecmp( section, "[SERVER]" ) == 0 ) - { + if( strcasecmp( section, "[SERVER]" ) == 0 ) { /* Check if there is already a server to add */ - if( New_Server.name[0] ) - { + if( New_Server.name[0] ) { /* Copy data to "real" server structure */ assert( New_Server_Idx > NONE ); Conf_Server[New_Server_Idx] = New_Server; @@ -469,13 +531,11 @@ Read_Config( VOID ) Init_Server_Struct( &New_Server ); /* Search unused item in server configuration structure */ - for( i = 0; i < MAX_SERVERS; i++ ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { /* Is this item used? */ if( ! Conf_Server[i].name[0] ) break; } - if( i >= MAX_SERVERS ) - { + if( i >= MAX_SERVERS ) { /* Oops, no free item found! */ Config_Error( LOG_ERR, "Too many servers configured." ); New_Server_Idx = NONE; @@ -483,15 +543,14 @@ Read_Config( VOID ) else New_Server_Idx = i; continue; } - if( strcasecmp( section, "[CHANNEL]" ) == 0 ) - { - if( Conf_Channel_Count + 1 > MAX_DEFCHANNELS ) Config_Error( LOG_ERR, "Too many pre-defined channels configured." ); - else - { + if( strcasecmp( section, "[CHANNEL]" ) == 0 ) { + if( Conf_Channel_Count + 1 > MAX_DEFCHANNELS ) { + Config_Error( LOG_ERR, "Too many pre-defined channels configured." ); + } else { /* Initialize new channel structure */ strcpy( Conf_Channel[Conf_Channel_Count].name, "" ); strcpy( Conf_Channel[Conf_Channel_Count].modes, "" ); - strcpy( Conf_Channel[Conf_Channel_Count].topic, "" ); + array_free(&Conf_Channel[Conf_Channel_Count].topic); Conf_Channel_Count++; } continue; @@ -503,8 +562,7 @@ Read_Config( VOID ) /* Split line into variable name and parameters */ ptr = strchr( str, '=' ); - if( ! ptr ) - { + if( ! ptr ) { Config_Error( LOG_ERR, "%s, line %d: Syntax error!", NGIRCd_ConfFile, line ); continue; } @@ -523,240 +581,270 @@ Read_Config( VOID ) fclose( fd ); /* Check if there is still a server to add */ - if( New_Server.name[0] ) - { + if( New_Server.name[0] ) { /* Copy data to "real" server structure */ assert( New_Server_Idx > NONE ); Conf_Server[New_Server_Idx] = New_Server; } - - /* If there are no ports configured use the default: 6667 */ - if( Conf_ListenPorts_Count < 1 ) - { - Conf_ListenPorts_Count = 1; - Conf_ListenPorts[0] = 6667; + + if (0 == array_length(&Conf_ListenPorts, sizeof(UINT16))) { + if (!array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport)) { + Config_Error( LOG_ALERT, "Could not add default listening Port %u: %s", + (unsigned int) defaultport, strerror(errno)); + exit( 1 ); + } } } /* Read_Config */ -LOCAL VOID -Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) +static 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 */ + + +static void +Handle_GLOBAL( int Line, char *Var, char *Arg ) { struct passwd *pwd; struct group *grp; - CHAR *ptr; - LONG port; + size_t len; assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); - if( strcasecmp( Var, "Name" ) == 0 ) - { + 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 ); + len = strlcpy( Conf_ServerName, Arg, sizeof( Conf_ServerName )); + if (len >= sizeof( Conf_ServerName )) + Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "Info" ) == 0 ) - { + 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 ); + len = strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo )); + if (len >= sizeof( Conf_ServerInfo )) + Config_Error_TooLong ( Line, Var ); return; } - if( strcasecmp( Var, "Password" ) == 0 ) - { + 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 ); + len = strlcpy( Conf_ServerPwd, Arg, sizeof( Conf_ServerPwd )); + if (len >= sizeof( Conf_ServerPwd )) + Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "AdminInfo1" ) == 0 ) - { + 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 ); + len = strlcpy( Conf_ServerAdmin1, Arg, sizeof( Conf_ServerAdmin1 )); + if (len >= sizeof( Conf_ServerAdmin1 )) + Config_Error_TooLong ( Line, Var ); return; } - if( strcasecmp( Var, "AdminInfo2" ) == 0 ) - { + 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 ); + len = strlcpy( Conf_ServerAdmin2, Arg, sizeof( Conf_ServerAdmin2 )); + if (len >= sizeof( Conf_ServerAdmin2 )) + Config_Error_TooLong ( Line, Var ); return; } - if( strcasecmp( Var, "AdminEMail" ) == 0 ) - { + 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 ); - return; - } - if( strcasecmp( Var, "Ports" ) == 0 ) - { - /* Ports on that the server should listen. More port numbers - * must be separated by "," */ - ptr = strtok( Arg, "," ); - while( ptr ) - { - ngt_TrimStr( ptr ); - port = atol( ptr ); - 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; - else Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, port ); - } - ptr = strtok( NULL, "," ); - } + len = strlcpy( Conf_ServerAdminMail, Arg, sizeof( Conf_ServerAdminMail )); + if (len >= sizeof( Conf_ServerAdminMail )) + Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "MotdFile" ) == 0 ) - { + + if( strcasecmp( Var, "Ports" ) == 0 ) { + ports_parse(&Conf_ListenPorts, Line, Arg); + return; + } + 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 ); + len = strlcpy( Conf_MotdFile, Arg, sizeof( Conf_MotdFile )); + if (len >= sizeof( Conf_MotdFile )) + Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "ServerUID" ) == 0 ) - { + if( strcasecmp( Var, "MotdPhrase" ) == 0 ) { + /* "Message of the day" phrase (instead of file) */ + len = strlcpy( Conf_MotdPhrase, Arg, sizeof( Conf_MotdPhrase )); + if (len >= sizeof( Conf_MotdPhrase )) + Config_Error_TooLong( Line, Var ); + return; + } + if( strcasecmp( Var, "ChrootDir" ) == 0 ) { + /* directory for chroot() */ + len = strlcpy( Conf_Chroot, Arg, sizeof( Conf_Chroot )); + if (len >= sizeof( Conf_Chroot )) + Config_Error_TooLong( Line, Var ); + return; + } + if ( strcasecmp( Var, "PidFile" ) == 0 ) { + /* name of pidfile */ + len = strlcpy( Conf_PidFile, Arg, sizeof( Conf_PidFile )); + if (len >= sizeof( Conf_PidFile )) + Config_Error_TooLong( Line, Var ); + return; + } + if( strcasecmp( Var, "ServerUID" ) == 0 ) { /* UID the daemon should switch to */ pwd = getpwnam( Arg ); if( pwd ) Conf_UID = pwd->pw_uid; - else - { + else { #ifdef HAVE_ISDIGIT - if( ! isdigit( *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; } - if( strcasecmp( Var, "ServerGID" ) == 0 ) - { + if( strcasecmp( Var, "ServerGID" ) == 0 ) { /* GID the daemon should use */ grp = getgrnam( Arg ); if( grp ) Conf_GID = grp->gr_gid; - else - { + else { #ifdef HAVE_ISDIGIT - if( ! isdigit( *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; } - if( strcasecmp( Var, "PingTimeout" ) == 0 ) - { + if( strcasecmp( Var, "PingTimeout" ) == 0 ) { /* PING timeout */ Conf_PingTimeout = atoi( Arg ); - if( Conf_PingTimeout < 5 ) - { - Config_Error( LOG_WARNING, "%s, line %d: Value of \"PingTimeout\" too low!", NGIRCd_ConfFile, Line ); + if( Conf_PingTimeout < 5 ) { + Config_Error( LOG_WARNING, "%s, line %d: Value of \"PingTimeout\" too low!", + NGIRCd_ConfFile, Line ); Conf_PingTimeout = 5; } return; } - if( strcasecmp( Var, "PongTimeout" ) == 0 ) - { + if( strcasecmp( Var, "PongTimeout" ) == 0 ) { /* PONG timeout */ Conf_PongTimeout = atoi( Arg ); - if( Conf_PongTimeout < 5 ) - { - Config_Error( LOG_WARNING, "%s, line %d: Value of \"PongTimeout\" too low!", NGIRCd_ConfFile, Line ); + if( Conf_PongTimeout < 5 ) { + Config_Error( LOG_WARNING, "%s, line %d: Value of \"PongTimeout\" too low!", + NGIRCd_ConfFile, Line ); Conf_PongTimeout = 5; } return; } - if( strcasecmp( Var, "ConnectRetry" ) == 0 ) - { + if( strcasecmp( Var, "ConnectRetry" ) == 0 ) { /* Seconds between connection attempts to other servers */ Conf_ConnectRetry = atoi( Arg ); - if( Conf_ConnectRetry < 5 ) - { - Config_Error( LOG_WARNING, "%s, line %d: Value of \"ConnectRetry\" too low!", NGIRCd_ConfFile, Line ); + if( Conf_ConnectRetry < 5 ) { + Config_Error( LOG_WARNING, "%s, line %d: Value of \"ConnectRetry\" too low!", + NGIRCd_ConfFile, Line ); Conf_ConnectRetry = 5; } return; } - if( strcasecmp( Var, "OperCanUseMode" ) == 0 ) - { + 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, "MaxConnections" ) == 0 ) - { + 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( *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 ); return; } - if( strcasecmp( Var, "MaxConnectionsIP" ) == 0 ) - { - /* Maximum number of simoultanous connections from one IP. Values <= 0 are equal to "no limit". */ + if( strcasecmp( Var, "MaxConnectionsIP" ) == 0 ) { + /* Maximum number of simultaneous connections from one IP. Values <= 0 -> "no limit" */ #ifdef HAVE_ISDIGIT - if( ! isdigit( *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 ); return; } - if( strcasecmp( Var, "MaxJoins" ) == 0 ) - { + if( strcasecmp( Var, "MaxJoins" ) == 0 ) { /* Maximum number of channels a user can join. Values <= 0 are equal to "no limit". */ #ifdef HAVE_ISDIGIT - if( ! isdigit( *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 ); return; } - if( strcasecmp( Var, "Listen" ) == 0 ) - { + if( strcasecmp( Var, "Listen" ) == 0 ) { /* 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 ); - } + len = strlcpy( Conf_ListenAddress, Arg, sizeof( Conf_ListenAddress )); + if (len >= sizeof( Conf_ListenAddress )) + Config_Error_TooLong( Line, Var ); return; } - Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); + Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", + NGIRCd_ConfFile, Line, Var ); } /* Handle_GLOBAL */ -LOCAL VOID -Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) +static void +Handle_OPERATOR( int Line, char *Var, char *Arg ) { + unsigned int opercount; + size_t len; assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); assert( Conf_Oper_Count > 0 ); - if( strcasecmp( Var, "Name" ) == 0 ) - { + if ( Conf_Oper_Count == 0 ) + return; + + opercount = Conf_Oper_Count - 1; + + 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 ); + len = strlcpy( Conf_Oper[opercount].name, Arg, sizeof( Conf_Oper[opercount].name )); + if (len >= sizeof( Conf_Oper[opercount].name )) + Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "Password" ) == 0 ) - { + 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 ); + len = strlcpy( Conf_Oper[opercount].pwd, Arg, sizeof( Conf_Oper[opercount].pwd )); + if (len >= sizeof( Conf_Oper[opercount].pwd )) + Config_Error_TooLong( Line, Var ); return; } - - Config_Error( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); + if( strcasecmp( Var, "Mask" ) == 0 ) { + if (Conf_Oper[opercount].mask) return; /* Hostname already configured */ + + Conf_Oper[opercount].mask = strdup_warn( Arg ); + 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 ) +static void +Handle_SERVER( int Line, char *Var, char *Arg ) { - LONG port; + long port; + size_t len; assert( Line > 0 ); assert( Var != NULL ); @@ -765,169 +853,185 @@ Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) /* Ignore server block if no space is left in server configuration structure */ if( New_Server_Idx <= NONE ) return; - if( strcasecmp( Var, "Host" ) == 0 ) - { + 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 ); + len = strlcpy( New_Server.host, Arg, sizeof( New_Server.host )); + if (len >= sizeof( New_Server.host )) + Config_Error_TooLong ( Line, Var ); return; } - if( strcasecmp( Var, "Name" ) == 0 ) - { + 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 ); + len = strlcpy( New_Server.name, Arg, sizeof( New_Server.name )); + if (len >= sizeof( New_Server.name )) + Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "MyPassword" ) == 0 ) - { + 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 (*Arg == ':') { + Config_Error(LOG_ERR, + "%s, line %d (section \"Server\"): MyPassword must not start with ':'!", + NGIRCd_ConfFile, Line); + } + 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; } - if( strcasecmp( Var, "PeerPassword" ) == 0 ) - { + 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 ); + 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; } - if( strcasecmp( Var, "Port" ) == 0 ) - { + 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; - else Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, 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; } - if( strcasecmp( Var, "Group" ) == 0 ) - { + if( strcasecmp( Var, "Group" ) == 0 ) { /* Server group */ #ifdef HAVE_ISDIGIT - if( ! isdigit( *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 ); 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 */ -LOCAL VOID -Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg ) +static void +Handle_CHANNEL( int Line, char *Var, char *Arg ) { + size_t len; + size_t chancount = 0; + assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); + if (Conf_Channel_Count > 0) + chancount = Conf_Channel_Count - 1; - if( strcasecmp( Var, "Name" ) == 0 ) - { + 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 ); + len = strlcpy( Conf_Channel[chancount].name, Arg, sizeof( Conf_Channel[chancount].name )); + if (len >= sizeof( Conf_Channel[chancount].name )) + Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "Modes" ) == 0 ) - { + 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 ); + len = strlcpy( Conf_Channel[chancount].modes, Arg, sizeof( Conf_Channel[chancount].modes )); + if (len >= sizeof( Conf_Channel[chancount].modes )) + Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "Topic" ) == 0 ) - { + 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 (!array_copys( &Conf_Channel[chancount].topic, Arg)) + Config_Error_TooLong( Line, Var ); return; } - Config_Error( LOG_ERR, "%s, line %d (section \"Channel\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); + Config_Error( LOG_ERR, "%s, line %d (section \"Channel\"): Unknown variable \"%s\"!", + NGIRCd_ConfFile, Line, Var ); } /* Handle_CHANNEL */ -LOCAL VOID -Validate_Config( BOOLEAN Configtest ) +static 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] ) - { + if( ! Conf_ServerName[0] ) { /* No server name configured! */ - Config_Error( LOG_ALERT, "No server name configured in \"%s\" ('ServerName')!", NGIRCd_ConfFile ); - if( ! Configtest ) - { + Config_Error( LOG_ALERT, "No server name configured in \"%s\" (section 'Global': 'Name')!", + NGIRCd_ConfFile ); + if( ! Configtest ) { Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); exit( 1 ); } } - if( ! strchr( Conf_ServerName, '.' )) - { + if( Conf_ServerName[0] && ! strchr( Conf_ServerName, '.' )) { /* No dot in server name! */ - Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" ('ServerName'): Dot missing!", NGIRCd_ConfFile ); - if( ! Configtest ) - { + Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!", NGIRCd_ConfFile ); + if( ! Configtest ) { Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); exit( 1 ); } } #ifdef STRICT_RFC - if( ! Conf_ServerAdminMail[0] ) - { + if( ! Conf_ServerAdminMail[0] ) { /* No administrative contact configured! */ Config_Error( LOG_ALERT, "No administrator email address configured in \"%s\" ('AdminEMail')!", NGIRCd_ConfFile ); - if( ! Configtest ) - { + if( ! Configtest ) { Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); exit( 1 ); } } #endif - if( ! Conf_ServerAdmin1[0] && ! Conf_ServerAdmin2[0] && ! Conf_ServerAdminMail[0] ) - { + if( ! Conf_ServerAdmin1[0] && ! Conf_ServerAdmin2[0] && ! Conf_ServerAdminMail[0] ) { /* No administrative information configured! */ Config_Error( LOG_WARNING, "No administrative information configured but required by RFC!" ); } -#ifdef FD_SETSIZE - if(( Conf_MaxConnections > (LONG)FD_SETSIZE ) || ( Conf_MaxConnections < 1 )) - { - Conf_MaxConnections = (LONG)FD_SETSIZE; - Config_Error( LOG_ERR, "Setting MaxConnections to %ld, select() can't handle more file descriptors!", Conf_MaxConnections ); - } -#else - Config_Error( LOG_WARN, "Don't know how many file descriptors select() can handle on this system, don't set MaxConnections too high!" ); -#endif - #ifdef DEBUG servers = servers_once = 0; - for( i = 0; i < MAX_SERVERS; i++ ) - { - if( Conf_Server[i].name[0] ) - { + for( i = 0; i < MAX_SERVERS; i++ ) { + if( Conf_Server[i].name[0] ) { servers++; if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) servers_once++; } } - Log( LOG_DEBUG, "Configuration: Operators=%d, Servers=%d[%d], Channels=%d", Conf_Oper_Count, servers, servers_once, Conf_Channel_Count ); + Log( LOG_DEBUG, "Configuration: Operators=%d, Servers=%d[%d], Channels=%d", + Conf_Oper_Count, servers, servers_once, Conf_Channel_Count ); #endif } /* Validate_Config */ +static 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 ); +} + +static 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, ... ) +static void Config_Error( const int Level, const char *Format, ... ) #else -LOCAL VOID Config_Error( Level, Format, va_alist ) -CONST INT Level; -CONST CHAR *Format; +static 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 ); @@ -943,29 +1047,25 @@ va_dcl /* During "normal operations" the log functions of the daemon should * be used, but during testing of the configuration file, all messages * should go directly to the console: */ - if( Use_Log ) Log( Level, "%s", msg ); + if (Use_Log) Log( Level, "%s", msg ); else puts( msg ); } /* Config_Error */ -LOCAL VOID +static 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 */