Don't #include client.h when conn.h/conn-func.h is already included

[ngircd.git] / src / ngircd / ngircd.c

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 1f7969df0aba32b8a83d1dc9394d99e70aa6b223..0319d8310766e07374af6737ce03ecc0ce03170f 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2010 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
@@ -39,10 +39,8 @@
 #endif
 
 #include "defines.h"
-#include "resolve.h"
 #include "conn.h"
 #include "conf-ssl.h"
-#include "client.h"
 #include "channel.h"
 #include "conf.h"
 #include "lists.h"
@@ -110,14 +108,13 @@ main( int argc, const char *argv[] )
 
        Fill_Version( );
 
-       /* Kommandozeile parsen */
+       /* parse conmmand line */
        for( i = 1; i < argc; i++ )
        {
                ok = false;
                if(( argv[i][0] == '-' ) && ( argv[i][1] == '-' ))
                {
-                       /* Lange Option */
-
+                       /* long option */
                        if( strcmp( argv[i], "--config" ) == 0 )
                        {
                                if( i + 1 < argc )
@@ -172,7 +169,7 @@ main( int argc, const char *argv[] )
                }
                else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' ))
                {
-                       /* Kurze Option */
+                       /* short option */
                        for( n = 1; n < strlen( argv[i] ); n++ )
                        {
                                ok = false;
@@ -241,7 +238,7 @@ main( int argc, const char *argv[] )
                }
        }
 
-       /* Debug-Level (fuer IRC-Befehl "VERSION") ermitteln */
+       /* Debug-Level (for IRCs "VERSION" command) */
        NGIRCd_DebugLevel[0] = '\0';
 #ifdef DEBUG
        if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" );
@@ -254,7 +251,6 @@ main( int argc, const char *argv[] )
        }
 #endif
 
-       /* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */
        if( configtest )
        {
                Show_Version( ); puts( "" );
@@ -297,12 +293,13 @@ main( int argc, const char *argv[] )
                if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( );
 #endif
 
-               /* Signal-Handler initialisieren */
                Initialize_Signal_Handler( );
 
-               /* Protokoll- und Server-Identifikation erzeugen. Die vom ngIRCd
-                * beim PASS-Befehl verwendete Syntax sowie die erweiterten Flags
-                * sind in doc/Protocol.txt beschrieben. */
+               /*
+                * create protocol and server identification.
+                * The syntax used by ngIRCd in PASS commands and the extended flags
+                * are described in doc/Protocol.txt
+                */
 #ifdef IRCPLUS
                snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS );
 #ifdef ZLIB
@@ -316,12 +313,10 @@ main( int argc, const char *argv[] )
 #ifdef ZLIB
                strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID );
 #endif
-               Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
+               LogDebug("Protocol and server ID is \"%s\".", NGIRCd_ProtoID);
 
-               /* Vordefinierte Channels anlegen */
                Channel_InitPredefined( );
 
-               /* Listen-Ports initialisieren */
                if( Conn_InitListeners( ) < 1 )
                {
                        Log( LOG_ALERT, "Server isn't listening on a single port!" );
@@ -490,15 +485,9 @@ NGIRCd_Rehash( void )
 static void
 Initialize_Signal_Handler( void )
 {
-       /* Signal-Handler initialisieren: einige Signale
-        * werden ignoriert, andere speziell behandelt. */
-
 #ifdef HAVE_SIGACTION
-       /* sigaction() ist vorhanden */
-
        struct sigaction saction;
 
-       /* Signal-Struktur initialisieren */
        memset( &saction, 0, sizeof( saction ));
        saction.sa_handler = Signal_Handler;
 #ifdef SA_RESTART
@@ -508,27 +497,22 @@ Initialize_Signal_Handler( void )
        saction.sa_flags |= SA_NOCLDWAIT;
 #endif
 
-       /* Signal-Handler einhaengen */
        sigaction(SIGINT, &saction, NULL);
        sigaction(SIGQUIT, &saction, NULL);
        sigaction(SIGTERM, &saction, NULL);
        sigaction(SIGHUP, &saction, NULL);
        sigaction(SIGCHLD, &saction, NULL);
 
-       /* einige Signale ignorieren */
+       /* we handle write errors properly; ignore SIGPIPE */
        saction.sa_handler = SIG_IGN;
        sigaction(SIGPIPE, &saction, NULL);
 #else
-       /* kein sigaction() vorhanden */
-
-       /* Signal-Handler einhaengen */
        signal(SIGINT, Signal_Handler);
        signal(SIGQUIT, Signal_Handler);
        signal(SIGTERM, Signal_Handler);
        signal(SIGHUP, Signal_Handler);
        signal(SIGCHLD, Signal_Handler);
 
-       /* einige Signale ignorieren */
        signal(SIGPIPE, SIG_IGN);
 #endif
 } /* Initialize_Signal_Handler */
@@ -548,16 +532,17 @@ Signal_Handler( int Signal )
                case SIGTERM:
                case SIGINT:
                case SIGQUIT:
-                       /* wir soll(t)en uns wohl beenden ... */
+                       /* shut down sever */
                        NGIRCd_SignalQuit = true;
                        break;
                case SIGHUP:
-                       /* Konfiguration neu einlesen: */
+                       /* re-read configuration */
                        NGIRCd_SignalRehash = true;
                        break;
                case SIGCHLD:
-                       /* Child-Prozess wurde beendet. Zombies vermeiden: */
-                       while( waitpid( -1, NULL, WNOHANG ) > 0);
+                       /* child-process exited, avoid zombies */
+                       while (waitpid( -1, NULL, WNOHANG) > 0)
+                               ;
                        break;
 #ifdef DEBUG
                default:
@@ -575,7 +560,7 @@ static void
 Show_Version( void )
 {
        puts( NGIRCd_Version );
-       puts( "Copyright (c)2001-2008 Alexander Barton (<alex@barton.de>) and Contributors." );
+       puts( "Copyright (c)2001-2010 Alexander Barton (<alex@barton.de>) and Contributors." );
        puts( "Homepage: <http://ngircd.barton.de/>\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." );
@@ -811,7 +796,9 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
 #else
                setpgrp(0, getpid());
 #endif
-               chdir( "/" );
+               if (chdir( "/" ) != 0)
+                       Log(LOG_ERR, "Can't change directory to '/': %s",
+                                    strerror(errno));
 
                /* Detach stdin, stdout and stderr */
                Setup_FDStreams( );
@@ -828,9 +815,9 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
        pwd = getpwuid( Conf_UID );
        grp = getgrgid( Conf_GID );
 
-       Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.",
-                               pwd ? pwd->pw_name : "unknown", Conf_UID,
-                               grp ? grp->gr_name : "unknown", Conf_GID, pid);
+       Log(LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.",
+                               pwd ? pwd->pw_name : "unknown", (long)Conf_UID,
+                               grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid);
 
        if (chrooted) {
                Log(LOG_INFO, "Running with root directory \"%s\".",