X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=6974196df2623b4872412788141f324d0fdd3625;hp=8b945e82da53a89ab66796fb8900292c8217def2;hb=f86083a05743a7b7a22f711e250ced1435f657a7;hpb=21a8a278fb354526c58a16220a0a4a12704d524b diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 8b945e82..6974196d 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -9,100 +9,143 @@ * 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.9 2002/01/02 02:49:15 alex Exp $ + * $Id: conf.c,v 1.21 2002/03/27 16:39:22 alex Exp $ * * conf.h: Konfiguration des ngircd - * - * $Log: conf.c,v $ - * Revision 1.9 2002/01/02 02:49:15 alex - * - Konfigurationsdatei "Samba like" umgestellt. - * - es koennen nun mehrere Server und Oprtatoren konfiguriert werden. - * - * Revision 1.7 2002/01/01 18:25:44 alex - * - #include's fuer stdlib.h ergaenzt. - * - * Revision 1.6 2001/12/31 02:18:51 alex - * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART), - * - neuen Header "defines.h" mit (fast) allen Konstanten. - * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes. - * - * Revision 1.5 2001/12/30 19:26:11 alex - * - Unterstuetzung fuer die Konfigurationsdatei eingebaut. - * - * Revision 1.4 2001/12/26 22:48:53 alex - * - MOTD-Datei ist nun konfigurierbar und wird gelesen. - * - * Revision 1.3 2001/12/26 14:45:37 alex - * - "Code Cleanups". - * - * Revision 1.2 2001/12/26 03:19:57 alex - * - erste Konfigurations-Variablen definiert: PING/PONG-Timeout. - * - * Revision 1.1 2001/12/12 17:18:20 alex - * - Modul fuer Server-Konfiguration begonnen. */ -#include -#include "global.h" +#include "portab.h" -#include +#include "imp.h" #include #include +#include #include #include #include +#include +#include "ngircd.h" #include "client.h" +#include "defines.h" #include "log.h" #include "tool.h" -#include +#include "exp.h" #include "conf.h" +LOCAL BOOLEAN Use_Log = TRUE; + + +LOCAL VOID Set_Defaults( VOID ); LOCAL VOID Read_Config( VOID ); +LOCAL VOID Validate_Config( VOID ); 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 Config_Error( 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. */ + + INT 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( "%d", Conf_ListenPorts[i] ); + } + if( Conf_ListenPorts_Count < 1 ) puts( ""); + else puts( "" ); + printf( " PingTimeout = %d\n", Conf_PingTimeout ); + printf( " PongTimeout = %d\n", Conf_PongTimeout ); + printf( " ConnectRetry = %d\n", Conf_ConnectRetry ); + puts( "" ); + + for( i = 0; i < Conf_Oper_Count; i++ ) + { + 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++ ) + { + 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( "" ); + } + + return 0; +} /* Conf_Test */ + + +GLOBAL VOID Conf_Exit( VOID ) +{ + /* ... */ +} /* Config_Exit */ + - strcpy( Conf_File, "/usr/local/etc/ngircd.conf" ); +LOCAL VOID Set_Defaults( VOID ) +{ + /* Konfigurationsvariablen initialisieren, d.h. auf Default-Werte setzen. */ strcpy( Conf_ServerName, "" ); strcpy( Conf_ServerInfo, PACKAGE" "VERSION ); + strcpy( Conf_ServerPwd, "" ); - strcpy( Conf_MotdFile, "/usr/local/etc/ngircd.motd" ); + strcpy( Conf_MotdFile, MOTD_FILE ); Conf_ListenPorts_Count = 0; Conf_PingTimeout = 120; - Conf_PongTimeout = 10; + Conf_PongTimeout = 20; Conf_ConnectRetry = 60; Conf_Oper_Count = 0; Conf_Server_Count = 0; - - /* Konfigurationsdatei einlesen und validieren */ - Read_Config( ); - Validate_Config( ); -} /* Config_Init */ - - -GLOBAL VOID Conf_Exit( VOID ) -{ - /* ... */ -} /* Config_Exit */ +} /* Set_Defaults */ LOCAL VOID Read_Config( VOID ) @@ -113,12 +156,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, PACKAGE" exiting due to fatal errors!" ); exit( 1 ); } @@ -140,7 +183,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 */ @@ -152,7 +195,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 */ @@ -161,13 +204,14 @@ LOCAL VOID Read_Config( VOID ) strcpy( Conf_Server[Conf_Server_Count].name, "" ); strcpy( Conf_Server[Conf_Server_Count].pwd, "" ); Conf_Server[Conf_Server_Count].port = 0; - Conf_Server[Conf_Server_Count].lasttry = 0; + Conf_Server[Conf_Server_Count].group = -1; + Conf_Server[Conf_Server_Count].lasttry = time( NULL ) - Conf_ConnectRetry + STARTUP_DELAY; Conf_Server[Conf_Server_Count].res_stat = NULL; Conf_Server_Count++; } continue; } - Log( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", Conf_File, line, section ); + Config_Error( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", NGIRCd_ConfFile, line, section ); section[0] = 0x1; } if( section[0] == 0x1 ) continue; @@ -176,7 +220,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'; @@ -186,7 +230,7 @@ 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 Config_Error( LOG_ERR, "%s, line %d: Variable \"%s\" outside section!", NGIRCd_ConfFile, line, var ); } fclose( fd ); @@ -196,7 +240,7 @@ LOCAL VOID Read_Config( VOID ) GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) { CHAR *ptr; - INT port; + INT32 port; assert( Line > 0 ); assert( Var != NULL ); @@ -205,17 +249,24 @@ GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Name" ) == 0 ) { /* Der Server-Name */ - strncpy( Conf_ServerName, Arg, CLIENT_ID_LEN ); + strncpy( Conf_ServerName, Arg, CLIENT_ID_LEN - 1 ); Conf_ServerName[CLIENT_ID_LEN - 1] = '\0'; return; } if( strcasecmp( Var, "Info" ) == 0 ) { /* Server-Info-Text */ - strncpy( Conf_ServerInfo, Arg, CLIENT_INFO_LEN ); + strncpy( Conf_ServerInfo, Arg, CLIENT_INFO_LEN - 1 ); Conf_ServerInfo[CLIENT_INFO_LEN - 1] = '\0'; return; } + if( strcasecmp( Var, "Password" ) == 0 ) + { + /* Server-Passwort */ + strncpy( Conf_ServerPwd, Arg, CLIENT_PASS_LEN - 1 ); + Conf_ServerPwd[CLIENT_PASS_LEN - 1] = '\0'; + return; + } if( strcasecmp( Var, "Ports" ) == 0 ) { /* Ports, durch "," getrennt, auf denen der Server @@ -225,11 +276,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++] = (INT)port; + else Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, port ); } ptr = strtok( NULL, "," ); } @@ -238,7 +289,7 @@ GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "MotdFile" ) == 0 ) { /* Datei mit der "message of the day" (MOTD) */ - strncpy( Conf_MotdFile, Arg, FNAME_LEN ); + strncpy( Conf_MotdFile, Arg, FNAME_LEN - 1 ); Conf_MotdFile[FNAME_LEN - 1] = '\0'; return; } @@ -264,7 +315,7 @@ GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) 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 */ @@ -278,25 +329,25 @@ GLOBAL VOID Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Name" ) == 0 ) { /* Name des IRC Operator */ - strncpy( Conf_Oper[Conf_Oper_Count - 1].name, Arg, CLIENT_ID_LEN ); + strncpy( Conf_Oper[Conf_Oper_Count - 1].name, Arg, CLIENT_ID_LEN - 1 ); Conf_Oper[Conf_Oper_Count - 1].name[CLIENT_ID_LEN - 1] = '\0'; return; } if( strcasecmp( Var, "Password" ) == 0 ) { /* Passwort des IRC Operator */ - strncpy( Conf_Oper[Conf_Oper_Count - 1].pwd, Arg, CLIENT_PASS_LEN ); + strncpy( Conf_Oper[Conf_Oper_Count - 1].pwd, Arg, CLIENT_PASS_LEN - 1 ); Conf_Oper[Conf_Oper_Count - 1].pwd[CLIENT_PASS_LEN - 1] = '\0'; 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 ) { - INT port; + INT32 port; assert( Line > 0 ); assert( Var != NULL ); @@ -305,21 +356,21 @@ GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Host" ) == 0 ) { /* Hostname des Servers */ - strncpy( Conf_Server[Conf_Server_Count - 1].host, Arg, HOST_LEN ); + strncpy( Conf_Server[Conf_Server_Count - 1].host, Arg, HOST_LEN - 1 ); Conf_Server[Conf_Server_Count - 1].host[HOST_LEN - 1] = '\0'; return; } if( strcasecmp( Var, "Name" ) == 0 ) { /* Name des Servers ("Nick") */ - strncpy( Conf_Server[Conf_Server_Count - 1].name, Arg, CLIENT_PASS_LEN ); - Conf_Server[Conf_Server_Count - 1].name[CLIENT_PASS_LEN - 1] = '\0'; + strncpy( Conf_Server[Conf_Server_Count - 1].name, Arg, CLIENT_ID_LEN - 1 ); + Conf_Server[Conf_Server_Count - 1].name[CLIENT_ID_LEN - 1] = '\0'; return; } if( strcasecmp( Var, "Password" ) == 0 ) { /* Passwort des Servers */ - strncpy( Conf_Server[Conf_Server_Count - 1].pwd, Arg, CLIENT_PASS_LEN ); + strncpy( Conf_Server[Conf_Server_Count - 1].pwd, Arg, CLIENT_PASS_LEN - 1 ); Conf_Server[Conf_Server_Count - 1].pwd[CLIENT_PASS_LEN - 1] = '\0'; return; } @@ -327,12 +378,18 @@ 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 = port; - else Log( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!", Conf_File, Line, port ); + if( port > 0 && port < 0xFFFF ) Conf_Server[Conf_Server_Count - 1].port = (INT)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 ) + { + /* Server-Gruppe */ + Conf_Server[Conf_Server_Count - 1].group = atoi( 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 */ @@ -343,10 +400,33 @@ LOCAL VOID Validate_Config( VOID ) if( ! Conf_ServerName[0] ) { /* Kein Servername konfiguriert */ - Log( LOG_ALERT, "No server name configured (use \"ServerName\")!", Conf_File, strerror( errno )); - 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, PACKAGE" exiting due to fatal errors!" ); exit( 1 ); } } /* Validate_Config */ + +LOCAL VOID Config_Error( CONST INT Level, CONST CHAR *Format, ... ) +{ + /* 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 ... */ + va_start( ap, Format ); + 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- */