- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Enhance server command limits
by alex＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: 871760583cb4f90e908d3dac94679ce876d78c83 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=87176058… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 24 02:55:53 2012 +0100 Enhance server command limits This patch updates the limits for handling commands from a remote server: - "<user count> / 5 + <min>" using "<min>=10" during normal operation, - the above count multiplied with 5 while servers are syncing. The intention is to a) make the limit dependent of the number of users in the network (the more users, the more commands required to sync) and b) to significantly rise this limit while servers are joining the network to make the login and synchronization faster. --- src/ngircd/conn.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index f743d1f..71dc939 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -82,8 +82,8 @@ #define SERVER_WAIT (NONE - 1) #define MAX_COMMANDS 3 -#define MAX_COMMANDS_SERVER 10 -#define MAX_COMMANDS_SERVICE MAX_COMMANDS_SERVER +#define MAX_COMMANDS_SERVER_MIN 10 +#define MAX_COMMANDS_SERVICE 10 static bool Handle_Write PARAMS(( CONN_ID Idx )); @@ -1674,16 +1674,15 @@ Handle_Buffer(CONN_ID Idx) assert(c != NULL); - /* Servers do get special command limits, so they can process - * all the messages that are required while peering. */ + /* Servers get special command limits that depend on the user count */ switch (Client_Type(c)) { case CLIENT_SERVER: - /* Allow servers to send more commands in the first 10 secods + maxcmd = (int)(Client_UserCount() / 5) + + MAX_COMMANDS_SERVER_MIN; + /* Allow servers to handle even more commands while peering * to speed up server login and network synchronisation. */ - if (starttime - Client_StartTime(c) < 10) - maxcmd = MAX_COMMANDS_SERVER * 5; - else - maxcmd = MAX_COMMANDS_SERVER; + if (Conn_LastPing(Idx) == 0) + maxcmd *= 5; break; case CLIENT_SERVICE: maxcmd = MAX_COMMANDS_SERVICE; break;

1 0

Alexander Barton : Conn_UpdateIdle(): Code cleanup
by alex＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: d2df7396a89b3e8de44379c305916bfee93ceb9b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d2df7396… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 24 02:43:55 2012 +0100 Conn_UpdateIdle(): Code cleanup --- src/ngircd/conn-func.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index 32001f0..23c2075 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -30,11 +30,17 @@ #include "conn-func.h" +/** + * Update "idle timestamp", the time of the last visible user action + * (e. g. like sending messages, joining or leaving channels). + * + * @param Idx Connection index. + */ GLOBAL void -Conn_UpdateIdle( CONN_ID Idx ) +Conn_UpdateIdle(CONN_ID Idx) { - assert( Idx > NONE ); - My_Connections[Idx].lastprivmsg = time( NULL ); + assert(Idx > NONE); + My_Connections[Idx].lastprivmsg = time(NULL); }

1 0

Alexander Barton : New function Conn_UpdatePing() to update the " ping timestamp"
by alex＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: 5a200e154347bde2a885ad1ede620d8d946b6420 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5a200e15… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 24 02:44:57 2012 +0100 New function Conn_UpdatePing() to update the "ping timestamp" --- src/ngircd/conn-func.c | 11 +++++++++++ src/ngircd/conn-func.h | 4 +++- src/ngircd/conn.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index 23c2075..e81a79e 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -43,6 +43,17 @@ Conn_UpdateIdle(CONN_ID Idx) My_Connections[Idx].lastprivmsg = time(NULL); } +/** + * Update "ping timestamp", the time of the last outgoing PING request. + * + * @param Idx Connection index. + */ +GLOBAL void +Conn_UpdatePing(CONN_ID Idx) +{ + assert(Idx > NONE); + My_Connections[Idx].lastping = time(NULL); +} /* * Get signon time of a connection. diff --git a/src/ngircd/conn-func.h b/src/ngircd/conn-func.h index 729860e..21bbcdb 100644 --- a/src/ngircd/conn-func.h +++ b/src/ngircd/conn-func.h @@ -29,7 +29,9 @@ #endif -GLOBAL void Conn_UpdateIdle PARAMS(( CONN_ID Idx )); +GLOBAL void Conn_UpdateIdle PARAMS((CONN_ID Idx)); +GLOBAL void Conn_UpdatePing PARAMS((CONN_ID Idx)); + GLOBAL time_t Conn_GetSignon PARAMS((CONN_ID Idx)); GLOBAL time_t Conn_GetIdle PARAMS(( CONN_ID Idx )); GLOBAL time_t Conn_LastPing PARAMS(( CONN_ID Idx )); diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 35d7400..f743d1f 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1850,7 +1850,7 @@ Check_Connections(void) time(NULL) - Conf_PingTimeout) { /* We need to send a PING ... */ LogDebug("Connection %d: sending PING ...", i); - My_Connections[i].lastping = time(NULL); + Conn_UpdatePing(i); Conn_WriteStr(i, "PING :%s", Client_ID(Client_ThisServer())); }

1 0

Alexander Barton : RPL_ISUPPORT_MSG(005): add "EXCEPTS=e INVEX=I"
by alex＠arthur.barton.de 23 Jan '12

23 Jan '12

Module: ngircd.git Branch: master Commit: 3d27073d61ab52277a3237c9a2375e5deda9d690 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3d27073d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 23 22:07:40 2012 +0100 RPL_ISUPPORT_MSG(005): add "EXCEPTS=e INVEX=I" Thanks to Cahata for the idea! --- src/ngircd/messages.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index f059077..90e0fdc 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -22,7 +22,7 @@ #define RPL_CREATED_MSG "003 %s :This server has been started %s" #define RPL_MYINFO_MSG "004 %s %s ngircd-%s %s %s" #define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=beI,k,l,imnOPRstz CHANLIMIT=#&+:%d :are supported on this server" -#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d PENALTY :are supported on this server" +#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d EXCEPTS=e INVEX=I PENALTY :are supported on this server" #define RPL_TRACELINK_MSG "200 %s Link %s-%s %s %s V%s %ld %d %d" #define RPL_TRACEOPERATOR_MSG "204 %s Oper 2 :%s"

1 0

Alexander Barton : Fix "MAXLIST=beI:50": the limit is the sum of all lists
by alex＠arthur.barton.de 23 Jan '12

23 Jan '12

Module: ngircd.git Branch: master Commit: b6f19ea8feceeb2246995222f03790e6f00b0dfd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b6f19ea8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 23 21:51:38 2012 +0100 Fix "MAXLIST=beI:50": the limit is the sum of all lists "Modes which are specified in the same pair share the same maximum size", so "beI:50" means a total of 50 entries, regardless of the list. See <http://www.irc.org/tech_docs/draft-brocklesby-irc-isupport-03.txt>, thanks to Cahata for reporting this! --- src/ngircd/irc-mode.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ad83ae9..80b2949 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -857,6 +857,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, { const char *mask; struct list_head *list; + long int current_count; assert(Client != NULL); assert(Channel != NULL); @@ -864,6 +865,9 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, assert(what == 'I' || what == 'b' || what == 'e'); mask = Lists_MakeMask(Pattern); + current_count = Lists_Count(Channel_GetListInvites(Channel)) + + Lists_Count(Channel_GetListExcepts(Channel)) + + Lists_Count(Channel_GetListBans(Channel)); switch(what) { case 'I': @@ -880,7 +884,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, if (Lists_CheckDupeMask(list, mask)) return CONNECTED; if (Client_Type(Client) == CLIENT_USER && - Lists_Count(list) >= MAX_HNDL_CHANNEL_LISTS) + current_count >= MAX_HNDL_CHANNEL_LISTS) return IRC_WriteStrClient(Client, ERR_LISTFULL_MSG, Client_ID(Client), Channel_Name(Channel), mask,

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 23 Jan '12

23 Jan '12

Module: ngircd.git Branch: master Commit: 8c46067b34b71dac23b388c0acc28fdf8db111fa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8c46067b… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 23 12:30:16 2012 +0100 Update NEWS and ChangeLog files --- ChangeLog | 7 +++++++ NEWS | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca83f29..b7083db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ ngIRCd Release 19 + - New numeric RPL_WHOISHOST_MSG(378), which returns the DNS hostname + (if available) and the IP address of a client in the WHOIS reply. + Only the user itself and local IRC operators get this numeric. - Implement channel exception list (mode 'e'). This allows a channel operator to define exception masks that allow users to join the channel even when a "ban" would match and prevent them from joining: @@ -86,6 +89,10 @@ ngIRCd Release 19 - Log better error messages when rejecting clients. - Implement IRC commands "GLINE" and "KLINE" to ban users. G-Lines are synchronized between server on peering, K-Lines are local only. + If you use "*!<user>@<host>" or "*!*@<host>" masks, these connections + are blocked even before the user is fully logged in (before PASS, + NICK, and USER commands have been processed) and before the child + processes for authentication are forked, so resource usage is smaller. - Xcode: update project file for Xcode 4.2 and define HAVE_GAI_STRERROR for Mac OS X Xcode builds. - ./configure: Fix logic and quoting of poll() detection code: only use diff --git a/NEWS b/NEWS index 14bbe79..054780e 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,9 @@ ngIRCd Release 19 + - New numeric RPL_WHOISHOST_MSG(378), which returns the DNS hostname + (if available) and the IP address of a client in the WHOIS reply. + Only the user itself and local IRC operators get this numeric. - Implement channel exception list (mode 'e'). This allows a channel operator to define exception masks that allow users to join the channel even when a "ban" would match and prevent them from joining: @@ -50,6 +53,10 @@ ngIRCd Release 19 Reported by Cahata, thanks! - Implement IRC commands "GLINE" and "KLINE" to ban users. G-Lines are synchronized between server on peering, K-Lines are local only. + If you use "*!<user>@<host>" or "*!*@<host>" masks, these connections + are blocked even before the user is fully logged in (before PASS, + NICK, and USER commands have been processed) and before the child + processes for authentication are forked, so resource usage is smaller. - Added doc/Modes.txt: document modes supported by ngIRCd. - Implement user mode "R": indicates that the nick name of this user is "registered". This mode isn't handled by ngIRCd itself, but must

1 0

Alexander Barton : New function Conn_GetIPAInfo(): get IP address of a connection
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 6a308fcb42eae1de168699ed432b49b610073ede URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6a308fcb… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 22:35:27 2012 +0100 New function Conn_GetIPAInfo(): get IP address of a connection --- src/ngircd/conn.c | 14 ++++++++++++++ src/ngircd/conn.h | 2 ++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 40a2af6..35d7400 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1227,6 +1227,20 @@ Conn_SyncServerStruct(void) /** + * Get IP address string of a connection. + * + * @param Idx Connection index. + * @return Pointer to a global buffer containing the IP address as string. + */ +GLOBAL const char * +Conn_GetIPAInfo(CONN_ID Idx) +{ + assert(Idx > NONE); + return ng_ipaddr_tostr(&My_Connections[Idx].addr); +} + + +/** * Send out data of write buffer; connect new sockets. * * @param Idx Connection index. diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 251da2a..4752ec1 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -131,6 +131,8 @@ Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; } #endif +GLOBAL const char *Conn_GetIPAInfo PARAMS((CONN_ID Idx)); + GLOBAL long Conn_Count PARAMS((void)); GLOBAL long Conn_CountMax PARAMS((void)); GLOBAL long Conn_CountAccepted PARAMS((void));

1 0

Alexander Barton : New RPL_WHOISHOST_MSG(378): show hostname and IP address
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 594fdd02aaa482b8273a8d24aa48510ecf0981ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=594fdd02… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 22:41:39 2012 +0100 New RPL_WHOISHOST_MSG(378): show hostname and IP address The numeric RPL_WHOISHOST_MSG(378) returns the DNS hostname (if available) and the IP address of a client in the WHOIS reply. Only the user itself and local IRC operators get this numeric. --- src/ngircd/irc-info.c | 6 ++++++ src/ngircd/messages.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 93c43b7..841e6e6 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1114,6 +1114,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) Client_ID(from), Client_ID(c))) return DISCONNECTED; + if (Client_Conn(c) > NONE && (Client_OperByMe(from) || from == c) && + !IRC_WriteStrClient(from, RPL_WHOISHOST_MSG, Client_ID(from), + Client_ID(c), Client_Hostname(c), + Conn_GetIPAInfo(Client_Conn(c)))) + return DISCONNECTED; + /* Idle and signon time (local clients only!) */ if (!Conf_MorePrivacy && Client_Conn(c) > NONE && !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 340f5f4..f059077 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -91,6 +91,7 @@ #define RPL_MOTD_MSG "372 %s :- %s" #define RPL_MOTDSTART_MSG "375 %s :- %s message of the day" #define RPL_ENDOFMOTD_MSG "376 %s :End of MOTD command" +#define RPL_WHOISHOST_MSG "378 %s %s :is connecting from *@%s %s" #define RPL_YOUREOPER_MSG "381 %s :You are now an IRC Operator" #define RPL_YOURESERVICE_MSG "383 %s :You are service %s" #define RPL_TIME_MSG "391 %s %s :%s"

1 0

Alexander Barton : G/K-Lines: only add and delete valid IRC masks
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 1537c791320086df83b8fbecb057e70c7120ea12 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1537c791… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 18:53:16 2012 +0100 G/K-Lines: only add and delete valid IRC masks --- src/ngircd/class.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index 0a8ae24..0f617b8 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -112,7 +112,8 @@ Class_AddMask(const int Class, const char *Mask, time_t ValidUntil, assert(Mask != NULL); assert(Reason != NULL); - return Lists_Add(&My_Classes[Class], Mask, ValidUntil, Reason); + return Lists_Add(&My_Classes[Class], Lists_MakeMask(Mask), + ValidUntil, Reason); } GLOBAL void @@ -121,7 +122,7 @@ Class_DeleteMask(const int Class, const char *Mask) assert(Class < CLASS_COUNT); assert(Mask != NULL); - Lists_Del(&My_Classes[Class], Mask); + Lists_Del(&My_Classes[Class], Lists_MakeMask(Mask)); } GLOBAL struct list_head *

1 0

Alexander Barton : New function Client_Reject() to reject clients on connect
by alex＠arthur.barton.de 22 Jan '12

22 Jan '12

Module: ngircd.git Branch: master Commit: 51a6a33056486c19da6b8d6e4809dde57be00ece URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=51a6a330… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 22 18:17:28 2012 +0100 New function Client_Reject() to reject clients on connect --- src/ngircd/client.c | 33 +++++++++++++++++++++++++++++++++ src/ngircd/client.h | 3 +++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index d1f751d..1aaf687 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1097,6 +1097,39 @@ Client_StartTime(CLIENT *Client) } /* Client_Uptime */ +/** + * Reject a client when logging in. + * + * This function is called when a client isn't allowed to connect to this + * server. Possible reasons are bad server password, bad PAM password, + * or that the client is G/K-Line'd. + * + * After calling this function, the client isn't connected any more. + * + * @param Client The client to reject. + * @param Reason The reason why the client has been rejected. + * @param InformClient If true, send the exact reason to the client. + */ +GLOBAL void +Client_Reject(CLIENT *Client, const char *Reason, bool InformClient) +{ + char info[COMMAND_LEN]; + + assert(Client != NULL); + assert(Reason != NULL); + + if (InformClient) + snprintf(info, sizeof(info), "Access denied: %s", Reason); + else + strcpy(info, "Access denied: Bad password?"); + + Log(LOG_ERR, + "User \"%s\" rejected (connection %d): %s!", + Client_Mask(Client), Client_Conn(Client), Reason); + Conn_Close(Client_Conn(Client), Reason, info, true); +} + + static unsigned long Count( CLIENT_TYPE Type ) { diff --git a/src/ngircd/client.h b/src/ngircd/client.h index fecf5d9..7bb230b 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -163,6 +163,9 @@ GLOBAL void Client_RegisterWhowas PARAMS(( CLIENT *Client )); GLOBAL const char *Client_TypeText PARAMS((CLIENT *Client)); +GLOBAL void Client_Reject PARAMS((CLIENT *Client, const char *Reason, + bool InformClient)); + #ifdef DEBUG GLOBAL void Client_DebugDump PARAMS((void)); #endif

1 0