X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=554fee4a92d12e973c8b1f94864c8360e1dff6cf;hp=3239dd140d70692acb90a6528a1b170d642d15a6;hb=4ed2cb1a0248130f476ff9afd4fd4ed887fee376;hpb=feb31e4200b42e0a5e9fb9637fa5f03c7ec05fcb diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 3239dd14..554fee4a 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conf.c,v 1.104 2008/02/26 22:04:17 fw Exp $"; +static char UNUSED id[] = "$Id: conf.c,v 1.105 2008/03/18 20:12:47 fw Exp $"; #include "imp.h" #include @@ -56,8 +56,20 @@ static CONF_SERVER New_Server; static int New_Server_Idx; +#ifdef WANT_IPV6 +/* + * these options appeared in ngircd 0.12; they are here + * for backwards compatibility. They should be removed + * in the future. Instead of setting these options, + * the "Listen" option should be set accordingly. + */ +static bool Conf_ListenIPv6; +static bool Conf_ListenIPv4; +#endif + + static void Set_Defaults PARAMS(( bool InitServers )); -static void Read_Config PARAMS(( void )); +static bool Read_Config PARAMS(( bool ngircd_starting )); static void Validate_Config PARAMS(( bool TestOnly, bool Rehash )); static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg )); @@ -134,24 +146,33 @@ ports_parse(array *a, int Line, char *Arg) GLOBAL void Conf_Init( void ) { - Set_Defaults( true ); - Read_Config( ); + Read_Config( true ); Validate_Config(false, false); } /* Config_Init */ -GLOBAL void +GLOBAL bool Conf_Rehash( void ) { - Set_Defaults( false ); - Read_Config( ); + if (!Read_Config(false)) + return false; Validate_Config(false, true); /* Update CLIENT structure of local server */ Client_SetInfo(Client_ThisServer(), Conf_ServerInfo); + return true; } /* Config_Rehash */ +static const char* +yesno_to_str(int boolean_value) +{ + if (boolean_value) + return "yes"; + return "no"; +} + + GLOBAL int Conf_Test( void ) { @@ -163,9 +184,8 @@ Conf_Test( void ) char *topic; Use_Log = false; - Set_Defaults( true ); - Read_Config( ); + Read_Config( true ); Validate_Config(true, false); /* If stdin and stdout ("you can read our nice message and we can @@ -191,8 +211,7 @@ Conf_Test( void ) fputs(" Ports = ", stdout); ports_puts(&Conf_ListenPorts); - - printf( " Listen = %s\n", Conf_ListenAddress ); + 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 ); @@ -202,10 +221,20 @@ Conf_Test( void ) 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( " OperServerMode = %s\n", Conf_OperServerMode == true? "yes" : "no" ); - printf( " PredefChannelsOnly = %s\n", Conf_PredefChannelsOnly == true ? "yes" : "no" ); - printf( " NoDNS = %s\n", Conf_NoDNS ? "yes" : "no"); + printf( " OperCanUseMode = %s\n", yesno_to_str(Conf_OperCanMode)); + printf( " OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode)); + printf( " PredefChannelsOnly = %s\n", yesno_to_str(Conf_PredefChannelsOnly)); + printf( " NoDNS = %s\n", yesno_to_str(Conf_NoDNS)); + +#ifdef WANT_IPV6 + /* both are deprecated, only mention them if their default value changed. */ + if (!Conf_ListenIPv6) + puts(" ListenIPv6 = no"); + if (!Conf_ListenIPv4) + puts(" ListenIPv4 = no"); + printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6)); + printf(" ConnectIPv6 = %s\n", yesno_to_str(Conf_ConnectIPv4)); +#endif printf( " MaxConnections = %ld\n", Conf_MaxConnections); printf( " MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf( " MaxJoins = %d\n", Conf_MaxJoins>0 ? Conf_MaxJoins : -1); @@ -433,8 +462,8 @@ Set_Defaults( bool InitServers ) strlcpy( Conf_PidFile, PID_FILE, sizeof( Conf_PidFile )); - strcpy( Conf_ListenAddress, "" ); - + free(Conf_ListenAddress); + Conf_ListenAddress = NULL; Conf_UID = Conf_GID = 0; Conf_PingTimeout = 120; @@ -450,6 +479,11 @@ Set_Defaults( bool InitServers ) Conf_PredefChannelsOnly = false; Conf_OperServerMode = false; + Conf_ConnectIPv4 = true; + Conf_ListenIPv4 = true; + Conf_ConnectIPv6 = true; + Conf_ListenIPv6 = true; + Conf_MaxConnections = 0; Conf_MaxConnectionsIP = 5; Conf_MaxJoins = 10; @@ -460,8 +494,8 @@ Set_Defaults( bool InitServers ) } /* Set_Defaults */ -static void -Read_Config( void ) +static bool +Read_Config( bool ngircd_starting ) { /* Read configuration file. */ @@ -476,10 +510,14 @@ Read_Config( void ) /* No configuration file found! */ Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s", NGIRCd_ConfFile, strerror( errno )); + if (!ngircd_starting) + return false; Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); exit( 1 ); } + Set_Defaults( ngircd_starting ); + Config_Error( LOG_INFO, "Reading configuration from \"%s\" ...", NGIRCd_ConfFile ); /* Clean up server configuration structure: mark all already @@ -626,6 +664,24 @@ Read_Config( void ) exit( 1 ); } } + + if (!Conf_ListenAddress) { + /* no Listen addresses configured, use default */ +#ifdef WANT_IPV6 + /* Conf_ListenIPv6/4 should no longer be used */ + if (Conf_ListenIPv6 && Conf_ListenIPv4) + Conf_ListenAddress = strdup_warn("::,0.0.0.0"); + else if (Conf_ListenIPv6) + Conf_ListenAddress = strdup_warn("::"); + else +#endif + Conf_ListenAddress = strdup_warn("0.0.0.0"); + } + if (!Conf_ListenAddress) { + Config_Error(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME); + exit(1); + } + return true; } /* Read_Config */ @@ -813,6 +869,41 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Conf_NoDNS = Check_ArgIsTrue( Arg ); return; } +#ifdef WANT_IPV6 + /* the default setting for all the WANT_IPV6 special options is 'true' */ + if (strcasecmp(Var, "ListenIPv6") == 0) { /* DEPRECATED, option appeared in 0.12.0 */ + /* + * listen on ipv6 sockets, if available? + * Deprecated use "Listen = 0.0.0.0" (or, rather, do not list "::") + */ + Conf_ListenIPv6 = Check_ArgIsTrue( Arg ); + Config_Error(LOG_WARNING, "%s, line %d: %s=%s is deprecated, %sinclude '::' in \"Listen =\" option instead", + NGIRCd_ConfFile, Line, Var, yesno_to_str(Conf_ListenIPv6), Conf_ListenIPv6 ? " ":"do not "); + return; + } + if (strcasecmp(Var, "ListenIPv4") == 0) { /* DEPRECATED, option appeared in 0.12.0 */ + /* + * listen on ipv4 sockets, if available? + * this allows "ipv6-only" setups + * Deprecated use "Listen = ::" (or, rather, do not list "0.0.0.0") + */ + Conf_ListenIPv4 = Check_ArgIsTrue( Arg ); + Config_Error(LOG_WARNING, "%s, line %d: %s=%s is deprecated, %sinclude '0.0.0.0' in \"Listen =\" option instead", + NGIRCd_ConfFile, Line, Var, yesno_to_str(Conf_ListenIPv4), Conf_ListenIPv4 ? " ":"do not "); + return; + } + if( strcasecmp( Var, "ConnectIPv6" ) == 0 ) { + /* connect to other hosts using ipv6, if they have an AAAA record? */ + Conf_ConnectIPv6 = Check_ArgIsTrue( Arg ); + return; + } + if( strcasecmp( Var, "ConnectIPv4" ) == 0 ) { + /* connect to other hosts using ipv4. + * again, this can be used for ipv6-only setups */ + Conf_ConnectIPv4 = Check_ArgIsTrue( Arg ); + return; + } +#endif if( strcasecmp( Var, "OperCanUseMode" ) == 0 ) { /* Are IRC operators allowed to use MODE in channels they aren't Op in? */ Conf_OperCanMode = Check_ArgIsTrue( Arg ); @@ -859,14 +950,24 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) if( strcasecmp( Var, "Listen" ) == 0 ) { /* IP-Address to bind sockets */ - len = strlcpy( Conf_ListenAddress, Arg, sizeof( Conf_ListenAddress )); - if (len >= sizeof( Conf_ListenAddress )) - Config_Error_TooLong( Line, Var ); + if (Conf_ListenAddress) { + Config_Error(LOG_ERR, "Multiple Listen= options, ignoring: %s", Arg); + return; + } + Conf_ListenAddress = strdup_warn(Arg); + /* + * if allocation fails, we're in trouble: + * we cannot ignore the error -- otherwise ngircd + * would listen on all interfaces. + */ + if (!Conf_ListenAddress) { + Config_Error(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME); + exit(1); + } 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 */