- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Add a note not to use a percent sign ("%") in CloakHost variable
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: acd7a5d6d41ca8017d3c2217b0c0bde129b4e041 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=acd7a5d6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:02:39 2011 +0100 Add a note not to use a percent sign ("%") in CloakHost variable The percent sign is reserved for future extensions, for example to expand some variables like %H to a hash value of the real host name ... Idea by kaFux in #ngircd. --- doc/sample-ngircd.conf.tmpl | 2 ++ man/ngircd.conf.5.tmpl | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index a2eeee9..e07b520 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -155,6 +155,8 @@ ;MaxNickLength = 9 # Set this hostname for every client instead of the real one. + # Please note: don't use the percentage sign ("%"), it is reserved for + # future extensions! ;CloakHost = irc.example.net # Set every clients' user name to their nick name diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index fa77c64..131fa29 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -240,6 +240,12 @@ length! \fBCloakHost\fR Set this hostname for every client instead of the real one. Default: empty, don't change. +.PP +.RS +.B Please note: +.br +Don't use the percentage sign ("%"), it is reserved for future extensions! +.RE .TP \fBCloakUserToNick\fR Set every clients' user name to their nick name and hide the one supplied

1 0

Alexander Barton : Merge branches 'CloakUserHost', 'QuitOnHTTP' and ' bug72-WHOIS-List'
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: fa8b83e69b0d7edcfdcf8f0a4496c79f9c5ec161 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fa8b83e6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:16:14 2011 +0100 Merge branches 'CloakUserHost', 'QuitOnHTTP' and 'bug72-WHOIS-List' * CloakUserHost: Add a note not to use a percent sign ("%") in CloakHost variable Rename ClientHost to CloakHost, and ClientUserNick to CloakUserToNick Don't use "the.net" in sample-ngircd.conf, use "example.net" ngircd.conf.5: document "ClientHost" and "ClientUserNick" Move "ClientHost" and "ClientUserNick" to end of [Global] section ClientUserNick setting ClientHost setting * QuitOnHTTP: Only "handle" HTTP commands on unregistered connections Don't use IRC_QUIT_HTTP() if STRICT_RFC is #define'd IRC_QUIT_HTTP(): enhance error message Move IRC_QUIT_HTTP() below IRC_QUIT() quit on HTTP commands: GET & POST * bug72-WHOIS-List: Add "whois-test" to testsuite and distribution archive Add support for up to 3 targets in WHOIS queries. ---

1 0

Alexander Barton : Move "ClientHost" and "ClientUserNick" to end of [Global ] section
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 25dd193e9b49b38db39cf549f94df4ba11812fe9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=25dd193e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:43:29 2011 +0100 Move "ClientHost" and "ClientUserNick" to end of [Global] section --- doc/sample-ngircd.conf.tmpl | 12 ++++++------ src/ngircd/conf.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 7cfe08f..8591759 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -24,12 +24,6 @@ # (".") and be unique in the IRC network. Required! Name = irc.the.net - # Set this hostname for every client instead of the real one - ;ClientHost = irc.the.net - - # Set every clients' user name to their nick name - ;ClientUserNick = yes - # Info text of the server. This will be shown by WHOIS and # LINKS requests for example. Info = Server Info Text @@ -160,6 +154,12 @@ # maximum nick name length! ;MaxNickLength = 9 + # Set this hostname for every client instead of the real one + ;ClientHost = irc.the.net + + # Set every clients' user name to their nick name + ;ClientUserNick = yes + [Features] # Do any DNS lookups when a client connects to the server. ;DNS = yes diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 487c1eb..12893ad 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -295,8 +295,6 @@ Conf_Test( void ) puts( "[GLOBAL]" ); printf(" Name = %s\n", Conf_ServerName); - printf(" ClientHost = %s\n", Conf_ClientHost); - printf(" ClientUserNick = %s\n", yesno_to_str(Conf_ClientUserNick)); printf(" Info = %s\n", Conf_ServerInfo); #ifndef PAM printf(" Password = %s\n", Conf_ServerPwd); @@ -353,7 +351,9 @@ Conf_Test( void ) printf(" MaxConnections = %ld\n", Conf_MaxConnections); printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); - printf(" MaxNickLength = %u\n\n", Conf_MaxNickLength - 1); + printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); + printf(" ClientHost = %s\n", Conf_ClientHost); + printf(" ClientUserNick = %s\n\n", yesno_to_str(Conf_ClientUserNick)); puts("[FEATURES]"); printf(" DNS = %s\n", yesno_to_str(Conf_DNS));

1 0

Alexander Barton : ngircd.conf.5: document "ClientHost" and "ClientUserNick "
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: c0d13c47135adb32be36226b64367447330b3d43 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c0d13c47… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:44:00 2011 +0100 ngircd.conf.5: document "ClientHost" and "ClientUserNick" --- man/ngircd.conf.5.tmpl | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index c8bab5f..3282476 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -236,6 +236,14 @@ Default: 10. Maximum length of an user nick name (Default: 9, as in RFC 2812). Please note that all servers in an IRC network MUST use the same maximum nick name length! +.TP +\fBClientHost\fR +Set this hostname for every client instead of the real one. Default: empty, +don't change. +.TP +\fBClientUserNick\fR +Set every clients' user name to their nick name and hide the one supplied +by the IRC client. Default: no. .SH [OPERATOR] .I [Operator] sections are used to define IRC Operators. There may be more than one

1 0

Alexander Barton : Move IRC_QUIT_HTTP() below IRC_QUIT()
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 77cff9e47c33d1b1bc22d1fba09607e347e55e8a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=77cff9e4… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:56:27 2011 +0100 Move IRC_QUIT_HTTP() below IRC_QUIT() --- src/ngircd/irc-login.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 3c4eb18..518c9f1 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -683,6 +683,14 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) } /* IRC_QUIT */ +GLOBAL bool +IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) +{ + Req->argc = 0; + return IRC_QUIT(Client, Req); +} /* IRC_QUIT_HTTP */ + + /** * Handler for the IRC "PING" command. * @@ -693,14 +701,6 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) * @returns CONNECTED or DISCONNECTED. */ GLOBAL bool -IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) -{ - Req->argc = 0; - return IRC_QUIT(Client, Req); -} - - -GLOBAL bool IRC_PING(CLIENT *Client, REQUEST *Req) { CLIENT *target, *from;

1 0

Alexander Barton : IRC_QUIT_HTTP(): enhance error message
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: dbb66695c938a7c13e0d399937f191456c7b1119 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dbb66695… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:58:01 2011 +0100 IRC_QUIT_HTTP(): enhance error message --- src/ngircd/irc-login.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 518c9f1..7e75217 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -686,7 +686,8 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) GLOBAL bool IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) { - Req->argc = 0; + Req->argc = 1; + Req->argv[0] = "Oops, HTTP request received? This is IRC!"; return IRC_QUIT(Client, Req); } /* IRC_QUIT_HTTP */

1 0

Alexander Barton : Don't use IRC_QUIT_HTTP() if STRICT_RFC is #define'd
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 38747b40dcadd320220bb050974d5e5860a8ecbb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=38747b40… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:58:39 2011 +0100 Don't use IRC_QUIT_HTTP() if STRICT_RFC is #define'd --- src/ngircd/irc-login.c | 14 ++++++++++++++ src/ngircd/parse.c | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 7e75217..92d54ab 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -683,6 +683,18 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) } /* IRC_QUIT */ +#ifndef STRICT_RFC + +/** + * Handler for HTTP command, e.g. GET and POST + * + * We handle these commands here to avoid the quite long timeout when + * some user tries to access this IRC daemon using an web browser ... + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @returns CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) { @@ -691,6 +703,8 @@ IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) return IRC_QUIT(Client, Req); } /* IRC_QUIT_HTTP */ +#endif + /** * Handler for the IRC "PING" command. diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 51149da..11bb3d1 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -85,8 +85,6 @@ static COMMAND My_Commands[] = { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 }, - { "GET", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, - { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 }, { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 }, { "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 }, @@ -111,6 +109,10 @@ static COMMAND My_Commands[] = #ifdef IRCPLUS { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 }, #endif +#ifndef STRICT_RFC + { "GET", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, + { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, +#endif { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */ };

1 0

Alexander Barton : Only "handle" HTTP commands on unregistered connections
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: b19f7d73cb3759630072d28d1db5219dc656348b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b19f7d73… Author: Alexander Barton <alex(a)barton.de> Date: Thu Mar 17 00:03:10 2011 +0100 Only "handle" HTTP commands on unregistered connections --- src/ngircd/parse.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 11bb3d1..8203dd0 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -110,8 +110,8 @@ static COMMAND My_Commands[] = { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 }, #endif #ifndef STRICT_RFC - { "GET", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, - { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, + { "GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 }, + { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 }, #endif { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */ };

1 0

Alexander Barton : Don't use "the.net" in sample-ngircd.conf, use "example. net"
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: fc55c945dbec745ff7b82652dd5f5b3b69096c82 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fc55c945… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 18 10:45:16 2011 +0100 Don't use "the.net" in sample-ngircd.conf, use "example.net" "the.net" is an existing domain of the Texas Higher Education Network ... See RFC 2606. --- doc/sample-ngircd.conf.tmpl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 8591759..fee3570 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -22,7 +22,7 @@ # Server name in the IRC network, must contain at least one dot # (".") and be unique in the IRC network. Required! - Name = irc.the.net + Name = irc.example.net # Info text of the server. This will be shown by WHOIS and # LINKS requests for example. @@ -155,7 +155,7 @@ ;MaxNickLength = 9 # Set this hostname for every client instead of the real one - ;ClientHost = irc.the.net + ;ClientHost = irc.example.net # Set every clients' user name to their nick name ;ClientUserNick = yes @@ -202,11 +202,11 @@ # IRC name of the remote server, must match the "Name" variable in # the [Global] section of the other server (when using ngIRCd). - ;Name = irc2.the.net + ;Name = irc2.example.net # Internet host name or IP address of the peer (only required when # this server should establish the connection). - ;Host = connect-to-host.the.net + ;Host = connect-to-host.example.net # IP address to use as _source_ address for the connection. if # unspecified, ngircd will let the operating system pick an address.

1 0

Florian Westphal : Add support for up to 3 targets in WHOIS queries.
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: ff2a425ab899a782145186d4e9a829ea9950fb47 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ff2a425a… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Feb 18 15:24:01 2008 +0100 Add support for up to 3 targets in WHOIS queries. also allow up to one wildcard query from local hosts. Follows ircd 2.10 implementation rather than RFC 2812. At most 10 entries are returned per wildcard expansion. WHOIS test cases by Dana Dahlstrom. --- src/ngircd/irc-info.c | 245 ++++++++++++++++++++++++++++++--------------- src/testsuite/Makefile.am | 7 +- 2 files changed, 169 insertions(+), 83 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=ff2a…

1 0