* 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.53 2002/09/03 23:53:19 alex Exp $
+ * $Id: ngircd.c,v 1.61 2002/11/22 23:31:23 alex Exp $
*
* ngircd.c: Hier beginnt alles ;-)
*/
#include <sys/stat.h>
#include <sys/wait.h>
#include <time.h>
+#include <pwd.h>
+#include <grp.h>
#include "resolve.h"
#include "conn.h"
#include "client.h"
#include "channel.h"
#include "conf.h"
+#include "cvs-version.h"
#include "defines.h"
#include "lists.h"
#include "log.h"
LOCAL VOID Initialize_Signal_Handler PARAMS(( VOID ));
LOCAL VOID Signal_Handler PARAMS(( INT Signal ));
-LOCAL VOID Initialize_Listen_Ports PARAMS(( VOID ));
-
LOCAL VOID Show_Version PARAMS(( VOID ));
LOCAL VOID Show_Help PARAMS(( VOID ));
GLOBAL int
main( int argc, const char *argv[] )
{
+ struct passwd *pwd;
+ struct group *grp;
BOOLEAN ok, configtest = FALSE;
- INT32 pid, n;
+ LONG pid, n;
INT i;
umask( 0077 );
{
/* Kurze Option */
- for( n = 1; n < (INT32)strlen( argv[i] ); n++ )
+ for( n = 1; n < (LONG)strlen( argv[i] ); n++ )
{
ok = FALSE;
#ifdef DEBUG
NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
/* zum uebernaechsten Parameter */
- i++; n = strlen( argv[i] );
+ i++; n = (LONG)strlen( argv[i] );
ok = TRUE;
}
}
if( ! NGIRCd_NoDaemon )
{
/* Daemon im Hintergrund erzeugen */
- pid = (INT32)fork( );
+ pid = (LONG)fork( );
if( pid > 0 )
{
/* "alter" Prozess */
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, with PID %ld.", (INT32)getuid( ), (INT32)getgid( ), (INT32)getpid( ));
+
+ /* User, Gruppe und Prozess-ID des Daemon ausgeben */
+ pwd = getpwuid( getuid( )); grp = getgrgid( getgid( ));
+ Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", pwd ? pwd->pw_name : "unknown", (LONG)getuid( ), grp ? grp->gr_name : "unknown", (LONG)getgid( ), (LONG)getpid( ));
+ /* stderr in "Error-File" umlenken */
Log_InitErrorfile( );
/* Signal-Handler initialisieren */
/* Protokoll- und Server-Identifikation erzeugen. Die vom ngIRCd
* 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 );
if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" );
+#else
+ sprintf( NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE, VERSION );
+#endif
strcat( NGIRCd_ProtoID, " P" );
Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
Channel_InitPredefined( );
/* Listen-Ports initialisieren */
- Initialize_Listen_Ports( );
-
+ 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 );
+ exit( 1 );
+ }
+
/* Hauptschleife */
Conn_Handler( );
NGIRCd_Version( VOID )
{
STATIC CHAR version[126];
-
- sprintf( version, "%s version %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( ));
+
+#ifdef CVSDATE
+ sprintf( version, "%s %s(%s)-%s", PACKAGE, VERSION, CVSDATE, NGIRCd_VersionAddition( ));
+#else
+ sprintf( version, "%s %s-%s", PACKAGE, VERSION, NGIRCd_VersionAddition( ));
+#endif
return version;
} /* NGIRCd_Version */
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" );
-#endif
#ifdef DEBUG
if( txt[0] ) strcat( txt, "+" );
strcat( txt, "DEBUG" );
if( txt[0] ) strcat( txt, "+" );
strcat( txt, "SNIFFER" );
#endif
-
+#ifdef STRICT_RFC
+ if( txt[0] ) strcat( txt, "+" );
+ strcat( txt, "RFC" );
+#endif
+#ifdef IRCPLUS
+ if( txt[0] ) strcat( txt, "+" );
+ strcat( txt, "IRCPLUS" );
+#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 */
+GLOBAL VOID
+NGIRCd_Rehash( VOID )
+{
+ CHAR old_name[CLIENT_ID_LEN];
+
+ /* Alle Listen-Sockets schliessen */
+ Conn_ExitListeners( );
+
+ /* Alten Server-Namen merken */
+ strcpy( old_name, Conf_ServerName );
+
+ /* Konfiguration neu lesen ... */
+ Conf_Init( );
+
+ /* Alten Server-Namen wiederherstellen: dieser
+ * kann nicht zur Laufzeit geaendert werden ... */
+ if( strcmp( old_name, Conf_ServerName ) != 0 )
+ {
+ strcpy( Conf_ServerName, old_name );
+ Log( LOG_ERR, "Can't change \"ServerName\" on runtime! Ignored new name." );
+ }
+
+ /* neue pre-defined Channel anlegen: */
+ Channel_InitPredefined( );
+
+ /* Listen-Sockets neu anlegen: */
+ Conn_InitListeners( );
+
+ Log( LOG_INFO, "Re-reading of configuration done." );
+} /* NGIRCd_Rehash */
+
+
LOCAL VOID
Initialize_Signal_Handler( VOID )
{
case SIGINT:
case SIGQUIT:
/* wir soll(t)en uns wohl beenden ... */
- if( Signal == SIGTERM ) Log( LOG_WARNING, "Got TERM signal, terminating now ..." );
- else if( Signal == SIGINT ) Log( LOG_WARNING, "Got INT signal, terminating now ..." );
- else if( Signal == SIGQUIT ) Log( LOG_WARNING, "Got QUIT signal, terminating now ..." );
+ if( Signal == SIGTERM ) Log( LOG_WARNING|LOG_snotice, "Got TERM signal, terminating now ..." );
+ else if( Signal == SIGINT ) Log( LOG_WARNING|LOG_snotice, "Got INT signal, terminating now ..." );
+ else if( Signal == SIGQUIT ) Log( LOG_WARNING|LOG_snotice, "Got QUIT signal, terminating now ..." );
NGIRCd_Quit = TRUE;
break;
case SIGHUP:
- /* neu starten */
- Log( LOG_WARNING, "Got HUP signal, restarting now ..." );
- NGIRCd_Restart = TRUE;
+ /* Konfiguration neu einlesen: */
+ Log( LOG_WARNING|LOG_snotice, "Got HUP signal, re-reading configuration ..." );
+ NGIRCd_Rehash( );
break;
case SIGCHLD:
/* Child-Prozess wurde beendet. Zombies vermeiden: */
} /* Signal_Handler */
-LOCAL VOID
-Initialize_Listen_Ports( VOID )
-{
- /* Ports, auf denen der Server Verbindungen entgegennehmen
- * soll, initialisieren */
-
- UINT created, i;
-
- created = 0;
- for( i = 0; i < Conf_ListenPorts_Count; i++ )
- {
- if( Conn_NewListener( Conf_ListenPorts[i] )) created++;
- else Log( LOG_ERR, "Can't listen on port %u!", Conf_ListenPorts[i] );
- }
-
- if( created < 1 )
- {
- Log( LOG_ALERT, "Server isn't listening on a single port!" );
- Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
- exit( 1 );
- }
-} /* Initialize_Listen_Ports */
-
-
LOCAL VOID
Show_Version( VOID )
{
puts( " -d, --debug log extra debug messages" );
#endif
puts( " -f, --config <f> use file <f> as configuration file" );
- puts( " -n, --nodaemon don't fork and don't detatch from controlling terminal" );
+ puts( " -n, --nodaemon don't fork and don't detach from controlling terminal" );
puts( " -p, --passive disable automatic connections to other servers" );
#ifdef SNIFFER
puts( " -s, --sniffer enable network sniffer and display all IRC traffic" );
projects / ngircd-alex.git / blobdiff