/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 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
#include "portab.h"
-static char UNUSED id[] = "$Id: log.c,v 1.53 2005/03/19 18:43:49 fw Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.61 2006/07/23 23:23:45 alex Exp $";
#include "imp.h"
#include <assert.h>
#include "log.h"
-LOCAL char Init_Txt[127];
+static char Init_Txt[127];
+static bool Is_Daemon;
#ifdef DEBUG
-LOCAL char Error_File[FNAME_LEN];
+static char Error_File[FNAME_LEN];
#endif
-LOCAL void Wall_ServerNotice PARAMS(( char *Msg ));
+static void Wall_ServerNotice PARAMS(( char *Msg ));
GLOBAL void
-Log_Init( void )
+Log_Init( bool Daemon_Mode )
{
+ Is_Daemon = Daemon_Mode;
+
#ifdef SYSLOG
+#ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
+#define LOG_CONS 0
+#endif
+#ifndef LOG_LOCAL5
+#define LOG_LOCAL5 0
+#endif
/* Syslog initialisieren */
openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
#endif
#ifdef DEBUG
if( NGIRCd_Debug )
{
- strcpy( Init_Txt, "debug-mode" );
+ strlcpy( Init_Txt, "debug-mode", sizeof Init_Txt );
}
#endif
- if( NGIRCd_NoDaemon )
+ if( ! Is_Daemon )
{
- if( Init_Txt[0] ) strcat( Init_Txt, ", " );
- strcat( Init_Txt, "no-daemon-mode" );
+ if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+ strlcat( Init_Txt, "no-daemon-mode", sizeof Init_Txt );
}
if( NGIRCd_Passive )
{
- if( Init_Txt[0] ) strcat( Init_Txt, ", " );
- strcat( Init_Txt, "passive-mode" );
+ if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+ strlcat( Init_Txt, "passive-mode", sizeof Init_Txt );
}
#ifdef SNIFFER
if( NGIRCd_Sniffer )
{
- if( Init_Txt[0] ) strcat( Init_Txt, ", " );
- strcat( Init_Txt, "network sniffer" );
+ if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+ strlcat( Init_Txt, "network sniffer", sizeof Init_Txt );
}
#endif
if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
* landen z.B. alle Ausgaben von assert()-Aufrufen. */
/* Dateiname zusammen bauen */
- sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
+ snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
/* stderr umlenken */
fflush( stderr );
fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
fflush( stderr );
+#ifdef DEBUG
Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
+#endif
} /* Log_InitErrfile */
#endif
} /* Log_Exit */
+/**
+ * Log function for debug messages.
+ * This function is only functional when the program is compiled with debug
+ * code enabled; otherwise it is an empty function which the compiler will
+ * hopefully mangle down to "nothing". Therefore you should use LogDebug(...)
+ * in favor to Log(LOG_DEBUG, ...).
+ * @param Format Format string like printf().
+ * @param ... Further arguments.
+ */
+# ifdef PROTOTYPES
+GLOBAL void
+#ifdef DEBUG
+LogDebug( const char *Format, ... )
+#else
+LogDebug( UNUSED const char *Format, ... )
+#endif /* DEBUG */
+# else
+GLOBAL void
+LogDebug( Format, va_alist )
+const char *Format;
+va_dcl
+# endif /* PROTOTYPES */
+#ifdef DEBUG
+{
+ char msg[MAX_LOG_MSG_LEN];
+ va_list ap;
+
+ if (!NGIRCd_Debug) return;
+#ifdef PROTOTYPES
+ va_start( ap, Format );
+#else
+ va_start( ap );
+#endif
+ vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
+ va_end( ap );
+ Log(LOG_DEBUG, "%s", msg);
+}
+#else
+{
+ /* Do nothing.
+ * The compiler should optimize this out, please ;-) */
+}
+#endif /* DEBUG */
+
+
+/**
+ * Logging function of ngIRCd.
+ * This function logs messages to the console and/or syslog, whichever is
+ * suitable for the mode ngIRCd is running in (daemon vs. non-daemon).
+ * Please note: you sould use LogDebug(...) for debug messages!
+ * @param Level syslog level (LOG_xxx)
+ * @param Format Format string like printf().
+ * @param ... Further arguments.
+ */
#ifdef PROTOTYPES
GLOBAL void
Log( int Level, const char *Format, ... )
#endif
{
/* Eintrag in Logfile(s) schreiben */
-
char msg[MAX_LOG_MSG_LEN];
bool snotice;
va_list ap;
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
- if( NGIRCd_NoDaemon )
+ if( ! Is_Daemon )
{
/* auf Konsole ausgeben */
fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
#ifdef SYSLOG
openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
#endif
+#ifdef DEBUG
Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( ));
+#endif
} /* Log_Init_Resolver */
GLOBAL void
Log_Exit_Resolver( void )
{
+#ifdef DEBUG
Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
+#endif
#ifdef SYSLOG
closelog( );
#endif
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
- /* Output */
- if( NGIRCd_NoDaemon )
+ if( ! Is_Daemon )
{
/* Output to console */
fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
} /* Log_Resolver */
-LOCAL void
+/**
+ * Send log messages to users flagged with the "s" mode.
+ * @param Msg The message to send.
+ */
+static void
Wall_ServerNotice( char *Msg )
{
- /* Server-Notice an entsprechende User verschicken */
-
CLIENT *c;
assert( Msg != NULL );
c = Client_First( );
- while( c )
- {
- if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg );
+ while(c) {
+ if (Client_Conn(c) > NONE && Client_HasMode(c, 's'))
+ IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c),
+ NOTICE_TXTPREFIX, Msg);
+
c = Client_Next( c );
}
} /* Wall_ServerNotice */