ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : --configtest: remember if MOTD is configured by file or phrase
by alex＠arthur.barton.de 02 Dez '10

02 Dez '10

Module: ngircd.git Branch: master Commit: 8ea1c5bb82e224326d1a73c462c74dfcb5badef6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8ea1c5bb… Author: Alexander Barton <alex(a)barton.de> Date: Thu Dec 2 16:51:21 2010 +0100 --configtest: remember if MOTD is configured by file or phrase Configuration variables "MotdFile" and "MotdPhrase" are mutually exclusive; so don't display content in both of them when running "ngircd --configtest": instead remember which one is beeing used. --- src/ngircd/conf.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 4804f2b..4a255b2 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -49,7 +49,7 @@ #include "conf.h" -static bool Use_Log = true; +static bool Use_Log = true, Using_MotdFile = true; static CONF_SERVER New_Server; static int New_Server_Idx; @@ -300,8 +300,14 @@ Conf_Test( void ) printf(" AdminInfo1 = %s\n", Conf_ServerAdmin1); printf(" AdminInfo2 = %s\n", Conf_ServerAdmin2); printf(" AdminEMail = %s\n", Conf_ServerAdminMail); - printf(" MotdFile = %s\n", Conf_MotdFile); - printf(" MotdPhrase = %.32s\n", array_bytes(&Conf_Motd) ? (const char*) array_start(&Conf_Motd) : ""); + if (Using_MotdFile) { + printf(" MotdFile = %s\n", Conf_MotdFile); + printf(" MotdPhrase =\n"); + } else { + printf(" MotdFile = \n"); + printf(" MotdPhrase = %s\n", array_bytes(&Conf_Motd) + ? (const char*) array_start(&Conf_Motd) : ""); + } printf(" ChrootDir = %s\n", Conf_Chroot); printf(" PidFile = %s\n", Conf_PidFile); printf(" Listen = %s\n", Conf_ListenAddress); @@ -649,6 +655,7 @@ Read_Motd(const char *filename) } array_free(&Conf_Motd); + Using_MotdFile = true; while (fgets(line, (int)sizeof line, fp)) { ngt_TrimLastChr( line, '\n'); @@ -951,6 +958,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) if (!array_copyb(&Conf_Motd, Arg, len + 1)) Config_Error(LOG_WARNING, "%s, line %d: Could not append MotdPhrase: %s", NGIRCd_ConfFile, Line, strerror(errno)); + Using_MotdFile = false; return; } if( strcasecmp( Var, "ChrootDir" ) == 0 ) {

1 0

Alexander Barton : Don't log critical (or worse) messages to stderr
by alex＠arthur.barton.de 02 Dez '10

02 Dez '10

Module: ngircd.git Branch: master Commit: 5da98ec389de2a6d671d270abba86c395e593537 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5da98ec3… Author: Alexander Barton <alex(a)barton.de> Date: Thu Dec 2 13:36:19 2010 +0100 Don't log critical (or worse) messages to stderr stderr isn't redirected to the "error file" any more, so there is no point in trying to log to it ... --- src/ngircd/log.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index f68a0fb..0bc53ed 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -205,12 +205,6 @@ va_dcl Log_Message(Level, msg); - if (Level <= LOG_CRIT) { - /* log critical messages to stderr */ - fprintf(stderr, "%s\n", msg); - fflush(stderr); - } - if (snotice) { /* Send NOTICE to all local users with mode +s and to the * local &SERVER channel */

1 0

Alexander Barton : Reset ID of outgoing server link on DNS error correctly
by alex＠arthur.barton.de 02 Dez '10

02 Dez '10

Module: ngircd.git Branch: master Commit: 60bb40d67a8d7c1e38a5d8ca2b7968cf08706008 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=60bb40d6… Author: Alexander Barton <alex(a)barton.de> Date: Thu Dec 2 13:38:42 2010 +0100 Reset ID of outgoing server link on DNS error correctly Not resetting the ID prevents the daemon from trying to re-establish outgoing server links when the DNS resolver failed to resole a hostname. --- src/ngircd/conn.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 2d5e129..a92f99f 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1968,8 +1968,11 @@ cb_Connect_to_Server(int fd, UNUSED short events) /* Read result from pipe */ len = Proc_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs)); - if (len == 0) + if (len == 0) { + /* Error resolving hostname: reset server structure */ + Conf_Server[i].conn_id = NONE; return; + } assert((len % sizeof(ng_ipaddr_t)) == 0);

1 0

Alexander Barton : Enhance log messages when establishing server links a little bit
by alex＠arthur.barton.de 02 Dez '10

02 Dez '10

Module: ngircd.git Branch: master Commit: 79ca5fe04d0081468aa09cf0a7caca45a45b9864 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=79ca5fe0… Author: Alexander Barton <alex(a)barton.de> Date: Thu Dec 2 13:40:08 2010 +0100 Enhance log messages when establishing server links a little bit --- src/ngircd/conn.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index a92f99f..9daca85 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1774,6 +1774,9 @@ Check_Servers(void) } /* Okay, try to connect now */ + Log(LOG_NOTICE, + "Preparing to establish a new server link for \"%s\" ...", + Conf_Server[i].name); Conf_Server[i].lasttry = time_now; Conf_Server[i].conn_id = SERVER_WAIT; assert(Proc_GetPipeFd(&Conf_Server[i].res_stat) < 0); @@ -1798,8 +1801,9 @@ New_Server( int Server , ng_ipaddr_t *dest) return; } - Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ", - Conf_Server[Server].host, ip_str, Conf_Server[Server].port ); + Log(LOG_INFO, "Establishing connection for \"%s\" to \"%s\" (%s) port %d ... ", + Conf_Server[Server].name, Conf_Server[Server].host, ip_str, + Conf_Server[Server].port); af_dest = ng_ipaddr_af(dest); new_sock = socket(af_dest, SOCK_STREAM, 0); @@ -1931,8 +1935,8 @@ Init_Socket( int Sock ) LogDebug("Setting IP_TOS on socket %d to IPTOS_LOWDELAY.", Sock); if (setsockopt(Sock, IPPROTO_IP, IP_TOS, &value, (socklen_t) sizeof(value))) { - Log(LOG_ERR, "Can't set socket option IP_TOS: %s!", - strerror(errno)); + LogDebug("Can't set socket option IP_TOS: %s!", + strerror(errno)); /* ignore this error */ } #endif

1 0

Alexander Barton : Manual page ngircd(8): add SIGNALS section
by alex＠arthur.barton.de 01 Dez '10

01 Dez '10

Module: ngircd.git Branch: master Commit: 0305f75456fde86ff9d0179146d2ea821cff1457 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0305f754… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 1 22:04:28 2010 +0100 Manual page ngircd(8): add SIGNALS section --- man/ngircd.8.tmpl | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index f1251e1..4a01d71 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -64,6 +64,15 @@ The system wide default configuration file. .RS Default "message of the day" (MOTD). .RE +.SH SIGNALS +The daemon understands the following signals: +.TP +\fBTERM\fR +Shut down all conections and terminate the daemon. +.TP +\fBHUP\fR +Shut down all listening sockets, re-read the configuration file and +re-initialize the daemon. .SH HINTS It's wise to use "ngircd \-\-configtest" to validate the configuration file after changing it.

1 0

Alexander Barton : Manual pages: update and simplyfy AUTHORS section
by alex＠arthur.barton.de 01 Dez '10

01 Dez '10

Module: ngircd.git Branch: master Commit: 65bcff35ffae56878a8c14a6aee0018115d660b3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=65bcff35… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 1 22:04:01 2010 +0100 Manual pages: update and simplyfy AUTHORS section --- man/ngircd.8.tmpl | 14 ++++++-------- man/ngircd.conf.5.tmpl | 12 +++++------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index bd5b67d..f1251e1 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd(8) manual page template .\" -.TH ngircd 8 "Dec 2008" ngircd "ngIRCd Manual" +.TH ngircd 8 "Dec 2010" ngircd "ngIRCd Manual" .SH NAME ngIRCd \- the next generation IRC daemon .SH SYNOPSIS @@ -67,14 +67,12 @@ Default "message of the day" (MOTD). .SH HINTS It's wise to use "ngircd \-\-configtest" to validate the configuration file after changing it. -.SH AUTHOR -Alexander Barton, -.UR mailto:alex@barton.de -.UE +.SH AUTHORS +Alexander Barton, <alex(a)barton.de> .br -Homepage: -.UR http://ngircd.barton.de/ -.UE +Florian Westphal, <fw(a)strlen.de> +.PP +Homepage: http://ngircd.barton.de/ .SH "SEE ALSO" .BR ngircd.conf (5), .BR ircd (8) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 2645729..8fa7623 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd.conf(5) manual page template .\" -.TH ngircd.conf 5 "Dec 2008" ngircd "ngIRCd Manual" +.TH ngircd.conf 5 "Dec 2010" ngircd "ngIRCd Manual" .SH NAME ngircd.conf \- configuration file of ngIRCd .SH SYNOPSIS @@ -406,13 +406,11 @@ after changing it. See .BR ngircd (8) for details. .SH AUTHOR -Alexander Barton, -.UR mailto:alex@barton.de -.UE +Alexander Barton, <alex(a)barton.de> .br -Homepage: -.UR http://ngircd.barton.de/ -.UE +Florian Westphal, <fw(a)strlen.de> +.PP +Homepage: http://ngircd.barton.de/ .SH "SEE ALSO" .BR ngircd (8) .\"

1 0

Alexander Barton : Remove "error file" when compiled with debug code enabled
by alex＠arthur.barton.de 01 Dez '10

01 Dez '10

Module: ngircd.git Branch: master Commit: 790fa89e67afbea7025479aad0bd5ef9d384d909 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=790fa89e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 1 21:22:20 2010 +0100 Remove "error file" when compiled with debug code enabled The information written to the "error file" (/tmp/ngircd-<PID>.err) when ngIRCd is compiled with debug code enabled isn't that usefule, so don't create this file at all. --- src/ngircd/log.c | 41 ----------------------------------------- src/ngircd/ngircd.c | 5 ----- 2 files changed, 0 insertions(+), 46 deletions(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 3710142..f68a0fb 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -45,10 +45,6 @@ static char Init_Txt[127]; static bool Is_Daemon; -#ifdef DEBUG -static char Error_File[FNAME_LEN]; -#endif - static void Log_Message(int Level, const char *msg) @@ -107,51 +103,14 @@ Log_Init( bool Daemon_Mode ) } #endif if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt ); - -#ifdef DEBUG - Error_File[0] = '\0'; -#endif } /* Log_Init */ -#ifdef DEBUG -GLOBAL void -Log_InitErrorfile( void ) -{ - snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( )); - - fflush( stderr ); - if( ! freopen( Error_File, "w", stderr )) - { - Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, strerror( errno )); - return; - } - - fputs( ctime( &NGIRCd_Start ), stderr ); - fprintf( stderr, "%s started.\n", NGIRCd_Version ); - fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" ); - fflush( stderr ); - - Log(LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File); -} /* Log_InitErrfile */ -#endif - - GLOBAL void Log_Exit( void ) { - /* Good Bye! */ Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME, NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted()); - -#ifdef DEBUG - if( Error_File[0] ) - { - /* Error-File (stderr) loeschen */ - if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno )); - } -#endif - #ifdef SYSLOG closelog(); #endif diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index d4d4d5f..6dfd206 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -285,11 +285,6 @@ main( int argc, const char *argv[] ) #endif Conn_Init( ); -#ifdef DEBUG - /* Redirect stderr handle to "error file" for debugging - * when not running in "no daemon" mode: */ - if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( ); -#endif if (!io_library_init(CONNECTION_POOL)) { Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); exit(1);

1 0

Alexander Barton : README: Updated list of implemented commands
by alex＠arthur.barton.de 19 Nov '10

19 Nov '10

Module: ngircd.git Branch: master Commit: ce448e90778f634a3349e3a7dad1d98019f2d5b5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ce448e90… Author: Alexander Barton <alex(a)barton.de> Date: Fri Nov 19 21:35:25 2010 +0100 README: Updated list of implemented commands --- README | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index dc11a9f..1feedfe 100644 --- a/README +++ b/README @@ -34,11 +34,11 @@ used in real IRC networks. Implemented IRC-commands are: -ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, HELP, INVITE, ISON, -JOIN, KICK, KILL, LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN, NOTICE, -OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, REHASH, RESTART, SERVER, SQUIT, -STATS, TIME, TOPIC, TRACE, USER, USERHOST, VERSION, WALLOPS, WHO, WHOIS, -WHOWAS. +ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, HELP, INFO, INVITE, +ISON, JOIN, KICK, KILL, LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN, +NOTICE, OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, REHASH, RESTART, SERVER, +SERVICE, SERVLIST, SQUERY, SQUIT, STATS, SUMMON, TIME, TOPIC, TRACE, USER, +USERHOST, USERS, VERSION, WALLOPS, WEBIRC, WHO, WHOIS, WHOWAS. III. Features (or: why use ngIRCd?)

1 0

Alexander Barton : add doc/README-Interix.txt and doc/Bopm. txt to distribution tarball
by alex＠arthur.barton.de 15 Nov '10

15 Nov '10

Module: ngircd.git Branch: master Commit: dd580d3ea73445f17010b6fc0864b6cf132cce55 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dd580d3e… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 15 20:11:16 2010 +0100 add doc/README-Interix.txt and doc/Bopm.txt to distribution tarball --- doc/Makefile.am | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index dc710d4..6a8578f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -17,9 +17,9 @@ SUFFIXES = .tmpl -static_docs = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ - README-BeOS.txt RFC.txt Services.txt SSL.txt Zeroconf.txt \ - HowToRelease.txt PAM.txt +static_docs = Bopm.txt FAQ.txt GIT.txt HowToRelease.txt PAM.txt Platforms.txt \ + Protocol.txt README-AUX.txt README-BeOS.txt README-Interix.txt RFC.txt \ + SSL.txt Services.txt Zeroconf.txt doc_templates = sample-ngircd.conf.tmpl

1 0

Alexander Barton : Save channel creation time; new function Channel_CreationTime()
by alex＠arthur.barton.de 15 Nov '10

15 Nov '10

Module: ngircd.git Branch: master Commit: 9bc5d565bbbd1131aaa7608076598167036f261b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9bc5d565… Author: Alexander Barton <alex(a)barton.de> Date: Thu Nov 11 12:39:19 2010 +0100 Save channel creation time; new function Channel_CreationTime() --- src/ngircd/channel.c | 11 +++++++++++ src/ngircd/channel.h | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 175f23b..edbbc38 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -697,6 +697,14 @@ Channel_TopicWho(CHANNEL *Chan) return Chan->topic_who; } /* Channel_TopicWho */ + +GLOBAL unsigned int +Channel_CreationTime(CHANNEL *Chan) +{ + assert(Chan != NULL); + return (unsigned int) Chan->creation_time; +} /* Channel_CreationTime */ + #endif @@ -834,6 +842,9 @@ Channel_Create( const char *Name ) strlcpy( c->name, Name, sizeof( c->name )); c->hash = Hash( c->name ); c->next = My_Channels; +#ifndef STRICT_RFC + c->creation_time = time(NULL); +#endif My_Channels = c; LogDebug("Created new channel structure for \"%s\".", Name); return c; diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index 46e7e13..030f910 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -30,6 +30,7 @@ typedef struct _CHANNEL char modes[CHANNEL_MODE_LEN]; /* Channel modes */ array topic; /* Topic of the channel */ #ifndef STRICT_RFC + time_t creation_time; /* Channel creation time */ time_t topic_time; /* Time when topic was set */ char topic_who[CLIENT_NICK_LEN];/* Nickname of user that set topic */ #endif @@ -118,6 +119,7 @@ GLOBAL CHANNEL *Channel_Create PARAMS(( const char *Name )); #ifndef STRICT_RFC GLOBAL unsigned int Channel_TopicTime PARAMS(( CHANNEL *Chan )); GLOBAL char *Channel_TopicWho PARAMS(( CHANNEL *Chan )); +GLOBAL unsigned int Channel_CreationTime PARAMS(( CHANNEL *Chan )); #endif GLOBAL bool Channel_AddInvite PARAMS((CHANNEL *c, const char *Mask, bool OnlyOnce ));

1 0

Springe zur Seite:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates