- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Remove unused "time_t now" from Lists_Check()
by alex＠arthur.barton.de 30 Dez '11

30 Dez '11

Module: ngircd.git Branch: master Commit: 9cbb8f3bb8f7c39e133c6910f40ec2b03ccd8847 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9cbb8f3b… Author: Alexander Barton <alex(a)barton.de> Date: Fri Dec 30 01:02:44 2011 +0100 Remove unused "time_t now" from Lists_Check() This fixes: lists.c: In function ‘Lists_Check’: lists.c:330:9: warning: variable ‘now’ set but not used --- src/ngircd/lists.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 27a51dc..d3f26e2 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -327,13 +327,11 @@ bool Lists_Check( struct list_head *h, CLIENT *Client) { struct list_elem *e, *last, *next; - time_t now; assert(h != NULL); e = h->first; last = NULL; - now = time(NULL); while (e) { next = e->next;

1 0

Alexander Barton : Fixed some spelling errors in documentation and code comments
by alex＠arthur.barton.de 30 Dez '11

30 Dez '11

Module: ngircd.git Branch: master Commit: e19ce437cadca5697a052ade944118a42709eabd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e19ce437… Author: Alexander Barton <alex(a)barton.de> Date: Fri Dec 30 00:50:27 2011 +0100 Fixed some spelling errors in documentation and code comments Thanks to Christoph Biedl! --- ChangeLog | 8 ++++---- NEWS | 4 ++-- configure.in | 2 +- src/ngircd/array.h | 2 +- src/ngircd/client.c | 4 ++-- src/ngircd/conf.h | 2 +- src/ngircd/conn.c | 4 ++-- src/ngircd/irc-channel.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec4fc19..ae2abe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -797,7 +797,7 @@ ngIRCd 0.6.0, 2002-12-24 werden (beide Server versuchen sich dann gegenseitig zu connectieren). - Test-Suite und Dokumentation an A/UX angepasst. - unter HP-UX definiert das configure-Script nun _XOPEN_SOURCE_EXTENDED. - - Server identifizieren sich nun mit asyncronen Passwoertern, d.h. das + - Server identifizieren sich nun mit asynchronen Passwoertern, d.h. das Passwort, welches A an B schickt, kann ein anderes sein als das, welches B als Antwort an A sendet. In der Konfig.-Datei, Abschnitt "Server", wurde "Password" dazu durch "MyPassword" und "PeerPassword" ersetzt. @@ -927,7 +927,7 @@ ngIRCd 0.5.0, 20.09.2002 - Protokoll- und Server-ID bei PASS-Befehlen auf neues Format umgestellt; bei empfangenen PASS-Befehlen werden diese zudem nun auch ausgewertet. Die unterstuetzten Flags sind in doc/Protocol.txt beschrieben. - - mit dem neuen Befehl CHANINFO syncronisieren Server, die das IRC+- + - mit dem neuen Befehl CHANINFO synchronisieren Server, die das IRC+- Protokoll unterstuetzen, Channel-Modes und Topics. - neue Option "--disable-ircplus" fuer das configure-Script, um das IRC+-Protokoll abzuschalten (per Default ist es aktiviert). @@ -1032,7 +1032,7 @@ ngIRCd 0.3.0, 02.03.2002 - PRIVMSG beachtet nun die Channel-Modes "n" und "m". - AWAY implementiert. PRIVMSG, MODE, USERHOST und WHOIS angepasst. - der ngIRCd unterstuetzt nun Channel-Topics (TOPIC-Befehl). - - ausgehende Server-Verbindungen werden nun asyncron connectiert und + - ausgehende Server-Verbindungen werden nun asynchron connectiert und blockieren nicht mehr den ganzen Server, wenn die Gegenseite nicht erreicht werden kann (bis zum Timeout konnten Minuten vergehen!). - Wert der Konfigurations-Variable "ConnectRetry" wird besser beachtet. @@ -1111,7 +1111,7 @@ ngIRCd 0.0.2, 06.01.2002 - NICK kann nun die Gross- und Kleinschreibung eines Nicks aendern. - ein Server-Passwort ist nun konfigurierbar. - neue Befehle: ERROR, SERVER, NJOIN (nur als "Fake"), SQUIT. - - Asyncroner Resolver Hostname->IP implementiert. + - Asynchroner Resolver Hostname->IP implementiert. - Server-Links teilweise implementiert: bisher kann der ngIRCd jedoch nur "leafed server" sein, d.h. keine "Client-Server" haben. Einige Befehle sind auch noch nicht (optimal) angepasst: PRIVMSG funktioniert diff --git a/NEWS b/NEWS index 3602a4d..9365ec6 100644 --- a/NEWS +++ b/NEWS @@ -351,7 +351,7 @@ ngIRCd 0.6.0, 2002-12-24 ausgehende Verbindung zu diesem auufzubauen. Dadurch kann nun auf beiden Servern in der Konfiguration ein Port fuer den Connect konfiguriert werden (beide Server versuchen sich dann gegenseitig zu connectieren). - - Server identifizieren sich nun mit asyncronen Passwoertern, d.h. das + - Server identifizieren sich nun mit asynchronen Passwoertern, d.h. das Passwort, welches A an B schickt, kann ein anderes sein als das, welches B als Antwort an A sendet. In der Konfig.-Datei, Abschnitt "Server", wurde "Password" dazu durch "MyPassword" und "PeerPassword" ersetzt. @@ -377,7 +377,7 @@ ngIRCd 0.5.0, 20.09.2002 Konfiguration "sample-ngircd.conf") und bleiben auch dann bestehen, wenn kein User mehr im Channel ist. - neue IRC-Befehle: KICK, INVITE, ADMIN, CHANINFO; LIST wurde erweitert. - Mit dem neuen Befehl CHANINFO syncronisieren Server, die das IRC+- + Mit dem neuen Befehl CHANINFO synchronisieren Server, die das IRC+- Protokoll unterstuetzen, Channel-Modes und Topics. Fuer den ADMIN-Befehl gibt es neue Konfigurationsoptionen (Sektion "Global"): "AdminInfo1", "AdminInfo2" und "AdminEMail". diff --git a/configure.in b/configure.in index d2241f6..fb08778 100644 --- a/configure.in +++ b/configure.in @@ -340,7 +340,7 @@ else fi if test "$x_io_backend" = "none"; then - AC_MSG_ERROR([No useabe IO API activated/found!?]) + AC_MSG_ERROR([No useable IO API activated/found!?]) fi # use SSL? diff --git a/src/ngircd/array.h b/src/ngircd/array.h index f461162..fd428db 100644 --- a/src/ngircd/array.h +++ b/src/ngircd/array.h @@ -84,7 +84,7 @@ extern void* array_get PARAMS((array* a, size_t membersize, size_t pos)); /* free the contents of this array. */ extern void array_free PARAMS((array* a)); -/* overwrite array with zeroes before free */ +/* overwrite array with zeros before free */ extern void array_free_wipe PARAMS((array* a)); /* return pointer to first element in this array */ diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 16c551f..d1f751d 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -768,7 +768,7 @@ Client_NextHop( CLIENT *Client ) * Return ID of a client: "client!user@host" * This client ID is used for IRC prefixes, for example. * Please note that this function uses a global static buffer, so you can't - * nest invocations without overwriting erlier results! + * nest invocations without overwriting earlier results! * @param Client Pointer to client structure * @return Pointer to global buffer containing the client ID */ @@ -793,7 +793,7 @@ Client_Mask( CLIENT *Client ) * Return ID of a client with cloaked hostname: "client!user@server-name" * This client ID is used for IRC prefixes, for example. * Please note that this function uses a global static buffer, so you can't - * nest invocations without overwriting erlier results! + * nest invocations without overwriting earlier results! * If the client has not enabled cloaking, the real hostname is used. * @param Client Pointer to client structure * @return Pointer to global buffer containing the client ID diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index afc0afa..5a6fff8 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -154,7 +154,7 @@ GLOBAL bool Conf_OperCanMode; /** * If true, mask channel MODE commands of IRC operators to the server. * Background: ircd2 will ignore channel MODE commands if an IRC operator - * gives chanel operator privileges to someone without being a channel operator + * gives channel operator privileges to someone without being a channel operator * himself. This enables a workaround: it masks the MODE command as coming * from the IRC server and not the IRC operator. */ diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4a2f49c..d9d73e8 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -370,7 +370,7 @@ cb_clientserver_ssl(int sock, short what) /** - * Initialite connecion module. + * Initialize connecion module. */ GLOBAL void Conn_Init( void ) @@ -1014,7 +1014,7 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len ) GLOBAL void Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient ) { - /* Close connection. Open pipes of asyncronous resolver + /* Close connection. Open pipes of asynchronous resolver * sub-processes are closed down. */ CLIENT *c; diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 233e173..cc70eb4 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -244,7 +244,7 @@ join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan, IRC_WriteStrChannelPrefix(Client, chan, target, false, "JOIN :%s", channame); - /* syncronize channel modes */ + /* synchronize channel modes */ if (modes[1]) { IRC_WriteStrChannelPrefix(Client, chan, target, false, "MODE %s +%s %s", channame,

1 0

Alexander Barton : Update our Debian package descriptions with "official" ones
by alex＠arthur.barton.de 30 Dez '11

30 Dez '11

Module: ngircd.git Branch: master Commit: 1d29a59f7eff92ac2b9afe493ad9cdb801e80acc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1d29a59f… Author: Alexander Barton <alex(a)barton.de> Date: Fri Dec 30 00:36:26 2011 +0100 Update our Debian package descriptions with "official" ones See Debian Bug #648241 for details. --- contrib/Debian/control | 57 +++++++++++++++-------------------------------- 1 files changed, 18 insertions(+), 39 deletions(-) diff --git a/contrib/Debian/control b/contrib/Debian/control index bccbcb9..bdb2319 100644 --- a/contrib/Debian/control +++ b/contrib/Debian/control @@ -9,57 +9,45 @@ Package: ngircd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ircd -Description: A lightweight daemon for the Internet Relay Chat (IRC) - ngIRCd is a free open source daemon for the Internet Relay Chat (IRC) - network. It is written from scratch and is not based upon the original - IRCd like many others. +Description: lightweight Internet Relay Chat server + This package provides ngIRCd, a lightweight Internet Relay Chat + server for small or private networks. It is simple to configure, can + cope with dynamic IP addresses, and supports IPv6 as well as SSL. It + is written from scratch, not based on the original IRCd and quite + portable. . This package contains the "standard distribution", including support for syslog logging and compressed server-links using zlib. Please have a look at the "ngircd-full" package if you need advanced functionality like support for IPv6 or SSL. - . - Advantages of ngIRCd: - - no problems with servers using changing/non-static IP addresses. - - small and lean configuration file. - - free, modern and open source C code. - - still under active development. - . - ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run - mixed networks. Package: ngircd-full Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ircd Conflicts: ngircd, ngircd-dbg -Description: A lightweight daemon for the Internet Relay Chat (IRC) - ngIRCd is a free open source daemon for the Internet Relay Chat (IRC) - network. It is written from scratch and is not based upon the original - IRCd like many others. +Description: lightweight Internet Relay Chat server + This package provides ngIRCd, a lightweight Internet Relay Chat + server for small or private networks. It is simple to configure, can + cope with dynamic IP addresses, and supports IPv6 as well as SSL. It + is written from scratch, not based on the original IRCd and quite + portable. . In addition to the features of the "standard package", this package includes support for TCP wrappers, IDENT requests, the IPv6 protocol and SSL encrypted client and server links. - . - Advantages of ngIRCd: - - no problems with servers using changing/non-static IP addresses. - - small and lean configuration file. - - free, modern and open source C code. - - still under active development. - . - ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run - mixed networks. Package: ngircd-full-dbg Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ircd Conflicts: ngircd, ngircd-full -Description: A lightweight daemon for the Internet Relay Chat (IRC) - ngIRCd is a free open source daemon for the Internet Relay Chat (IRC) - network. It is written from scratch and is not based upon the original - IRCd like many others. +Description: lightweight Internet Relay Chat server + This package provides ngIRCd, a lightweight Internet Relay Chat + server for small or private networks. It is simple to configure, can + cope with dynamic IP addresses, and supports IPv6 as well as SSL. It + is written from scratch, not based on the original IRCd and quite + portable. . In addition to the features of the "standard package", this package includes support for TCP wrappers, IDENT requests, the IPv6 protocol and @@ -67,12 +55,3 @@ Description: A lightweight daemon for the Internet Relay Chat (IRC) . And in addition to the "full" variant, the binaries contained in this package are build with debug code and contain debug symbols. - . - Advantages of ngIRCd: - - no problems with servers using changing/non-static IP addresses. - - small and lean configuration file. - - free, modern and open source C code. - - still under active development. - . - ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run - mixed networks.

1 0

Alexander Barton : contrib/Debian/control: Update and complete " Build-Depends"
by alex＠arthur.barton.de 30 Dez '11

30 Dez '11

Module: ngircd.git Branch: master Commit: 4e550bf9ef9d8c05a753f27c6deec8ada0fb0ce9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4e550bf9… Author: Alexander Barton <alex(a)barton.de> Date: Fri Dec 30 00:40:18 2011 +0100 contrib/Debian/control: Update and complete "Build-Depends" --- contrib/Debian/control | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/contrib/Debian/control b/contrib/Debian/control index bdb2319..0ac6d22 100644 --- a/contrib/Debian/control +++ b/contrib/Debian/control @@ -2,7 +2,15 @@ Source: ngircd Section: net Priority: optional Maintainer: Alexander Barton <alex(a)barton.de> -Build-Depends: debhelper (>> 4.0.0), libz-dev, libwrap0-dev, libident-dev, libgnutls-dev, libpam0g-dev +Build-Depends: debhelper (>> 4.0.0), + autotools-dev, + expect, + libz-dev, + libwrap0-dev, + libident-dev, + libgnutls-dev, + libpam0g-dev, + telnet, Standards-Version: 3.9.1 Package: ngircd

1 0

Alexander Barton : Fixed typo in two error messages
by alex＠arthur.barton.de 30 Dez '11

30 Dez '11

Module: ngircd.git Branch: master Commit: 765c2f26ea29d5930d19dab5307c302e473e1120 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=765c2f26… Author: Alexander Barton <alex(a)barton.de> Date: Fri Dec 30 00:32:11 2011 +0100 Fixed typo in two error messages Thanks to Christoph Biedl! --- src/ngircd/conn.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 4d5c223..4a2f49c 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1572,7 +1572,7 @@ Read_Request( CONN_ID Idx ) if (!array_catb(&My_Connections[Idx].zip.rbuf, readbuf, (size_t) len)) { Log(LOG_ERR, - "Could not append recieved data to zip input buffer (connn %d): %d bytes!", + "Could not append recieved data to zip input buffer (connection %d): %d bytes!", Idx, len); Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); @@ -1582,7 +1582,9 @@ Read_Request( CONN_ID Idx ) #endif { if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) { - Log( LOG_ERR, "Could not append recieved data to input buffer (connn %d): %d bytes!", Idx, len ); + Log(LOG_ERR, + "Could not append recieved data to input buffer (connection %d): %d bytes!", + Idx, len); Conn_Close(Idx, "Receive buffer space exhausted", NULL, false ); } }

1 0

Alexander Barton : LUSERS reply: only count "visible" channels
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: 69fa6f268af88128248523b33b85aa1ab2759a82 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=69fa6f26… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 15:07:24 2011 +0100 LUSERS reply: only count "visible" channels Rename Channel_Count() to Channel_CountVisible() and only count channels that are visible to the requesting client, so the existence of secret channels is no longer revealed by using LUSERS. Reported by Cahata -- thanks! --- src/ngircd/channel.c | 21 ++++++++++++++++----- src/ngircd/channel.h | 2 +- src/ngircd/irc-info.c | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 2dbf53a..4d323f2 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -352,20 +352,31 @@ Channel_Quit( CLIENT *Client, const char *Reason ) } /* Channel_Quit */ +/** + * Get number of channels this server knows and that are "visible" to + * the given client. If no client is given, all channels will be counted. + * + * @param Client The client to check or NULL. + * @return Number of channels visible to the client. + */ GLOBAL unsigned long -Channel_Count( void ) +Channel_CountVisible (CLIENT *Client) { CHANNEL *c; unsigned long count = 0; c = My_Channels; - while( c ) - { - count++; + while(c) { + if (Client) { + if (!strchr(Channel_Modes(c), 's') + || Channel_IsMemberOf(c, Client)) + count++; + } else + count++; c = c->next; } return count; -} /* Channel_Count */ +} GLOBAL unsigned long diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index f44e194..ba3f2ca 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -72,7 +72,7 @@ GLOBAL void Channel_Quit PARAMS(( CLIENT *Client, const char *Reason )); GLOBAL void Channel_Kick PARAMS((CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, const char *Reason)); -GLOBAL unsigned long Channel_Count PARAMS(( void )); +GLOBAL unsigned long Channel_CountVisible PARAMS((CLIENT *Client)); GLOBAL unsigned long Channel_MemberCount PARAMS(( CHANNEL *Chan )); GLOBAL int Channel_CountForUser PARAMS(( CLIENT *Client )); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index cdd03bb..0119257 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1317,7 +1317,8 @@ IRC_Send_LUSERS(CLIENT *Client) /* Number of created channels */ if (!IRC_WriteStrClient(Client, RPL_LUSERCHANNELS_MSG, - Client_ID(Client), Channel_Count())) + Client_ID(Client), + Channel_CountVisible(Client))) return DISCONNECTED; /* Number of local users, services and servers */

1 0

Alexander Barton : IRC_Send_LUSERS(): Code cleanup
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: 43509fd22c30e0ce1f1eb02fd584a0693177d880 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=43509fd2… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 14:52:21 2011 +0100 IRC_Send_LUSERS(): Code cleanup --- src/ngircd/irc-info.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 1d91609..cdd03bb 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1277,38 +1277,54 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) } /* IRC_WHOWAS */ +/** + * Send LUSERS reply to a client. + * + * @param Client The receipient of the information. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool -IRC_Send_LUSERS( CLIENT *Client ) +IRC_Send_LUSERS(CLIENT *Client) { unsigned long cnt; #ifndef STRICT_RFC unsigned long max; #endif - assert( Client != NULL ); + assert(Client != NULL); /* Users, services and serevers in the network */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERCLIENT_MSG, Client_ID( Client ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERCLIENT_MSG, Client_ID(Client), + Client_UserCount(), Client_ServiceCount(), + Client_ServerCount())) + return DISCONNECTED; /* Number of IRC operators */ cnt = Client_OperCount( ); - if( cnt > 0 ) - { - if( ! IRC_WriteStrClient( Client, RPL_LUSEROP_MSG, Client_ID( Client ), cnt )) return DISCONNECTED; + if (cnt > 0) { + if (!IRC_WriteStrClient(Client, RPL_LUSEROP_MSG, + Client_ID(Client), cnt)) + return DISCONNECTED; } /* Unknown connections */ cnt = Client_UnknownCount( ); - if( cnt > 0 ) - { - if( ! IRC_WriteStrClient( Client, RPL_LUSERUNKNOWN_MSG, Client_ID( Client ), cnt )) return DISCONNECTED; + if (cnt > 0) { + if (!IRC_WriteStrClient(Client, RPL_LUSERUNKNOWN_MSG, + Client_ID(Client), cnt)) + return DISCONNECTED; } /* Number of created channels */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERCHANNELS_MSG, Client_ID( Client ), Channel_Count( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERCHANNELS_MSG, + Client_ID(Client), Channel_Count())) + return DISCONNECTED; /* Number of local users, services and servers */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERME_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERME_MSG, Client_ID(Client), + Client_MyUserCount(), Client_MyServiceCount(), + Client_MyServerCount())) + return DISCONNECTED; #ifndef STRICT_RFC /* Maximum number of local users */

1 0

Alexander Barton : LUSERS reply: only count "visible" channels
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: 3593c1dfabd944197a79dd964f8005b8265a20a8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3593c1df… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 15:07:24 2011 +0100 LUSERS reply: only count "visible" channels Rename Channel_Count() to Channel_CountVisible() and only count channels that are visible to the requesting client, so the existence of secret channels is no longer revealed by using LUSERS. --- src/ngircd/channel.c | 21 ++++++++++++++++----- src/ngircd/channel.h | 2 +- src/ngircd/irc-info.c | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 2dbf53a..4d323f2 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -352,20 +352,31 @@ Channel_Quit( CLIENT *Client, const char *Reason ) } /* Channel_Quit */ +/** + * Get number of channels this server knows and that are "visible" to + * the given client. If no client is given, all channels will be counted. + * + * @param Client The client to check or NULL. + * @return Number of channels visible to the client. + */ GLOBAL unsigned long -Channel_Count( void ) +Channel_CountVisible (CLIENT *Client) { CHANNEL *c; unsigned long count = 0; c = My_Channels; - while( c ) - { - count++; + while(c) { + if (Client) { + if (!strchr(Channel_Modes(c), 's') + || Channel_IsMemberOf(c, Client)) + count++; + } else + count++; c = c->next; } return count; -} /* Channel_Count */ +} GLOBAL unsigned long diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index f44e194..ba3f2ca 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -72,7 +72,7 @@ GLOBAL void Channel_Quit PARAMS(( CLIENT *Client, const char *Reason )); GLOBAL void Channel_Kick PARAMS((CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, const char *Reason)); -GLOBAL unsigned long Channel_Count PARAMS(( void )); +GLOBAL unsigned long Channel_CountVisible PARAMS((CLIENT *Client)); GLOBAL unsigned long Channel_MemberCount PARAMS(( CHANNEL *Chan )); GLOBAL int Channel_CountForUser PARAMS(( CLIENT *Client )); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index cdd03bb..0119257 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1317,7 +1317,8 @@ IRC_Send_LUSERS(CLIENT *Client) /* Number of created channels */ if (!IRC_WriteStrClient(Client, RPL_LUSERCHANNELS_MSG, - Client_ID(Client), Channel_Count())) + Client_ID(Client), + Channel_CountVisible(Client))) return DISCONNECTED; /* Number of local users, services and servers */

1 0

Alexander Barton : Don't stop mode handling on unknown modes; skip it
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: a71abfef4b82aace4989db6a4ed3c94d1266b287 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a71abfef… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 14:39:47 2011 +0100 Don't stop mode handling on unknown modes; skip it Unknown user and channel modes no longer stop the mode parser, but are simply ignored. Therefore modes after the unknown one are now handled. This is how ircd2.10/ircd2.11/ircd-seven behave, at least. Reported by Cahata -- thanks! --- src/ngircd/irc-mode.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ba44a3b..d8329b1 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -253,7 +253,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto client_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" for \"%s\" ...", @@ -278,7 +277,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) strlcat(the_modes, x, sizeof(the_modes)); } } -client_exit: /* Are there changed modes? */ if (the_modes[1]) { @@ -671,7 +669,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto chan_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" on %s ...",

1 0

Alexander Barton : Don't stop mode handling on unknown modes; skip it
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: 6ff3b9f1f5086960ac8efb0ae122a7ce90554b71 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6ff3b9f1… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 14:39:47 2011 +0100 Don't stop mode handling on unknown modes; skip it Unknown user and channel modes no longer stop the mode parser, but are simply ignored. Therefore modes after the unknown one are now handled. This is how ircd2.10/ircd2.10/ircd-seven behave, at least. --- src/ngircd/irc-mode.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ba44a3b..d8329b1 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -253,7 +253,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto client_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" for \"%s\" ...", @@ -278,7 +277,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) strlcat(the_modes, x, sizeof(the_modes)); } } -client_exit: /* Are there changed modes? */ if (the_modes[1]) { @@ -671,7 +669,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto chan_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" on %s ...",

1 0