X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=369a2e03d27b25d265458836cc0a9c506fa83e59;hb=14aba7c1b2b26c8ddbf193c761bd4103997e5dfc;hp=fec8903a1fc7408b52d0dd45478ff59ed9120efd;hpb=9856253dc40be19a0e4713b12187732e7420febe;p=ngircd-alex.git diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fec8903a..369a2e03 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,19 +1,46 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001 by Alexander Barton (alex@barton.de) + * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) * * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen * der GNU General Public License (GPL), wie von der Free Software Foundation * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS. + * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: conf.c,v 1.5 2001/12/30 19:26:11 alex Exp $ + * $Id: conf.c,v 1.14 2002/03/03 17:17:01 alex Exp $ * * conf.h: Konfiguration des ngircd * * $Log: conf.c,v $ + * Revision 1.14 2002/03/03 17:17:01 alex + * - strncpy() und vsnprintf() kopieren nun etwas "optimierter" (1 Byte weniger) :-) + * + * Revision 1.13 2002/01/18 15:51:44 alex + * - Server-Verbinungen werden beim Start erst nach kurzer Pause aufgebaut. + * + * Revision 1.12 2002/01/05 23:26:24 alex + * - Fehlermeldungen korrigiert. + * + * Revision 1.11 2002/01/05 16:51:49 alex + * - Bug bei Remote-Server-Namen entfernt: diese wurden falsch gekuerzt. + * + * Revision 1.10 2002/01/03 02:27:20 alex + * - das Server-Passwort kann nun konfiguriert werden. + * + * 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. * @@ -38,6 +65,7 @@ #include #include #include +#include #include #include "client.h" @@ -48,10 +76,12 @@ #include "conf.h" -#define MAX_LINE_LEN 246 /* max. Laenge einer Konfigurationszeile */ +LOCAL VOID Read_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 Read_Config( VOID ); LOCAL VOID Validate_Config( VOID ); @@ -63,6 +93,8 @@ GLOBAL VOID Conf_Init( VOID ) strcpy( Conf_File, "/usr/local/etc/ngircd.conf" ); strcpy( Conf_ServerName, "" ); + strcpy( Conf_ServerInfo, PACKAGE" "VERSION ); + strcpy( Conf_ServerPwd, "" ); strcpy( Conf_MotdFile, "/usr/local/etc/ngircd.motd" ); @@ -71,6 +103,12 @@ GLOBAL VOID Conf_Init( VOID ) Conf_PingTimeout = 120; Conf_PongTimeout = 10; + Conf_ConnectRetry = 60; + + Conf_Oper_Count = 0; + + Conf_Server_Count = 0; + /* Konfigurationsdatei einlesen und validieren */ Read_Config( ); Validate_Config( ); @@ -87,9 +125,7 @@ LOCAL VOID Read_Config( VOID ) { /* Konfigurationsdatei einlesen. */ - CHAR str[MAX_LINE_LEN], *var, *arg, *ptr; - BOOLEAN ok; - INT32 port; + CHAR section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; INT line; FILE *fd; @@ -103,17 +139,56 @@ LOCAL VOID Read_Config( VOID ) } line = 0; + strcpy( section, "" ); while( TRUE ) { - if( ! fgets( str, MAX_LINE_LEN, fd )) break; + if( ! fgets( str, LINE_LEN, fd )) break; ngt_TrimStr( str ); line++; /* Kommentarzeilen und leere Zeilen ueberspringen */ if( str[0] == ';' || str[0] == '#' || str[0] == '\0' ) continue; - ok = FALSE; + /* Anfang eines Abschnittes? */ + if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' )) + { + strcpy( section, str ); + 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." ); + else + { + /* neuen Operator initialisieren */ + strcpy( Conf_Oper[Conf_Oper_Count].name, "" ); + strcpy( Conf_Oper[Conf_Oper_Count].pwd, "" ); + Conf_Oper_Count++; + } + continue; + } + if( strcasecmp( section, "[SERVER]" ) == 0 ) + { + if( Conf_Server_Count + 1 > MAX_SERVERS ) Log( LOG_ERR, "Too many servers configured." ); + else + { + /* neuen Server ("Peer") initialisieren */ + strcpy( Conf_Server[Conf_Server_Count].host, "" ); + strcpy( Conf_Server[Conf_Server_Count].ip, "" ); + 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 = 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 ); + section[0] = 0x1; + } + if( section[0] == 0x1 ) continue; + /* In Variable und Argument zerlegen */ ptr = strchr( str, '=' ); if( ! ptr ) { @@ -121,60 +196,167 @@ LOCAL VOID Read_Config( VOID ) continue; } *ptr = '\0'; - var = str; ngt_TrimStr( var ); arg = ptr + 1; ngt_TrimStr( arg ); - - if( strcasecmp( str, "ServerName" ) == 0 ) - { - /* Der Server-Name */ - strncpy( Conf_ServerName, arg, CLIENT_ID_LEN ); - Conf_ServerName[CLIENT_ID_LEN] = '\0'; - ok = TRUE; - } - else if( strcasecmp( str, "ListenPorts" ) == 0 ) + + 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 ); + } + + fclose( fd ); +} /* Read_Config */ + + +GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) +{ + CHAR *ptr; + INT port; + + assert( Line > 0 ); + assert( Var != NULL ); + assert( Arg != NULL ); + + if( strcasecmp( Var, "Name" ) == 0 ) + { + /* Der Server-Name */ + 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 - 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 + * Verbindungen annehmen soll */ + ptr = strtok( Arg, "," ); + while( ptr ) { - /* Ports, durch "," getrennt, auf denen der Server - * Verbindungen annehmen soll */ - ptr = strtok( arg, "," ); - while( ptr ) + 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 ); + else { - ngt_TrimStr( ptr ); - port = atol( ptr ); - if( Conf_ListenPorts_Count + 1 > LISTEN_PORTS ) Log( LOG_ERR, "Too many listen ports configured. Port %ld ignored.", port ); if( port > 0 && port < 0xFFFF ) Conf_ListenPorts[Conf_ListenPorts_Count++] = port; - else Log( LOG_ERR, "Illegal port number: %ld. Ignored.", port ); - ptr = strtok( NULL, "," ); + else Log( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!", Conf_File, Line, port ); } - ok = TRUE; - } - else if( strcasecmp( str, "MotdFile" ) == 0 ) - { - /* Datei mit der "message of the day" (MOTD) */ - strncpy( Conf_MotdFile, arg, FNAME_LEN ); - Conf_MotdFile[FNAME_LEN] = '\0'; - ok = TRUE; - } - else if( strcasecmp( str, "PingTimeout" ) == 0 ) - { - /* PING-Timeout */ - Conf_PingTimeout = atoi( arg ); - if(( Conf_PingTimeout ) < 5 ) Conf_PingTimeout = 5; - ok = TRUE; - } - else if( strcasecmp( str, "PongTimeout" ) == 0 ) - { - /* PONG-Timeout */ - Conf_PongTimeout = atoi( arg ); - if(( Conf_PongTimeout ) < 5 ) Conf_PongTimeout = 5; - ok = TRUE; + ptr = strtok( NULL, "," ); } + return; + } + if( strcasecmp( Var, "MotdFile" ) == 0 ) + { + /* Datei mit der "message of the day" (MOTD) */ + strncpy( Conf_MotdFile, Arg, FNAME_LEN - 1 ); + Conf_MotdFile[FNAME_LEN - 1] = '\0'; + return; + } + if( strcasecmp( Var, "PingTimeout" ) == 0 ) + { + /* PING-Timeout */ + Conf_PingTimeout = atoi( Arg ); + if(( Conf_PingTimeout ) < 5 ) Conf_PingTimeout = 5; + return; + } + if( strcasecmp( Var, "PongTimeout" ) == 0 ) + { + /* PONG-Timeout */ + Conf_PongTimeout = atoi( Arg ); + if(( Conf_PongTimeout ) < 5 ) Conf_PongTimeout = 5; + return; + } + if( strcasecmp( Var, "ConnectRetry" ) == 0 ) + { + /* Sekunden zwischen Verbindungsversuchen zu anderen Servern */ + Conf_ConnectRetry = atoi( Arg ); + if(( Conf_ConnectRetry ) < 5 ) Conf_ConnectRetry = 5; + return; + } - if( ! ok ) Log( LOG_ERR, "%s, line %d: Unknown variable \"%s\"!", Conf_File, line, var ); + Log( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", Conf_File, Line, Var ); +} /* Handle_GLOBAL */ + + +GLOBAL VOID Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) +{ + assert( Line > 0 ); + assert( Var != NULL ); + assert( Arg != NULL ); + assert( Conf_Oper_Count > 0 ); + + if( strcasecmp( Var, "Name" ) == 0 ) + { + /* Name des IRC Operator */ + 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 - 1 ); + Conf_Oper[Conf_Oper_Count - 1].pwd[CLIENT_PASS_LEN - 1] = '\0'; + return; } - fclose( fd ); -} /* Read_Config */ + Log( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!", Conf_File, Line, Var ); +} /* Handle_OPERATOR */ + + +GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) +{ + INT port; + + assert( Line > 0 ); + assert( Var != NULL ); + assert( Arg != NULL ); + + if( strcasecmp( Var, "Host" ) == 0 ) + { + /* Hostname des Servers */ + 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_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 - 1 ); + Conf_Server[Conf_Server_Count - 1].pwd[CLIENT_PASS_LEN - 1] = '\0'; + return; + } + if( strcasecmp( Var, "Port" ) == 0 ) + { + /* 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 ); + return; + } + + Log( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!", Conf_File, Line, Var ); +} /* Handle_SERVER */ LOCAL VOID Validate_Config( VOID ) @@ -184,7 +366,7 @@ 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, "No server name configured in \"%s\"!", Conf_File ); Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" ); exit( 1 ); }