- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Platforms.txt: Update powerpc/apple/darwin7.9.0
by alex＠arthur.barton.de 19 Mär '14

19 Mär '14

Module: ngircd.git Branch: master Commit: dee824a3f06a555e4be9022833a2c7bd0ba02414 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dee824a3… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 13 16:51:41 2014 +0100 Platforms.txt: Update powerpc/apple/darwin7.9.0 - Update powerpc/apple/darwin7.9.0, gcc 3.3 Thanks to Götz Hoffart <goetz(a)hoffart.de>! --- doc/Platforms.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index ed47e69..246c116 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -74,7 +74,7 @@ m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ? mipsel/unknown/linux-gnu gcc 4.1.2 18 11-07-05 goetz Y Y N Y 1 mipsel/unknown/linux-gnu gcc 4.4.5 21 13-11-24 goetz Y Y Y Y 1 powerpc/apple/darwin6.8 gcc 3.1 21 14-01-03 goetz Y Y Y Y -powerpc/apple/darwin7.9.0 gcc 3.3 19.1 12-05-22 goetz Y Y Y Y 3 +powerpc/apple/darwin7.9.0 gcc 3.3 21 14-01-11 goetz Y Y Y Y 3 powerpc/apple/darwin8.11.0 gcc 4.0.1 18 11-07-02 goetz Y Y Y Y 3 powerpc/apple/darwin9.8.0 gcc 4.0.1 21 14-01-04 goetz Y Y Y Y 3 powerpc/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y

1 0

Alexander Barton : Platforms.txt: Update x86_64/unkn./linux-gnu, clang 3.x
by alex＠arthur.barton.de 19 Mär '14

19 Mär '14

Module: ngircd.git Branch: master Commit: f5ae1dd36c6b37351e6cd2252bcdd88c981630ad URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f5ae1dd3… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 7 21:18:13 2014 +0100 Platforms.txt: Update x86_64/unkn./linux-gnu, clang 3.x - Update x86_64/unknown/linux-gnu, clang 3.2 => clang 3.3 --- doc/Platforms.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 26258a5..ed47e69 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -89,7 +89,7 @@ x86_64/unknown/dragonfly3.4 gcc 4.7.2 21 13-11-12 goetz Y Y N Y 3 x86_64/unknown/freebsd8.4 gcc 4.2.1 21 14-01-02 alex Y Y Y Y 3 x86_64/unknown/freebsd9.1 gcc 4.2.1 21 14-01-02 alex Y Y Y Y 3 x86_64/unkn./freebsd8.1-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y 3 -x86_64/unknown/linux-gnu clang 3.2 21~rc2 13-10-20 alex Y Y Y Y 1 +x86_64/unknown/linux-gnu clang 3.3 21 14-01-07 alex Y Y Y Y 1 x86_64/unknown/linux-gnu gcc 4.8.2 21 13-12-29 alex Y Y Y Y 1 x86_64/unknown/linux-gnu nwcc 0.8.2 21 13-12-01 goetz Y Y Y Y 1 x86_64/unknown/linux-gnu Open64 21 13-11-30 goetz Y Y Y Y 1

1 0

Alexander Barton : Platforms.txt: Add and update more systems
by alex＠arthur.barton.de 19 Mär '14

19 Mär '14

Module: ngircd.git Branch: master Commit: 794cb51e4bb99118f623aecf7983d14d8def1dca URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=794cb51e… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 7 10:09:54 2014 +0100 Platforms.txt: Add and update more systems - update i686/pc/linux-gnu, gcc 2.7.2 - update powerpc/apple/darwin6.8, gcc 3.1 - add powerpc/apple/darwin9.8.0, gcc 4.0.1 Thanks to Götz Hoffart <goetz(a)hoffart.de>! --- doc/Platforms.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 9dea717..26258a5 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -60,7 +60,7 @@ i386/unknown/openbsd5.4 gcc 4.2.1 21 13-11-28 goetz Y Y Y Y 3 i586/pc/haiku gcc 2.95.3 19.2~138 12-10-11 user Y Y N N i586/pc/interix3.5 gcc 3.3 19 12-02-29 alex Y Y N Y i686/pc/cygwin gcc 4.8.2 21 14-01-02 alex Y Y N Y -i686/pc/linux-gnu gcc 2.7.2 19.1 12-05-30 goetz Y Y Y Y 1 +i686/pc/linux-gnu gcc 2.7.2 21~38 14-01-06 goetz Y Y Y Y 1 i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y 1 i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y 1 i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y 1 @@ -73,9 +73,10 @@ m68k/hp/hp-ux9.10 Orig. HPUX 0.7.x-CVS 03-04-30 goetz Y Y Y Y m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ? mipsel/unknown/linux-gnu gcc 4.1.2 18 11-07-05 goetz Y Y N Y 1 mipsel/unknown/linux-gnu gcc 4.4.5 21 13-11-24 goetz Y Y Y Y 1 -powerpc/apple/darwin6.5 gcc 3.1 0.7.x-CVS 03-04-23 alex Y Y Y Y +powerpc/apple/darwin6.8 gcc 3.1 21 14-01-03 goetz Y Y Y Y powerpc/apple/darwin7.9.0 gcc 3.3 19.1 12-05-22 goetz Y Y Y Y 3 powerpc/apple/darwin8.11.0 gcc 4.0.1 18 11-07-02 goetz Y Y Y Y 3 +powerpc/apple/darwin9.8.0 gcc 4.0.1 21 14-01-04 goetz Y Y Y Y 3 powerpc/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y powerpc/unknown/openbsd3.6 gcc 2.95.3 0.10.0 06-10-08 alex Y Y N Y sparc/sun/solaris2.6 gcc 2.95.3 0.7.x-CVS 03-04-22 alex Y Y Y Y

1 0

Alexander Barton : doc/Bopm.txt: Update file header
by alex＠arthur.barton.de 19 Mär '14

19 Mär '14

Module: ngircd.git Branch: master Commit: dd4b74e29b3efa476efb7a3627b1878bf0ce52e2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dd4b74e2… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 19 00:59:01 2014 +0100 doc/Bopm.txt: Update file header --- doc/Bopm.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/Bopm.txt b/doc/Bopm.txt index 51e084d..338e5cb 100644 --- a/doc/Bopm.txt +++ b/doc/Bopm.txt @@ -1,9 +1,8 @@ ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ - (c)2001-2010 Alexander Barton, - alex(a)barton.de, http://www.barton.de/ - + (c)2001-2014 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License.

1 0

Alexander Barton : doc/Bopm.txt: Update "connregex" and "kline" for current ngIRCd
by alex＠arthur.barton.de 19 Mär '14

19 Mär '14

Module: ngircd.git Branch: master Commit: daed2467dd4132e1aaea889b7988264399c197ff URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=daed2467… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 19 00:54:23 2014 +0100 doc/Bopm.txt: Update "connregex" and "kline" for current ngIRCd Thanks to "kerin" on IRC for pointing this out! --- doc/Bopm.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/Bopm.txt b/doc/Bopm.txt index bd14450..51e084d 100644 --- a/doc/Bopm.txt +++ b/doc/Bopm.txt @@ -18,7 +18,7 @@ monitor, designed for use with hybrid-based ircds, although it can be used with slight modification on any server which has the ability to show connects to opers and that supports KLINEs." -And starting with Release 17, ngIRCd supports all required log messages that +Starting with Release 17, ngIRCd supports all required log messages that BOPM requires to be useful. II. Installation @@ -37,11 +37,12 @@ a) BOPM "IRC" section: 3) change "mode" to "+ci" or "+c". 4) Set "connregex" to the following string, everything in one line(!): - "\\*\\*\\* Notice -- Client connecting: ([^ ]+) \\(([^@]+)@([^\\)]+)\\) \\[([0-9\\.]+)\\].*"; - and comment all the other "connregex" examples (prepend a "#" character). + "Client connecting: ([^ ]+) \\(([^@]+)@([^\\)]+)\\) \\[([0-9\\.]+)\\].*"; + and comment out all the other "connregex" examples (that is, prepend a + "#" character). - 5) Set "kline" to "KILL %n :Open proxy found on your host!"; for example, - and comment all the other "kline" examples. + 5) Set "kline" to "GLINE *@%h :Open proxy found on your host!"; + and comment out all the other "kline" examples. b) BOPM "scanner" section:

1 0

Alexander Barton : Allow "DefaultUserModes" to set all possible modes
by alex＠arthur.barton.de 18 Mär '14

18 Mär '14

Module: ngircd.git Branch: master Commit: d314c75a37f0132a1a16658494d0f60a0c0083f2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d314c75a… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 18 16:43:21 2014 +0100 Allow "DefaultUserModes" to set all possible modes Let IRC_MODE() detect that the "fake" MODE command originated on the local sever, which enables all modes to be settable using "DefaultUserModes" that can be set by regular MODE commands, including modes only settable by IRC Operators. --- doc/sample-ngircd.conf.tmpl | 4 ++-- man/ngircd.conf.5.tmpl | 4 ++-- src/ngircd/irc-mode.c | 7 +++++++ src/ngircd/login.c | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index ec425bd..1d07822 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -172,8 +172,8 @@ ;ConnectIPv4 = yes # Default user mode(s) to set on new local clients. Please note that - # only modes can be set that the client could set on itself, you can't - # set "a" (away) or "o" (IRC Op), for example! Default: none. + # only modes can be set that the client could set using regular MODE + # commands, you can't set "a" (away) for example! Default: none. ;DefaultUserModes = i # Do DNS lookups when a client connects to the server. diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 208b461..9b2ed08 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -267,8 +267,8 @@ Default: yes. .TP \fBDefaultUserModes\fR (string) Default user mode(s) to set on new local clients. Please note that only modes -can be set that the client could set on itself, you can't set "a" (away) or -"o" (IRC Op), for example! +can be set that the client could set using regular MODE commands, you can't +set "a" (away) for example! Default: none. .TP \fBDNS\fR (boolean) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index fe98121..79ab2eb 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -68,6 +68,13 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) _IRC_GET_SENDER_OR_RETURN_(origin, Req, Client) + /* Test for "fake" MODE commands injected by this local instance, + * for example when handling the "DefaultUserModes" settings. + * This doesn't harm real commands, because prefixes of regular + * clients are checked in Validate_Prefix() and can't be faked. */ + if (Req->prefix && Client_Search(Req->prefix) == Client_ThisServer()) + Client = Client_Search(Req->prefix); + /* Channel or user mode? */ cl = NULL; chan = NULL; if (Client_IsValidNick(Req->argv[0])) diff --git a/src/ngircd/login.c b/src/ngircd/login.c index 7f427a3..64cc812 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -192,7 +192,7 @@ Login_User_PostAuth(CLIENT *Client) /* Set default user modes */ if (Conf_DefaultUserModes[0]) { snprintf(modes, sizeof(modes), "+%s", Conf_DefaultUserModes); - Req.prefix = Client_ThisServer(); + Req.prefix = Client_ID(Client_ThisServer()); Req.command = "MODE"; Req.argc = 2; Req.argv[0] = Client_ID(Client);

1 0

Alexander Barton : Spoofed prefixes: Really kill connection on non-server links
by alex＠arthur.barton.de 18 Mär '14

18 Mär '14

Module: ngircd.git Branch: master Commit: 5009ab3e8c5a6fe7db5c5ad1d3fdc8aecfc64b55 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5009ab3e… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 18 16:27:03 2014 +0100 Spoofed prefixes: Really kill connection on non-server links This fixes commit 6cbe1308 which only killed the connection when the spoofed prefix itself belonged to a non-server client. --- src/ngircd/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 94230c8..28dee6f 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -342,7 +342,7 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) /* check if the client named in the prefix is expected * to come from that direction */ if (Client_NextHop(c) != client) { - if (Client_Type(c) != CLIENT_SERVER) { + if (Client_Type(client) != CLIENT_SERVER) { Log(LOG_ERR, "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\"), closing connection!", Req->prefix, Client_ID(client), Idx, Req->command);

1 0

Alexander Barton : Implement user mode "F": "relaxed flood protection"
by alex＠arthur.barton.de 18 Mär '14

18 Mär '14

Module: ngircd.git Branch: master Commit: 5713c49c8480639f08f7fff82fb5a40e8566e1dc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5713c49c… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 18 14:55:38 2014 +0100 Implement user mode "F": "relaxed flood protection" ngIRCd relaxes its flood protection for users having the user mode "F" set and allows them to rapidly send data to the daemon. This mode is only settable by IRC Operators and can cause problems in the network -- so be careful and only set it on "trusted" clients! User mode "F" is used by Bahamut for this purpose, for example, see <http://docs.dal.net/docs/modes.html#4.9>. --- doc/Modes.txt | 3 ++- src/ngircd/conn.c | 11 ++++++++++- src/ngircd/defines.h | 4 ++-- src/ngircd/irc-mode.c | 1 + 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/doc/Modes.txt b/doc/Modes.txt index aee7491..a931787 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2012 Alexander Barton and Contributors. + (c)2001-2014 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. @@ -26,6 +26,7 @@ channels he is using at the moment. B 20 User is flagged as a "bot". c 17 IRC operator wants to receive connect/disconnect NOTICEs. C 19 Only users that share a channel are allowed to send messages. + F 22 Relaxed flood protection (only settable by IRC Operators). i 0.0.1 User is "invisible". o 0.0.1 User is IRC operator. q 20 User is protected, can not be kicked from a channel. diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 77c8cd8..5c175df 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1693,7 +1693,12 @@ Handle_Buffer(CONN_ID Idx) maxcmd *= 5; break; case CLIENT_SERVICE: - maxcmd = MAX_COMMANDS_SERVICE; break; + maxcmd = MAX_COMMANDS_SERVICE; + break; + case CLIENT_USER: + if (Client_HasMode(c, 'F')) + maxcmd = MAX_COMMANDS_SERVICE; + break; } for (i=0; i < maxcmd; i++) { @@ -2427,6 +2432,10 @@ Throttle_Connection(const CONN_ID Idx, CLIENT *Client, const int Reason, || Client_Type(Client) == CLIENT_SERVICE) return; + /* Don't throttle clients with user mode 'F' set */ + if (Client_HasMode(Client, 'F')) + return; + LogDebug("Throttling connection %d: code %d, value %d!", Idx, Reason, Value); Conn_SetPenalty(Idx, 1); diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 361564f..4acdc47 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2013 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2014 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -173,7 +173,7 @@ #endif /** Supported user modes. */ -#define USERMODES "abBcCioqrRswx" +#define USERMODES "abBcCFioqrRswx" /** Supported channel modes. */ #define CHANMODES "abehiIklmMnoOPqQrRstvVz" diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 6a67007..fe98121 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -222,6 +222,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) break; case 'c': /* Receive connect notices */ case 'q': /* KICK-protected user */ + case 'F': /* disable flood protection */ /* (only settable by IRC operators!) */ if (!set || Client_Type(Client) == CLIENT_SERVER || Client_HasMode(Origin, 'o'))

1 0

Alexander Barton : Handle "throttling" in a single function
by alex＠arthur.barton.de 18 Mär '14

18 Mär '14

Module: ngircd.git Branch: master Commit: 35f1db5f28245579efbbb06eed6eaf1a3d6d84bc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=35f1db5f… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 18 14:48:52 2014 +0100 Handle "throttling" in a single function ngIRCd uses "command throttling" and "bps throttling" (bytes per second). The states are detected in different functions, Conn_Handler() and Read_Request(), but handle the actual "throttling" in a common function: this enables us to guarantee consistent behavior and to disable throttling for special connections in only one place, eventually. --- src/ngircd/conn.c | 65 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 22 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4dfe62f..77c8cd8 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -74,6 +74,9 @@ #define SD_LISTEN_FDS_START 3 /** systemd(8) socket activation offset */ +#define THROTTLE_CMDS 1 /** Throttling: max commands reached */ +#define THROTTLE_BPS 2 /** Throttling: max bps reached */ + static bool Handle_Write PARAMS(( CONN_ID Idx )); static bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t Len )); static int New_Connection PARAMS(( int Sock, bool IsSSL )); @@ -88,6 +91,8 @@ static void New_Server PARAMS(( int Server, ng_ipaddr_t *dest )); static void Simple_Message PARAMS(( int Sock, const char *Msg )); static int NewListener PARAMS(( const char *listen_addr, UINT16 Port )); static void Account_Connection PARAMS((void)); +static void Throttle_Connection PARAMS((const CONN_ID Idx, CLIENT *Client, + const int Reason, unsigned int Value)); static array My_Listeners; static array My_ConnArray; @@ -665,7 +670,7 @@ GLOBAL void Conn_Handler(void) { int i; - size_t wdatalen, bytes_processed; + size_t wdatalen; struct timeval tv; time_t t; @@ -684,17 +689,7 @@ Conn_Handler(void) if ((My_Connections[i].sock > NONE) && (array_bytes(&My_Connections[i].rbuf) > 0)) { /* ... and try to handle the received data */ - bytes_processed = Handle_Buffer(i); - /* if we processed data, and there might be - * more commands in the input buffer, do not - * try to read any more data now */ - if (bytes_processed && - array_bytes(&My_Connections[i].rbuf) > 2) { - LogDebug - ("Throttling connection %d: command limit reached!", - i); - Conn_SetPenalty(i, 1); - } + Handle_Buffer(i); } } @@ -1573,8 +1568,8 @@ Read_Request( CONN_ID Idx ) { /* Read buffer is full */ Log(LOG_ERR, - "Receive buffer space exhausted (connection %d): %d bytes", - Idx, array_bytes(&My_Connections[Idx].rbuf)); + "Receive buffer space exhausted (connection %d): %d/%d bytes", + Idx, array_bytes(&My_Connections[Idx].rbuf), READBUFFER_LEN); Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); return; } @@ -1626,6 +1621,8 @@ Read_Request( CONN_ID Idx ) /* Update connection statistics */ My_Connections[Idx].bytes_in += len; + + /* Handle read buffer */ My_Connections[Idx].bps += Handle_Buffer(Idx); /* Make sure that there is still a valid client registered */ @@ -1651,14 +1648,8 @@ Read_Request( CONN_ID Idx ) } /* Look at the data in the (read-) buffer of this connection */ - 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); - Conn_SetPenalty(Idx, 1); - } + if (My_Connections[Idx].bps >= maxbps) + Throttle_Connection(Idx, c, THROTTLE_BPS, maxbps); } /* Read_Request */ /** @@ -1827,6 +1818,11 @@ Handle_Buffer(CONN_ID Idx) array_bytes(&My_Connections[Idx].rbuf)); #endif + /* If data has been processed but there is still data in the read + * buffer, the command limit triggered. Enforce the penalty time: */ + if (len_processed && array_bytes(&My_Connections[Idx].rbuf) > 2) + Throttle_Connection(Idx, c, THROTTLE_CMDS, maxcmd); + return len_processed; } /* Handle_Buffer */ @@ -2410,6 +2406,31 @@ Conn_GetFromProc(int fd) return NONE; } /* Conn_GetFromProc */ +/** + * Throttle a connection because of excessive usage. + * + * @param Reason The reason, see THROTTLE_xxx constants. + * @param Idx The connection index. + * @param Client The client of this connection. + * @param Seconds The time to delay this connection. + */ +static void +Throttle_Connection(const CONN_ID Idx, CLIENT *Client, const int Reason, + unsigned int Value) +{ + assert(Idx > NONE); + assert(Client != NULL); + + /* Never throttle servers or services, only interrupt processing */ + if (Client_Type(Client) == CLIENT_SERVER + || Client_Type(Client) == CLIENT_UNKNOWNSERVER + || Client_Type(Client) == CLIENT_SERVICE) + return; + + LogDebug("Throttling connection %d: code %d, value %d!", Idx, + Reason, Value); + Conn_SetPenalty(Idx, 1); +} #ifndef STRICT_RFC

1 0

Alexander Barton : Updated config.{guess|sub} to version 2014-03-13
by alex＠arthur.barton.de 18 Mär '14

18 Mär '14

Module: ngircd.git Branch: master Commit: 4c2acd55c6ecb8d9a6a1c6c5c86295fdd859820c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4c2acd55… Author: Alexander Barton <alex(a)barton.de> Date: Tue Mar 18 14:42:11 2014 +0100 Updated config.{guess|sub} to version 2014-03-13 --- config.guess | 329 +++++++++++++++++++--------------------------------------- config.sub | 89 ++++++++-------- 2 files changed, 154 insertions(+), 264 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=4c2a…

1 0