X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=f8c710d27100cb8b7fb48c4cb1d6f6b6f1747364;hp=78ffd9a00f029d5e84b3feafd4d7cdd84f53fb99;hb=65b31ffbb261dbf96a220afa232532787da9458f;hpb=75c0bd250eeb4c5347d3d2fc1524936f472fcda0

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 78ffd9a0..f8c710d2 100644
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.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: ngircd.c,v 1.43 2002/04/04 13:03:55 alex Exp $
+ * $Id: ngircd.c,v 1.50 2002/09/02 19:00:25 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -26,37 +26,43 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <time.h>
 
-#include "channel.h"
+#include "resolve.h"
+#include "conn.h"
 #include "client.h"
+#include "channel.h"
 #include "conf.h"
-#include "conn.h"
 #include "defines.h"
-#include "irc.h"
+#include "lists.h"
 #include "log.h"
 #include "parse.h"
+#include "irc.h"
 
 #include "exp.h"
 #include "ngircd.h"
 
 
-LOCAL VOID Initialize_Signal_Handler( VOID );
-LOCAL VOID Signal_Handler( INT Signal );
+LOCAL VOID Initialize_Signal_Handler PARAMS(( VOID ));
+LOCAL VOID Signal_Handler PARAMS(( INT Signal ));
 
-LOCAL VOID Initialize_Listen_Ports( VOID );
+LOCAL VOID Initialize_Listen_Ports PARAMS(( VOID ));
 
-LOCAL VOID Show_Version( VOID );
-LOCAL VOID Show_Help( VOID );
+LOCAL VOID Show_Version PARAMS(( VOID ));
+LOCAL VOID Show_Help PARAMS(( VOID ));
 
 
-GLOBAL int main( int argc, const char *argv[] )
+GLOBAL int
+main( int argc, const char *argv[] )
 {
 	BOOLEAN ok, configtest = FALSE;
 	INT32 pid, n;
 	INT i;
 
+	umask( 0077 );
+
 	NGIRCd_Restart = FALSE;
 	NGIRCd_Quit = FALSE;
 	NGIRCd_NoDaemon = FALSE;
@@ -177,8 +183,8 @@ GLOBAL int main( int argc, const char *argv[] )
 
 				if( ! ok )
 				{
-					printf( PACKAGE": invalid option \"-%c\"!\n", argv[i][n] );
-					puts( "Try \""PACKAGE" --help\" for more information." );
+					printf( "%s: invalid option \"-%c\"!\n", PACKAGE, argv[i][n] );
+					printf( "Try \"%s --help\" for more information.\n", PACKAGE );
 					exit( 1 );
 				}
 			}
@@ -186,8 +192,8 @@ GLOBAL int main( int argc, const char *argv[] )
 		}
 		if( ! ok )
 		{
-			printf( PACKAGE": invalid option \"%s\"!\n", argv[i] );
-			puts( "Try \""PACKAGE" --help\" for more information." );
+			printf( "%s: invalid option \"%s\"!\n", PACKAGE, argv[i] );
+			printf( "Try \"%s --help\" for more information.\n", PACKAGE );
 			exit( 1 );
 		}
 	}
@@ -198,7 +204,11 @@ GLOBAL int main( int argc, const char *argv[] )
 	if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" );
 #endif
 #ifdef SNIFFER
-	if( NGIRCd_Sniffer ) strcpy( NGIRCd_DebugLevel, "2" );
+	if( NGIRCd_Sniffer )
+	{
+		NGIRCd_Debug = TRUE;
+		strcpy( NGIRCd_DebugLevel, "2" );
+	}
 #endif
 
 	/* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */
@@ -226,7 +236,7 @@ GLOBAL int main( int argc, const char *argv[] )
 			if( pid < 0 )
 			{
 				/* Fehler */
-				printf( PACKAGE": Can't fork: %s!\nFatal error, exiting now ...", strerror( errno ));
+				printf( "%s: Can't fork: %s!\nFatal error, exiting now ...\n", PACKAGE, strerror( errno ));
 				exit( 1 );
 			}
 
@@ -243,7 +253,9 @@ GLOBAL int main( int argc, const char *argv[] )
 
 		/* Module initialisieren */
 		Log_Init( );
+		Resolve_Init( );
 		Conf_Init( );
+		Lists_Init( );
 		Channel_Init( );
 		Client_Init( );
 		Conn_Init( );
@@ -263,28 +275,31 @@ GLOBAL int main( int argc, const char *argv[] )
 				if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change User-ID to %u: %s", Conf_UID, strerror( errno ));
 			}
 		}
-		Log( LOG_INFO, "Running as user %ld, group %ld.", (INT32)getuid( ), (INT32)getgid( ));
+		Log( LOG_INFO, "Running as user %ld, group %ld, with PID %ld.", (INT32)getuid( ), (INT32)getgid( ), (INT32)getpid( ));
 
 		Log_InitErrorfile( );
 
 		/* Signal-Handler initialisieren */
 		Initialize_Signal_Handler( );
 
+		/* Protokoll- und Server-Identifikation erzeugen */
+		sprintf( NGIRCd_ProtoID, "%s%s %s|%s:%s P", PROTOVER, PROTOSUFFIX, PACKAGE, VERSION, "" );
+		Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
+
+		/* Vordefinierte Channels anlegen */
+		Channel_InitPredefined( );
+
 		/* Listen-Ports initialisieren */
 		Initialize_Listen_Ports( );
 
 		/* Hauptschleife */
-		while( TRUE )
-		{
-			if( NGIRCd_Quit || NGIRCd_Restart ) break;
-			Conn_Handler( 5 );
-		}
+		Conn_Handler( );
 
 		/* Alles abmelden */
 		Conn_Exit( );
 		Client_Exit( );
 		Channel_Exit( );
-		Conf_Exit( );
+		Lists_Exit( );
 		Log_Exit( );
 	}
 
@@ -292,16 +307,18 @@ GLOBAL int main( int argc, const char *argv[] )
 } /* main */
 
 
-GLOBAL CHAR *NGIRCd_Version( VOID )
+GLOBAL CHAR *
+NGIRCd_Version( VOID )
 {
 	STATIC CHAR version[126];
 
-	sprintf( version, PACKAGE" version "VERSION"-%s", NGIRCd_VersionAddition( ));
+	sprintf( version, "%s version %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( ));
 	return version;
 } /* NGIRCd_Version */
 
 
-GLOBAL CHAR *NGIRCd_VersionAddition( VOID )
+GLOBAL CHAR *
+NGIRCd_VersionAddition( VOID )
 {
 	STATIC CHAR txt[64];
 
@@ -311,6 +328,10 @@ GLOBAL CHAR *NGIRCd_VersionAddition( VOID )
 	if( txt[0] ) strcat( txt, "+" );
 	strcat( txt, "SYSLOG" );
 #endif
+#ifdef REGEX
+	if( txt[0] ) strcat( txt, "+" );
+	strcat( txt, "REGEX" );
+#endif
 #ifdef STRICT_RFC
 	if( txt[0] ) strcat( txt, "+" );
 	strcat( txt, "RFC" );
@@ -325,13 +346,22 @@ GLOBAL CHAR *NGIRCd_VersionAddition( VOID )
 #endif
 
 	if( txt[0] ) strcat( txt, "-" );
+#ifdef PROTOTYPES
 	strcat( txt, TARGET_CPU"/"TARGET_VENDOR"/"TARGET_OS );
+#else
+	strcat( txt, TARGET_CPU );
+	strcat( txt, "/" );
+	strcat( txt, TARGET_VENDOR );
+	strcat( txt, "/" );
+	strcat( txt, TARGET_OS );
+#endif	
 
 	return txt;
 } /* NGIRCd_VersionAddition */
 
 
-LOCAL VOID Initialize_Signal_Handler( VOID )
+LOCAL VOID
+Initialize_Signal_Handler( VOID )
 {
 	/* Signal-Handler initialisieren: einige Signale
 	 * werden ignoriert, andere speziell behandelt. */
@@ -377,7 +407,8 @@ LOCAL VOID Initialize_Signal_Handler( VOID )
 } /* Initialize_Signal_Handler */
 
 
-LOCAL VOID Signal_Handler( INT Signal )
+LOCAL VOID
+Signal_Handler( INT Signal )
 {
 	/* Signal-Handler. Dieser wird aufgerufen, wenn eines der Signale eintrifft,
 	 * fuer das wir uns registriert haben (vgl. Initialize_Signal_Handler). Die
@@ -410,7 +441,8 @@ LOCAL VOID Signal_Handler( INT Signal )
 } /* Signal_Handler */
 
 
-LOCAL VOID Initialize_Listen_Ports( VOID )
+LOCAL VOID
+Initialize_Listen_Ports( VOID )
 {
 	/* Ports, auf denen der Server Verbindungen entgegennehmen
 	 * soll, initialisieren */
@@ -427,13 +459,14 @@ LOCAL VOID Initialize_Listen_Ports( VOID )
 	if( created < 1 )
 	{
 		Log( LOG_ALERT, "Server isn't listening on a single port!" );
-		Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" );
+		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
 		exit( 1 );
 	}
 } /* Initialize_Listen_Ports */
 
 
-LOCAL VOID Show_Version( VOID )
+LOCAL VOID
+Show_Version( VOID )
 {
 	puts( NGIRCd_Version( ));
 	puts( "Copyright (c)2001,2002 by Alexander Barton (<alex@barton.de>)." );
@@ -443,7 +476,8 @@ LOCAL VOID Show_Version( VOID )
 } /* Show_Version */
 
 
-LOCAL VOID Show_Help( VOID )
+LOCAL VOID
+Show_Help( VOID )
 {
 #ifdef DEBUG
 	puts( "  -d, --debug        log extra debug messages" );