Dezember 2010 - ngIRCd GIT Updates

Florian Westphal : channel: fix confusing "adding to invite list" debug output
by fw＠arthur.barton.de 31 Dez '10

31 Dez '10

Module: ngircd.git Branch: master Commit: 4a5dfcc3ace54de033f16503065831ed62433b2d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a5dfcc3… Author: Florian Westphal <fw(a)strlen.de> Date: Fri Dec 31 11:32:20 2010 +0100 channel: fix confusing "adding to invite list" debug output adding entries to ban list produced 'invite list' debug output... --- src/ngircd/channel.c | 2 ++ src/ngircd/lists.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index edbbc38..e49e5a9 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -989,6 +989,7 @@ GLOBAL bool Channel_AddBan(CHANNEL *c, const char *mask ) { struct list_head *h = Channel_GetListBans(c); + LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "ban"); return Lists_Add(h, mask, false); } @@ -997,6 +998,7 @@ GLOBAL bool Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce) { struct list_head *h = Channel_GetListInvites(c); + LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "invite"); return Lists_Add(h, mask, onlyonce); } diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 363c62d..58c5d16 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -85,7 +85,6 @@ Lists_Add(struct list_head *header, const char *Mask, bool OnlyOnce ) newelem->next = e; header->first = newelem; - LogDebug("Added \"%s\" to invite list", Mask); return true; }

1 0

Alexander Barton : Command throttling: introduce MAX_COMMANDS_SERVICE
by alex＠arthur.barton.de 29 Dez '10

29 Dez '10

Module: ngircd.git Branch: master Commit: f37e495a2badf94fff2eaff24ed730dbceef94e0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f37e495a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 29 14:19:51 2010 +0100 Command throttling: introduce MAX_COMMANDS_SERVICE New MAX_COMMANDS_SERVICE (currently set to MAX_COMMANDS_SERVER[10]), so that services are handled like servers (and not regular users). --- src/ngircd/conn.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 73a66bb..51ab8fd 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -82,6 +82,7 @@ #define MAX_COMMANDS 3 #define MAX_COMMANDS_SERVER 10 +#define MAX_COMMANDS_SERVICE MAX_COMMANDS_SERVER static bool Handle_Write PARAMS(( CONN_ID Idx )); @@ -1530,7 +1531,7 @@ Read_Request( CONN_ID Idx ) /** * Handle all data in the connection read-buffer. * Data is processed until no complete command is left in the read buffer, - * or MAX_COMMANDS[_SERVER] commands were processed. + * or MAX_COMMANDS[_SERVER|_SERVICE] commands were processed. * When a fatal error occurs, the connection is shut down. * @param Idx Index of the connection. * @return number of bytes processed. @@ -1555,8 +1556,12 @@ Handle_Buffer(CONN_ID Idx) /* Servers do get special command limits, so they can process * all the messages that are required while peering. */ - if (Client_Type(c) == CLIENT_SERVER) - maxcmd = MAX_COMMANDS_SERVER; + switch (Client_Type(c)) { + case CLIENT_SERVER: + maxcmd = MAX_COMMANDS_SERVER; break; + case CLIENT_SERVICE: + maxcmd = MAX_COMMANDS_SERVICE; break; + } starttime = time(NULL); for (i=0; i < maxcmd; i++) {

1 0

Alexander Barton : Don't throttle services and servers beeing registered
by alex＠arthur.barton.de 29 Dez '10

29 Dez '10

Module: ngircd.git Branch: master Commit: 21cbf37db5647159eced6ed1275e0e2e6980155c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=21cbf37d… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 29 14:12:34 2010 +0100 Don't throttle services and servers beeing registered --- src/ngircd/conn.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 9daca85..73a66bb 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1517,6 +1517,8 @@ Read_Request( CONN_ID Idx ) /* Look at the data in the (read-) buffer of this connection */ My_Connections[Idx].bps += Handle_Buffer(Idx); if (Client_Type(c) != CLIENT_SERVER + && Client_Type(c) != CLIENT_UNKNOWNSERVER + && Client_Type(c) != CLIENT_SERVICE && My_Connections[Idx].bps >= maxbps) { LogDebug("Throttling connection %d: BPS exceeded! (%u >= %u)", Idx, My_Connections[Idx].bps, maxbps);

1 0

Alexander Barton : Xcode: correctly sort files
by alex＠arthur.barton.de 29 Dez '10

29 Dez '10

Module: ngircd.git Branch: master Commit: 4188a82e7674a46903c87e257ebbeeb013dc8146 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4188a82e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 29 14:11:40 2010 +0100 Xcode: correctly sort files --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 98437c1..b9c4685 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -348,8 +348,8 @@ FA322D070CEF74B1001761B3 /* ngircd.h */, FAE5CC2D0CF2308A007D69B6 /* numeric.c */, FAE5CC2C0CF2308A007D69B6 /* numeric.h */, - FA85178A0FA061EC006A1F5A /* op.h */, FA85178B0FA061EC006A1F5A /* op.c */, + FA85178A0FA061EC006A1F5A /* op.h */, FA322D080CEF74B1001761B3 /* parse.c */, FA322D090CEF74B1001761B3 /* parse.h */, FA99428B10E82A27007F27ED /* proc.c */,

1 0

Alexander Barton : Don't assert() when serching a client for an invalid server token
by alex＠arthur.barton.de 24 Dez '10

24 Dez '10

Module: ngircd.git Branch: master Commit: 36d4f6c6015a0c93a2785e135d43dc8f23797b38 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=36d4f6c6… Author: Alexander Barton <alex(a)barton.de> Date: Fri Dec 24 12:48:03 2010 +0100 Don't assert() when serching a client for an invalid server token This is only relevant when a trusted server on a server-server link sends invalid commands. --- src/ngircd/client.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 739c5ea..ecd1a7c 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -553,17 +553,19 @@ Client_Search( const char *Nick ) } /* Client_Search */ +/** + * Get client structure ("introducer") identfied by a server token. + * @return CLIENT structure or NULL if none could be found. + */ GLOBAL CLIENT * Client_GetFromToken( CLIENT *Client, int Token ) { - /* Client-Struktur, die den entsprechenden Introducer (=Client) - * und das gegebene Token hat, liefern. Wird keine gefunden, - * so wird NULL geliefert. */ - CLIENT *c; assert( Client != NULL ); - assert( Token > 0 ); + + if (!Token) + return NULL; c = My_Clients; while (c) {

1 0

Tag rel-17.1: Alexander Barton : ngIRCd release 17.1
by alex＠arthur.barton.de 19 Dez '10

19 Dez '10

Module: ngircd.git Branch: refs/tags/rel-17.1 Tag: 1b0d26d24f779265352f10a15acdba605c51b8fb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=1b0d26d24f7… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun Dec 19 16:25:40 2010 +0100 ngIRCd release 17.1

1 0

Alexander Barton : ngIRCd release 17.1
by alex＠arthur.barton.de 19 Dez '10

19 Dez '10

Module: ngircd.git Branch: master Commit: 186b14f332810dd8e828c4f07ec89efcc298d4b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=186b14f3… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 19 15:59:00 2010 +0100 ngIRCd release 17.1 --- ChangeLog | 16 ++++++++++++++++ NEWS | 6 ++++++ contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 29 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83cdfd5..93206ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,22 @@ -- ChangeLog -- +ngIRCd Release 17.1 (2010-12-19) + + - --configtest: remember if MOTD is configured by file or phrase + - Enhance log messages when establishing server links a little bit + - Reset ID of outgoing server link on DNS error correctly + - Don't log critical (or worse) messages to stderr + - Manual page ngircd(8): add SIGNALS section + - Manual pages: update and simplyfy AUTHORS section + - Remove "error file" when compiled with debug code enabled + - README: Updated list of implemented commands + - add doc/README-Interix.txt and doc/Bopm.txt to distribution tarball + - Merge branch 'numeric-329' + - add doc/PAM.txt to distribution tarball + - New numeric 329: get channel creation time on "MODE #chan" commands + - Save channel creation time; new function Channel_CreationTime() + ngIRCd Release 17 (2010-11-07) - doc: change path names in sample-ngircd.conf depending on sysconfdir diff --git a/NEWS b/NEWS index 47cb72d..9524e8b 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,12 @@ -- NEWS -- +ngIRCd Release 17.1 (2010-12-19) + + - Don't log critical (or worse) messages to stderr + - Remove "error file" when compiled with debug code enabled + - New numeric 329: get channel creation time on "MODE #chan" commands + ngIRCd Release 17 (2010-11-07) - doc: change path names in sample-ngircd.conf depending on sysconfdir diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 907a31a..06e9194 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (17.1-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 17.1. + + -- Alexander Barton <alex(a)barton.de> Sun, 19 Dec 2010 15:56:42 +0100 + ngircd (17-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 17. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 5240c88..da0c2f7 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 17 +%define version 17.1 %define release 1 %define prefix %{_prefix}

1 0

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 : 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 : 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