X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=dc16758d9ee2682eef6db96dacae6d4707631e5a;hb=c9ccb669442726969a096fe03390b058cc088717;hp=20db13ed94c96a5bb2a4e02df2e398c5e37f3751;hpb=43a4bc5b8bb064e2dfca456ab6fcc656b4dfa813;p=ngircd-alex.git diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 20db13ed..dc16758d 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: ngircd.c,v 1.65 2002/12/19 04:29:59 alex Exp $"; +static char UNUSED id[] = "$Id: ngircd.c,v 1.80 2003/12/29 14:53:26 alex Exp $"; #include "imp.h" #include @@ -43,6 +43,10 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.65 2002/12/19 04:29:59 alex Exp $"; #include "parse.h" #include "irc.h" +#ifdef RENDEZVOUS +#include "rendezvous.h" +#endif + #include "exp.h" #include "ngircd.h" @@ -73,7 +77,8 @@ main( int argc, const char *argv[] ) #ifdef SNIFFER NGIRCd_Sniffer = FALSE; #endif - strcpy( NGIRCd_ConfFile, CONFIG_FILE ); + strlcpy( NGIRCd_ConfFile, SYSCONFDIR, sizeof( NGIRCd_ConfFile )); + strlcat( NGIRCd_ConfFile, CONFIG_FILE, sizeof( NGIRCd_ConfFile )); /* Kommandozeile parsen */ for( i = 1; i < argc; i++ ) @@ -87,11 +92,10 @@ main( int argc, const char *argv[] ) { if( i + 1 < argc ) { - /* Ok, danach kommt noch ein Parameter */ - strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 ); - NGIRCd_ConfFile[FNAME_LEN - 1] = '\0'; + /* Ok, there's an parameter left */ + strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile )); - /* zum uebernaechsten Parameter */ + /* next parameter */ i++; ok = TRUE; } } @@ -154,11 +158,10 @@ main( int argc, const char *argv[] ) { if(( ! argv[i][n + 1] ) && ( i + 1 < argc )) { - /* Ok, danach kommt ein Leerzeichen */ - strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 ); - NGIRCd_ConfFile[FNAME_LEN - 1] = '\0'; + /* Ok, next character is a blank */ + strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile )); - /* zum uebernaechsten Parameter */ + /* go to the following parameter */ i++; n = (LONG)strlen( argv[i] ); ok = TRUE; } @@ -180,11 +183,16 @@ main( int argc, const char *argv[] ) ok = TRUE; } #endif + if( argv[i][n] == 't' ) + { + configtest = TRUE; + ok = TRUE; + } if( ! ok ) { - printf( "%s: invalid option \"-%c\"!\n", PACKAGE, argv[i][n] ); - printf( "Try \"%s --help\" for more information.\n", PACKAGE ); + printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] ); + printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME ); exit( 1 ); } } @@ -192,8 +200,8 @@ main( int argc, const char *argv[] ) } if( ! ok ) { - printf( "%s: invalid option \"%s\"!\n", PACKAGE, argv[i] ); - printf( "Try \"%s --help\" for more information.\n", PACKAGE ); + printf( "%s: invalid option \"%s\"!\n", PACKAGE_NAME, argv[i] ); + printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME ); exit( 1 ); } } @@ -236,7 +244,7 @@ main( int argc, const char *argv[] ) if( pid < 0 ) { /* Fehler */ - printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE, strerror( errno )); + printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE_NAME, strerror( errno )); exit( 1 ); } @@ -259,6 +267,9 @@ main( int argc, const char *argv[] ) Lists_Init( ); Channel_Init( ); Client_Init( ); +#ifdef RENDEZVOUS + Rendezvous_Init( ); +#endif Conn_Init( ); /* Wenn als root ausgefuehrt und eine andere UID @@ -291,16 +302,16 @@ main( int argc, const char *argv[] ) * beim PASS-Befehl verwendete Syntax sowie die erweiterten Flags * sind in doc/Protocol.txt beschrieben. */ #ifdef IRCPLUS - sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE, VERSION, IRCPLUSFLAGS ); -#ifdef USE_ZLIB + sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS ); +#ifdef ZLIB strcat( NGIRCd_ProtoID, "Z" ); #endif if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" ); #else - sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE, VERSION ); + sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION ); #endif strcat( NGIRCd_ProtoID, " P" ); -#ifdef USE_ZLIB +#ifdef ZLIB strcat( NGIRCd_ProtoID, "Z" ); #endif Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID ); @@ -312,7 +323,7 @@ main( int argc, const char *argv[] ) if( Conn_InitListeners( ) < 1 ) { Log( LOG_ALERT, "Server isn't listening on a single port!" ); - Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE ); + Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); exit( 1 ); } @@ -321,6 +332,9 @@ main( int argc, const char *argv[] ) /* Alles abmelden */ Conn_Exit( ); +#ifdef RENDEZVOUS + Rendezvous_Exit( ); +#endif Client_Exit( ); Channel_Exit( ); Lists_Exit( ); @@ -337,9 +351,9 @@ NGIRCd_Version( VOID ) STATIC CHAR version[126]; #ifdef CVSDATE - sprintf( version, "%s %s(%s)-%s", PACKAGE, VERSION, CVSDATE, NGIRCd_VersionAddition( )); + sprintf( version, "%s %s(%s)-%s", PACKAGE_NAME, PACKAGE_VERSION, CVSDATE, NGIRCd_VersionAddition( )); #else - sprintf( version, "%s %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( )); + sprintf( version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition( )); #endif return version; } /* NGIRCd_Version */ @@ -348,18 +362,30 @@ NGIRCd_Version( VOID ) GLOBAL CHAR * NGIRCd_VersionAddition( VOID ) { - STATIC CHAR txt[64]; + STATIC CHAR txt[200]; strcpy( txt, "" ); -#ifdef USE_SYSLOG +#ifdef SYSLOG if( txt[0] ) strcat( txt, "+" ); strcat( txt, "SYSLOG" ); #endif -#ifdef USE_ZLIB +#ifdef ZLIB if( txt[0] ) strcat( txt, "+" ); strcat( txt, "ZLIB" ); #endif +#ifdef TCPWRAP + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "TCPWRAP" ); +#endif +#ifdef RENDEZVOUS + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "RENDEZVOUS" ); +#endif +#ifdef IDENTAUTH + if( txt[0] ) strcat( txt, "+" ); + strcat( txt, "IDENT" ); +#endif #ifdef DEBUG if( txt[0] ) strcat( txt, "+" ); strcat( txt, "DEBUG" ); @@ -377,12 +403,12 @@ NGIRCd_VersionAddition( VOID ) strcat( txt, "IRCPLUS" ); #endif - if( txt[0] ) strcat( txt, "-" ); - strcat( txt, TARGET_CPU ); - strcat( txt, "/" ); - strcat( txt, TARGET_VENDOR ); - strcat( txt, "/" ); - strcat( txt, TARGET_OS ); + if( txt[0] ) strlcat( txt, "-", sizeof( txt )); + strlcat( txt, TARGET_CPU, sizeof( txt )); + strlcat( txt, "/", sizeof( txt )); + strlcat( txt, TARGET_VENDOR, sizeof( txt )); + strlcat( txt, "/", sizeof( txt )); + strlcat( txt, TARGET_OS, sizeof( txt )); return txt; } /* NGIRCd_VersionAddition */ @@ -400,10 +426,13 @@ NGIRCd_Rehash( VOID ) Conn_ExitListeners( ); /* Alten Server-Namen merken */ +#ifdef DEBUG + assert( sizeof( old_name ) == sizeof( Conf_ServerName )); +#endif strcpy( old_name, Conf_ServerName ); /* Konfiguration neu lesen ... */ - Conf_Init( ); + Conf_Rehash( ); /* Alten Server-Namen wiederherstellen: dieser * kann nicht zur Laufzeit geaendert werden ... */ @@ -419,6 +448,9 @@ NGIRCd_Rehash( VOID ) /* Listen-Sockets neu anlegen: */ Conn_InitListeners( ); + /* Sync configuration with established connections */ + Conn_SyncServerStruct( ); + Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." ); } /* NGIRCd_Rehash */ @@ -506,7 +538,7 @@ LOCAL VOID Show_Version( VOID ) { puts( NGIRCd_Version( )); - puts( "Copyright (c)2001,2002 by Alexander Barton ()." ); + puts( "Copyright (c)2001-2003 by Alexander Barton ()." ); puts( "Homepage: \n" ); puts( "This is free software; see the source for copying conditions. There is NO" ); puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ); @@ -525,7 +557,7 @@ Show_Help( VOID ) #ifdef SNIFFER puts( " -s, --sniffer enable network sniffer and display all IRC traffic" ); #endif - puts( " --configtest read, validate and display configuration; then exit" ); + puts( " -t, --configtest read, validate and display configuration; then exit" ); puts( " --version output version information and exit" ); puts( " --help display this help and exit" ); } /* Show_Help */