#include "portab.h"
-static char UNUSED id[] = "$Id: conf.c,v 1.88 2005/10/11 19:29:23 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.96 2006/11/20 19:32:07 fw Exp $";
#include "imp.h"
#include <assert.h>
static void Set_Defaults PARAMS(( bool InitServers ));
static void Read_Config PARAMS(( void ));
-static void Validate_Config PARAMS(( bool TestOnly ));
+static void Validate_Config PARAMS(( bool TestOnly, bool Rehash ));
static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg ));
static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg ));
static void
ports_puts(array *a)
{
- unsigned int len;
+ size_t len;
UINT16 *ports;
len = array_length(a, sizeof(UINT16));
if (len--) {
{
Set_Defaults( true );
Read_Config( );
- Validate_Config( false );
+ Validate_Config(false, false);
} /* Config_Init */
{
Set_Defaults( false );
Read_Config( );
- Validate_Config( false );
+ Validate_Config(false, true);
+
+ /* Update CLIENT structure of local server */
+ Client_SetInfo(Client_ThisServer(), Conf_ServerInfo);
} /* Config_Rehash */
Set_Defaults( true );
Read_Config( );
- Validate_Config( true );
+ Validate_Config(true, false);
/* 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: */
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" );
+ printf( " PredefChannelsOnly = %s\n", Conf_PredefChannelsOnly == 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 );
for( i = 0; i < MAX_SERVERS; i++ ) {
if( ! Conf_Server[i].name[0] ) continue;
-
+
/* Valid "Server" section */
puts( "[SERVER]" );
printf( " Name = %s\n", Conf_Server[i].name );
printf( " Host = %s\n", Conf_Server[i].host );
- printf( " Port = %d\n", Conf_Server[i].port );
+ printf( " Port = %u\n", (unsigned int)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\n", Conf_Server[i].group );
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 );
topic = (char*)array_start(&Conf_Channel[i].topic);
printf( " Topic = %s\n\n", topic ? topic : "");
}
-
+
return 0;
} /* Conf_Test */
Init_Server_Struct( &Conf_Server[i] );
} else {
/* Set time for next connect attempt */
- 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;
+ 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 */
Conf_GetServer( CONN_ID Idx )
{
/* Get index of server in configuration structure */
-
+
int i = 0;
-
+
assert( Idx > NONE );
for( i = 0; i < MAX_SERVERS; i++ ) {
strlcpy( Conf_Server[i].pwd_in, PeerPwd, sizeof( Conf_Server[i].pwd_in ));
Conf_Server[i].port = Port;
Conf_Server[i].flags = CONF_SFLAG_ONCE;
-
+
return true;
} /* Conf_AddServer */
strcpy( Conf_ListenAddress, "" );
Conf_UID = Conf_GID = 0;
-
+
Conf_PingTimeout = 120;
Conf_PongTimeout = 20;
Conf_Channel_Count = 0;
Conf_OperCanMode = false;
+ Conf_PredefChannelsOnly = false;
Conf_OperServerMode = false;
-
+
Conf_MaxConnections = -1;
Conf_MaxConnectionsIP = 5;
Conf_MaxJoins = 10;
}
return;
}
+ if( strcasecmp( Var, "PredefChannelsOnly" ) == 0 ) {
+ /* Should we only allow pre-defined-channels? (i.e. users cannot create their own channels) */
+ Conf_PredefChannelsOnly = Check_ArgIsTrue( Arg );
+ return;
+ }
if( strcasecmp( Var, "OperCanUseMode" ) == 0 ) {
/* Are IRC operators allowed to use MODE in channels they aren't Op in? */
Conf_OperCanMode = Check_ArgIsTrue( Arg );
} /* Handle_SERVER */
+static bool
+Handle_Channelname(size_t chancount, const char *name)
+{
+ size_t size = sizeof( Conf_Channel[chancount].name );
+ char *dest = Conf_Channel[chancount].name;
+
+ if (*name && *name != '#') {
+ *dest = '#';
+ --size;
+ ++dest;
+ }
+ return size > strlcpy(dest, name, size);
+}
+
+
static void
Handle_CHANNEL( int Line, char *Var, char *Arg )
{
chancount = Conf_Channel_Count - 1;
if( strcasecmp( Var, "Name" ) == 0 ) {
- /* Name of the channel */
- len = strlcpy( Conf_Channel[chancount].name, Arg, sizeof( Conf_Channel[chancount].name ));
- if (len >= sizeof( Conf_Channel[chancount].name ))
+ if (!Handle_Channelname(chancount, Arg))
Config_Error_TooLong( Line, Var );
return;
}
static void
-Validate_Config( bool Configtest )
+Validate_Config(bool Configtest, bool Rehash)
{
/* Validate configuration settings. */
#ifdef DEBUG
int i, servers, servers_once;
#endif
+ char *ptr;
+
+ /* Validate configured server name, see RFC 2812 section 2.3.1 */
+ ptr = Conf_ServerName;
+ do {
+ if (*ptr >= 'a' && *ptr <= 'z') continue;
+ if (*ptr >= 'A' && *ptr <= 'Z') continue;
+ if (*ptr >= '0' && *ptr <= '9') continue;
+ if (ptr > Conf_ServerName) {
+ if (*ptr == '.' || *ptr == '-')
+ continue;
+ }
+ Conf_ServerName[0] = '\0';
+ break;
+ } while (*(++ptr));
- if( ! Conf_ServerName[0] ) {
+ if (!Conf_ServerName[0]) {
/* No server name configured! */
- 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 );
+ Config_Error(LOG_ALERT,
+ "No (valid) server name configured in \"%s\" (section 'Global': 'Name')!",
+ NGIRCd_ConfFile);
+ if (!Configtest && !Rehash) {
+ Config_Error(LOG_ALERT,
+ "%s exiting due to fatal errors!",
+ PACKAGE_NAME);
+ exit(1);
}
}
-
- if( Conf_ServerName[0] && ! 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\" (section 'Global': 'Name'): Dot missing!", NGIRCd_ConfFile );
- if( ! Configtest ) {
- Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
- exit( 1 );
+ 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 ) {
- Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
- exit( 1 );
+ Config_Error(LOG_ALERT,
+ "No administrator email address configured in \"%s\" ('AdminEMail')!",
+ NGIRCd_ConfFile);
+ 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!" );
+ Config_Error(LOG_WARNING,
+ "No administrative information configured but required by RFC!");
}
+
#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++;
+ 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 */
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 )
{
NGIRCd_ConfFile, Line, Item );
}
+
#ifdef PROTOTYPES
static void Config_Error( const int Level, const char *Format, ... )
#else
if( NGIRCd_Passive ) Server->flags = CONF_SFLAG_DISABLED;
+ Resolve_Init(&Server->res_stat);
Server->conn_id = NONE;
} /* Init_Server_Struct */
projects / ngircd-alex.git / blobdiff