X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=a1f8fdc37e35576f8de938c49a19b5bf4874141c;hb=ffcf5ab9991536a88c6d05ff80aaaf084d817b8c;hp=df93b28b79ad5930ba21bd5462054c7b2d14bb23;hpb=281d8e454de6f59c061dce5f9ba3fd22f521cac9;p=ngircd-alex.git diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index df93b28b..a1f8fdc3 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: conf.c,v 1.19 2002/03/25 16:14:15 alex Exp $ + * $Id: conf.c,v 1.28 2002/09/02 14:59:17 alex Exp $ * * conf.h: Konfiguration des ngircd */ @@ -20,42 +20,145 @@ #include "imp.h" #include #include +#include #include #include #include +#include +#include "ngircd.h" +#include "conn.h" #include "client.h" #include "defines.h" #include "log.h" +#include "resolve.h" #include "tool.h" #include "exp.h" #include "conf.h" -LOCAL VOID Read_Config( VOID ); +LOCAL BOOLEAN Use_Log = TRUE; -GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ); -GLOBAL VOID Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ); -GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ); -LOCAL VOID Validate_Config( VOID ); +LOCAL VOID Set_Defaults PARAMS(( VOID )); +LOCAL VOID Read_Config PARAMS(( VOID )); +LOCAL VOID Validate_Config PARAMS(( VOID )); +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 )); -GLOBAL VOID Conf_Init( VOID ) +LOCAL VOID Config_Error PARAMS(( CONST INT Level, CONST CHAR *Format, ... )); + + +GLOBAL VOID +Conf_Init( VOID ) { - /* Konfigurationsvariablen initialisieren: zunaechst Default- - * Werte setzen, dann Konfigurationsdtaei einlesen. */ + Set_Defaults( ); + Read_Config( ); + Validate_Config( ); +} /* Config_Init */ + + +GLOBAL INT +Conf_Test( VOID ) +{ + /* Konfiguration einlesen, ueberpruefen und ausgeben. */ + + UINT i; + + Use_Log = FALSE; + Set_Defaults( ); + + printf( "Using \"%s\" as configuration file ...\n", NGIRCd_ConfFile ); + Read_Config( ); + + /* Wenn stdin ein ein TTY ist: auf Taste warten */ + if( 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" ); + + puts( "[GLOBAL]" ); + printf( " ServerName = %s\n", Conf_ServerName ); + printf( " ServerInfo = %s\n", Conf_ServerInfo ); + printf( " ServerPwd = %s\n", Conf_ServerPwd ); + printf( " MotdFile = %s\n", Conf_MotdFile ); + printf( " ListenPorts = " ); + for( i = 0; i < Conf_ListenPorts_Count; i++ ) + { + if( i != 0 ) printf( ", " ); + printf( "%u", Conf_ListenPorts[i] ); + } + puts( "" ); + printf( " ServerUID = %ld\n", (INT32)Conf_UID ); + printf( " ServerGID = %ld\n", (INT32)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" ); + puts( "" ); + + for( i = 0; i < Conf_Oper_Count; i++ ) + { + if( ! Conf_Oper[i].name[0] ) continue; + + /* gueltiger Operator-Block: ausgeben */ + puts( "[OPERATOR]" ); + printf( " Name = %s\n", Conf_Oper[i].name ); + printf( " Password = %s\n", Conf_Oper[i].pwd ); + puts( "" ); + } + + for( i = 0; i < Conf_Server_Count; i++ ) + { + if( ! Conf_Server[i].name[0] ) continue; + if( ! Conf_Server[i].host[0] ) continue; + + /* gueltiger Server-Block: ausgeben */ + 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( " Password = %s\n", Conf_Server[i].pwd ); + printf( " Group = %d\n", Conf_Server[i].group ); + puts( "" ); + } - strcpy( Conf_File, CONFIG_FILE ); + for( i = 0; i < Conf_Channel_Count; i++ ) + { + if( ! Conf_Channel[i].name[0] ) continue; + + /* gueltiger Channel-Block: ausgeben */ + 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( "" ); + } + + return 0; +} /* Conf_Test */ + + +LOCAL VOID +Set_Defaults( VOID ) +{ + /* Konfigurationsvariablen initialisieren, d.h. auf Default-Werte setzen. */ strcpy( Conf_ServerName, "" ); - strcpy( Conf_ServerInfo, PACKAGE" "VERSION ); + sprintf( Conf_ServerInfo, "%s %s", PACKAGE, VERSION ); strcpy( Conf_ServerPwd, "" ); strcpy( Conf_MotdFile, MOTD_FILE ); Conf_ListenPorts_Count = 0; + + Conf_UID = Conf_GID = 0; Conf_PingTimeout = 120; Conf_PongTimeout = 20; @@ -63,22 +166,15 @@ GLOBAL VOID Conf_Init( VOID ) Conf_ConnectRetry = 60; Conf_Oper_Count = 0; - Conf_Server_Count = 0; + Conf_Channel_Count = 0; - /* Konfigurationsdatei einlesen und validieren */ - Read_Config( ); - Validate_Config( ); -} /* Config_Init */ - - -GLOBAL VOID Conf_Exit( VOID ) -{ - /* ... */ -} /* Config_Exit */ + Conf_OperCanMode = FALSE; +} /* Set_Defaults */ -LOCAL VOID Read_Config( VOID ) +LOCAL VOID +Read_Config( VOID ) { /* Konfigurationsdatei einlesen. */ @@ -86,12 +182,12 @@ LOCAL VOID Read_Config( VOID ) INT line; FILE *fd; - fd = fopen( Conf_File, "r" ); + fd = fopen( NGIRCd_ConfFile, "r" ); if( ! fd ) { /* Keine Konfigurationsdatei gefunden */ - Log( LOG_ALERT, "Can't read configuration \"%s\": %s", Conf_File, strerror( errno )); - Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" ); + 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 ); exit( 1 ); } @@ -113,7 +209,7 @@ LOCAL VOID Read_Config( VOID ) if( strcasecmp( section, "[GLOBAL]" ) == 0 ) continue; if( strcasecmp( section, "[OPERATOR]" ) == 0 ) { - if( Conf_Oper_Count + 1 > MAX_OPERATORS ) Log( LOG_ERR, "Too many operators configured." ); + if( Conf_Oper_Count + 1 > MAX_OPERATORS ) Config_Error( LOG_ERR, "Too many operators configured." ); else { /* neuen Operator initialisieren */ @@ -125,7 +221,7 @@ LOCAL VOID Read_Config( VOID ) } if( strcasecmp( section, "[SERVER]" ) == 0 ) { - if( Conf_Server_Count + 1 > MAX_SERVERS ) Log( LOG_ERR, "Too many servers configured." ); + if( Conf_Server_Count + 1 > MAX_SERVERS ) Config_Error( LOG_ERR, "Too many servers configured." ); else { /* neuen Server ("Peer") initialisieren */ @@ -141,7 +237,20 @@ LOCAL VOID Read_Config( VOID ) } continue; } - Log( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", Conf_File, line, section ); + if( strcasecmp( section, "[CHANNEL]" ) == 0 ) + { + if( Conf_Channel_Count + 1 > MAX_DEFCHANNELS ) Config_Error( LOG_ERR, "Too many pre-defined channels configured." ); + else + { + /* neuen vordefinierten Channel initialisieren */ + strcpy( Conf_Channel[Conf_Channel_Count].name, "" ); + strcpy( Conf_Channel[Conf_Channel_Count].modes, "" ); + strcpy( Conf_Channel[Conf_Channel_Count].topic, "" ); + Conf_Channel_Count++; + } + continue; + } + Config_Error( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", NGIRCd_ConfFile, line, section ); section[0] = 0x1; } if( section[0] == 0x1 ) continue; @@ -150,7 +259,7 @@ LOCAL VOID Read_Config( VOID ) ptr = strchr( str, '=' ); if( ! ptr ) { - Log( LOG_ERR, "%s, line %d: Syntax error!", Conf_File, line ); + Config_Error( LOG_ERR, "%s, line %d: Syntax error!", NGIRCd_ConfFile, line ); continue; } *ptr = '\0'; @@ -160,17 +269,26 @@ LOCAL VOID Read_Config( VOID ) if( strcasecmp( section, "[GLOBAL]" ) == 0 ) Handle_GLOBAL( line, var, arg ); else if( strcasecmp( section, "[OPERATOR]" ) == 0 ) Handle_OPERATOR( line, var, arg ); else if( strcasecmp( section, "[SERVER]" ) == 0 ) Handle_SERVER( line, var, arg ); - else Log( LOG_ERR, "%s, line %d: Variable \"%s\" outside section!", Conf_File, line, var ); + else if( strcasecmp( section, "[CHANNEL]" ) == 0 ) Handle_CHANNEL( line, var, arg ); + else Config_Error( LOG_ERR, "%s, line %d: Variable \"%s\" outside section!", NGIRCd_ConfFile, line, var ); } fclose( fd ); + + /* Wenn kein Port definiert wurde, Port 6667 als Default benutzen */ + if( Conf_ListenPorts_Count < 1 ) + { + Conf_ListenPorts_Count = 1; + Conf_ListenPorts[0] = 6667; + } } /* Read_Config */ -GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) +LOCAL VOID +Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) { CHAR *ptr; - INT port; + INT32 port; assert( Line > 0 ); assert( Var != NULL ); @@ -206,11 +324,11 @@ GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) { ngt_TrimStr( ptr ); port = atol( ptr ); - if( Conf_ListenPorts_Count + 1 > MAX_LISTEN_PORTS ) Log( LOG_ERR, "Too many listen ports configured. Port %ld ignored.", port ); + 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++] = port; - else Log( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!", Conf_File, Line, port ); + 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, "," ); } @@ -223,6 +341,18 @@ GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) Conf_MotdFile[FNAME_LEN - 1] = '\0'; return; } + if( strcasecmp( Var, "ServerUID" ) == 0 ) + { + /* UID, mit der der Daemon laufen soll */ + Conf_UID = (UINT)atoi( Arg ); + return; + } + if( strcasecmp( Var, "ServerGID" ) == 0 ) + { + /* GID, mit der der Daemon laufen soll */ + Conf_GID = (UINT)atoi( Arg ); + return; + } if( strcasecmp( Var, "PingTimeout" ) == 0 ) { /* PING-Timeout */ @@ -244,12 +374,22 @@ GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) if(( Conf_ConnectRetry ) < 5 ) Conf_ConnectRetry = 5; return; } + if( strcasecmp( Var, "OperCanUseMode" ) == 0 ) + { + /* Koennen IRC-Operatoren immer MODE benutzen? */ + 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; + return; + } - Log( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", Conf_File, Line, Var ); + Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); } /* Handle_GLOBAL */ -GLOBAL VOID Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) +LOCAL VOID +Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) { assert( Line > 0 ); assert( Var != NULL ); @@ -271,11 +411,12 @@ GLOBAL VOID Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) return; } - Log( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!", Conf_File, Line, Var ); + Config_Error( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); } /* Handle_OPERATOR */ -GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) +LOCAL VOID +Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) { INT32 port; @@ -309,7 +450,7 @@ GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) /* Port, zu dem Verbunden werden soll */ port = atol( Arg ); if( port > 0 && port < 0xFFFF ) Conf_Server[Conf_Server_Count - 1].port = (INT)port; - else Log( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!", Conf_File, Line, 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 ) @@ -319,21 +460,89 @@ GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) return; } - Log( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!", Conf_File, Line, Var ); + Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); } /* Handle_SERVER */ -LOCAL VOID Validate_Config( VOID ) +LOCAL VOID +Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg ) +{ + assert( Line > 0 ); + assert( Var != NULL ); + assert( Arg != NULL ); + + if( strcasecmp( Var, "Name" ) == 0 ) + { + /* Hostname des Servers */ + strncpy( Conf_Channel[Conf_Channel_Count - 1].name, Arg, CHANNEL_NAME_LEN - 1 ); + Conf_Channel[Conf_Channel_Count - 1].name[CHANNEL_NAME_LEN - 1] = '\0'; + return; + } + if( strcasecmp( Var, "Modes" ) == 0 ) + { + /* Name des Servers ("Nick") */ + strncpy( Conf_Channel[Conf_Channel_Count - 1].modes, Arg, CHANNEL_MODE_LEN - 1 ); + Conf_Channel[Conf_Channel_Count - 1].modes[CHANNEL_MODE_LEN - 1] = '\0'; + return; + } + if( strcasecmp( Var, "Topic" ) == 0 ) + { + /* Passwort des Servers */ + strncpy( Conf_Channel[Conf_Channel_Count - 1].topic, Arg, CHANNEL_TOPIC_LEN - 1 ); + Conf_Channel[Conf_Channel_Count - 1].topic[CHANNEL_TOPIC_LEN - 1] = '\0'; + return; + } + + Config_Error( LOG_ERR, "%s, line %d (section \"Channel\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); +} /* Handle_CHANNEL */ + + +LOCAL VOID +Validate_Config( VOID ) { /* Konfiguration ueberpruefen */ if( ! Conf_ServerName[0] ) { /* Kein Servername konfiguriert */ - Log( LOG_ALERT, "No server name configured in \"%s\"!", Conf_File ); - Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" ); + Config_Error( LOG_ALERT, "No server name configured in \"%s\"!", NGIRCd_ConfFile ); + Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE ); exit( 1 ); } } /* Validate_Config */ + +#ifdef PROTOTYPES +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; +va_dcl +#endif +{ + /* Fehler! Auf Console und/oder ins Log schreiben */ + + CHAR msg[MAX_LOG_MSG_LEN]; + va_list ap; + + assert( Format != NULL ); + + /* String mit variablen Argumenten zusammenbauen ... */ +#ifdef PROTOTYPES + va_start( ap, Format ); +#else + va_start( ap ); +#endif + vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); + va_end( ap ); + + /* Im "normalen Betrieb" soll der Log-Mechanismus des ngIRCd verwendet + * werden, beim Testen der Konfiguration jedoch nicht, hier sollen alle + * Meldungen direkt auf die Konsole ausgegeben werden: */ + if( Use_Log ) Log( Level, msg ); + else puts( msg ); +} /* Config_Error */ + + /* -eof- */