- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Add "whois-test" to testsuite and distribution archive
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: d1f604ab89f34412cbe44aaf323b450b800a49d9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d1f604ab… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 14:52:07 2011 +0100 Add "whois-test" to testsuite and distribution archive Test script proposed by Dana Dahlstrom, 2008-02-17. See <https://arthur.barton.de/bugzilla/show_bug.cgi?id=72> ... --- src/testsuite/.gitignore | 1 + src/testsuite/Makefile.am | 2 +- src/testsuite/whois-test.e | 53 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletions(-) diff --git a/src/testsuite/.gitignore b/src/testsuite/.gitignore index fd628e3..5884a48 100644 --- a/src/testsuite/.gitignore +++ b/src/testsuite/.gitignore @@ -11,6 +11,7 @@ mode-test opless-channel-test server-link-test who-test +whois-test ngircd-test1.log ngircd-test2.log ngircd-test1.motd diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am index 52cc31a..9dc76a7 100644 --- a/src/testsuite/Makefile.am +++ b/src/testsuite/Makefile.am @@ -20,7 +20,7 @@ EXTRA_DIST = \ test-loop.sh wait-tests.sh \ channel-test.e connect-test.e check-idle.e invite-test.e \ join-test.e kick-test.e message-test.e misc-test.e mode-test.e \ - opless-channel-test.e server-link-test.e who-test.e \ + opless-channel-test.e server-link-test.e who-test.e whois-test.e \ stress-A.e stress-B.e \ start-server1 stop-server1 ngircd-test1.conf \ start-server2 stop-server2 ngircd-test2.conf diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e new file mode 100644 index 0000000..7024d5f --- /dev/null +++ b/src/testsuite/whois-test.e @@ -0,0 +1,53 @@ +# ngIRCd test suite +# WHOIS test + +spawn telnet localhost 6789 +expect { + timeout { exit 1 } + "Connected" +} + +send "nick nick\r" +send "user user . . :Real Name\r" +expect { + timeout { exit 1 } + "376" +} + +send "whois nick\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "whois *\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "whois n*\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "whois ?ick\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "whois ????,n?*k\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "quit\r" +expect { + timeout { exit 1 } + "ERROR" +} + +# -eof-

1 0

Gabor Adam Toth : quit on HTTP commands: GET & POST
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 33e8c2480649193799d88d003b9257873aaf2b31 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=33e8c248… Author: Gabor Adam Toth <tg(a)tgbit.net> Date: Mon Dec 20 02:01:25 2010 +0100 quit on HTTP commands: GET & POST --- src/ngircd/irc-login.c | 8 ++++++++ src/ngircd/irc-login.h | 1 + src/ngircd/parse.c | 2 ++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index f76a627..3c4eb18 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -693,6 +693,14 @@ 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; diff --git a/src/ngircd/irc-login.h b/src/ngircd/irc-login.h index 7ba5357..f3138f6 100644 --- a/src/ngircd/irc-login.h +++ b/src/ngircd/irc-login.h @@ -25,6 +25,7 @@ GLOBAL bool IRC_WEBIRC PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PING PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PONG PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req)); +GLOBAL bool IRC_QUIT_HTTP PARAMS((CLIENT *Client, REQUEST *Req)); #endif diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 7c56a03..51149da 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -85,6 +85,8 @@ 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 },

1 0

Gabor Adam Toth : ClientHost setting
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 52f59149adf4dbbb7c917225a7c66ac4aa053700 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=52f59149… Author: Gabor Adam Toth <tg(a)tgbit.net> Date: Mon Feb 14 16:16:07 2011 +0100 ClientHost setting --- doc/sample-ngircd.conf.tmpl | 3 +++ src/ngircd/client.c | 6 +++++- src/ngircd/conf.c | 9 +++++++++ src/ngircd/conf.h | 3 +++ 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 58696be..bb93501 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -24,6 +24,9 @@ # (".") 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 + # Info text of the server. This will be shown by WHOIS and # LINKS requests for example. Info = Server Info Text diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 0bfe73d..11decc8 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -319,7 +319,11 @@ Client_SetHostname( CLIENT *Client, const char *Hostname ) assert( Client != NULL ); assert( Hostname != NULL ); - strlcpy( Client->host, Hostname, sizeof( Client->host )); + if (strlen(Conf_ClientHost)) { + strlcpy( Client->host, Conf_ClientHost, sizeof( Client->host )); + } else { + strlcpy( Client->host, Hostname, sizeof( Client->host )); + } } /* Client_SetHostname */ diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 3ff5ddd..622cb9f 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -295,6 +295,7 @@ Conf_Test( void ) puts( "[GLOBAL]" ); printf(" Name = %s\n", Conf_ServerName); + printf(" ClientHost = %s\n", Conf_ClientHost); printf(" Info = %s\n", Conf_ServerInfo); #ifndef PAM printf(" Password = %s\n", Conf_ServerPwd); @@ -590,6 +591,7 @@ Set_Defaults(bool InitServers) int i; strcpy(Conf_ServerName, ""); + strcpy(Conf_ClientHost, ""); snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION); strcpy(Conf_ServerPwd, ""); @@ -970,6 +972,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Config_Error_TooLong( Line, Var ); return; } + if( strcasecmp( Var, "ClientHost" ) == 0 ) { + /* Client hostname */ + len = strlcpy( Conf_ClientHost, Arg, sizeof( Conf_ClientHost )); + if (len >= sizeof( Conf_ClientHost )) + Config_Error_TooLong( Line, Var ); + return; + } if( strcasecmp( Var, "Info" ) == 0 ) { /* Info text of server */ len = strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo )); diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 8c6aea8..1747139 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -97,6 +97,9 @@ struct Conf_Channel { /** Name (ID, "nick") of this server */ GLOBAL char Conf_ServerName[CLIENT_ID_LEN]; +/** Hostname of the clients */ +GLOBAL char Conf_ClientHost[CLIENT_ID_LEN]; + /** Server info text */ GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN];

1 0

Gabor Adam Toth : ClientUserNick setting
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 71d8c371711f70e2d4b7ef9c908443a018cd6701 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=71d8c371… Author: Gabor Adam Toth <tg(a)tgbit.net> Date: Mon Dec 20 03:35:17 2010 +0100 ClientUserNick setting --- doc/sample-ngircd.conf.tmpl | 3 +++ src/ngircd/client.c | 5 +++++ src/ngircd/conf.c | 7 +++++++ src/ngircd/conf.h | 1 + 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index bb93501..7cfe08f 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -27,6 +27,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 + # Info text of the server. This will be shown by WHOIS and # LINKS requests for example. Info = Server Info Text diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 11decc8..1a6ad93 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -335,6 +335,9 @@ Client_SetID( CLIENT *Client, const char *ID ) strlcpy( Client->id, ID, sizeof( Client->id )); + if (Conf_ClientUserNick) + strlcpy( Client->user, ID, sizeof( Client->user )); + /* Hash */ Client->hash = Hash( Client->id ); } /* Client_SetID */ @@ -348,6 +351,8 @@ Client_SetUser( CLIENT *Client, const char *User, bool Idented ) assert( Client != NULL ); assert( User != NULL ); + if (Conf_ClientUserNick) return; + if (Idented) { strlcpy(Client->user, User, sizeof(Client->user)); } else { diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 622cb9f..487c1eb 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -296,6 +296,7 @@ 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); @@ -592,6 +593,7 @@ Set_Defaults(bool InitServers) strcpy(Conf_ServerName, ""); strcpy(Conf_ClientHost, ""); + Conf_ClientUserNick = false; snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION); strcpy(Conf_ServerPwd, ""); @@ -979,6 +981,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Config_Error_TooLong( Line, Var ); return; } + if( strcasecmp( Var, "ClientUserNick" ) == 0 ) { + /* Use client nick name as user name */ + Conf_ClientUserNick = Check_ArgIsTrue( Arg ); + return; + } if( strcasecmp( Var, "Info" ) == 0 ) { /* Info text of server */ len = strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo )); diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 1747139..10b6407 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -99,6 +99,7 @@ GLOBAL char Conf_ServerName[CLIENT_ID_LEN]; /** Hostname of the clients */ GLOBAL char Conf_ClientHost[CLIENT_ID_LEN]; +GLOBAL bool Conf_ClientUserNick; /** Server info text */ GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN];

1 0

Alexander Barton : Doxygen: Remove header.inc.html and ngircd-doc. css from distribution
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: f419a369bff178c84525f600180878c2ca61110e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f419a369… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 14:56:05 2011 +0100 Doxygen: Remove header.inc.html and ngircd-doc.css from distribution --- doc/src/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/Makefile.am b/doc/src/Makefile.am index 0eaa80d..0d27b7e 100644 --- a/doc/src/Makefile.am +++ b/doc/src/Makefile.am @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) +# Copyright (c)2001-2011 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 @@ -9,7 +9,7 @@ # Please read the file COPYING, README and AUTHORS for more information. # -EXTRA_DIST = Doxyfile header.inc.html footer.inc.html ngircd-doc.css +EXTRA_DIST = Doxyfile footer.inc.html maintainer-clean-local: rm -f Makefile Makefile.in

1 0

Alexander Barton : ngircd.conf.5: describe types of variables
by alex＠arthur.barton.de 18 Mär '11

18 Mär '11

Module: ngircd.git Branch: master Commit: 152b529abf6caa60f4fbd705b39bd19bbb9deae9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=152b529a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 18 11:15:48 2011 +0100 ngircd.conf.5: describe types of variables Describe the possible types of variables in ngircd.conf: booleans, text strings, integer numbers. And add type information to each variable description. --- man/ngircd.conf.5.tmpl | 126 ++++++++++++++++++++++++++--------------------- 1 files changed, 70 insertions(+), 56 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=152b…

1 0

Florian Westphal : channel: always reject zero-length channel key
by fw＠arthur.barton.de 01 Mär '11

01 Mär '11

Module: ngircd.git Branch: master Commit: 5417a72536954927371d597e9a4e0453e70620e3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5417a725… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Feb 28 21:09:47 2011 +0100 channel: always reject zero-length channel key previously, any client could join in this configuration: [Channel] Name = #test Modes = tnk KeyFile = /tmp/foobar fix this by checking for zero-length key before comparing key to channel key. --- src/ngircd/channel.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index d1f9c6c..6e8851b 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1082,10 +1082,10 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key) if (!strchr(Chan->modes, 'k')) return true; - if (strcmp(Chan->key, Key) == 0) - return true; if (*Key == '\0') return false; + if (strcmp(Chan->key, Key) == 0) + return true; file_name = array_start(&Chan->keyfile); if (!file_name)

1 0

Alexander Barton : PAM-Auth child: log if result can't be reported
by alex＠arthur.barton.de 23 Feb '11

23 Feb '11

Module: ngircd.git Branch: master Commit: 94e4562c1c732f7bf67bed2f77cc7b3b0aeaeafe URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=94e4562c… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 23 22:55:45 2011 +0100 PAM-Auth child: log if result can't be reported This fixes the followin GCC warning on modern Linux systems as well: irc-login.c: In function ‘Hello_User’: irc-login.c:876: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result --- src/ngircd/irc-login.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 6a97074..f76a627 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -873,7 +873,9 @@ Hello_User(CLIENT * Client) /* Sub process */ Log_Init_Subprocess("Auth"); result = PAM_Authenticate(Client); - write(pipefd[1], &result, sizeof(result)); + if (write(pipefd[1], &result, sizeof(result)) != sizeof(result)) + Log_Subprocess(LOG_ERR, + "Failed to pipe result to parent!"); Log_Exit_Subprocess("Auth"); exit(0); }

1 0

Alexander Barton : Protocol.txt: Update description of CHANINFO command
by alex＠arthur.barton.de 17 Feb '11

17 Feb '11

Module: ngircd.git Branch: master Commit: 6caa947f989b692cf8bf3568cffa03b5c21374e9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6caa947f… Author: Alexander Barton <alex(a)barton.de> Date: Thu Feb 17 12:26:56 2011 +0100 Protocol.txt: Update description of CHANINFO command --- doc/Protocol.txt | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/Protocol.txt b/doc/Protocol.txt index 2b7e7b8..5093eea 100644 --- a/doc/Protocol.txt +++ b/doc/Protocol.txt @@ -141,11 +141,17 @@ therefore to disconnect the peer prior to registering it in the network. II.3 Exchange channel-modes, topics, and persistent channels Command: CHANINFO - Parameters: <channel> +<modes> <key> <limit> [<topic>] + Parameters: <channel> +<modes> [[<key> <limit>] <topic>] Used by: servers only CHANINFO is used by servers to inform each other about a channel: its -modes, channel key, user limits and its topic. <topic> is optional. +modes, channel key, user limits and its topic. The parameter combination +<key> and <limit> is optional, as well as the <topic> parameter, so that +there are three possible forms of this command: + + CHANINFO <channel> +<modes> + CHANINFO <channel> +<modes> <topic> + CHANINFO <channel> +<modes> <key> <limit> <topic> If the channel already exists on the server receiving the CHANINFO command, it only adopts the <modes> (or the <topic>) if there are no modes (or topic)

1 0

Alexander Barton : Add cscope.out to .gitignore file
by alex＠arthur.barton.de 16 Feb '11

16 Feb '11

Module: ngircd.git Branch: master Commit: e49109e36deedc50188124126b66bd3ae40e451f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e49109e3… Author: Alexander Barton <alex(a)barton.de> Date: Wed Feb 16 14:06:25 2011 +0100 Add cscope.out to .gitignore file --- .gitignore | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a7ccc8..96642fb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,15 +5,16 @@ ansi2knr.1 ansi2knr.c ansi2knr.h autom4te.cache +build-stamp-ngircd* config.log config.status configure configure.lineno +cscope.out +debian depcomp install-sh missing .deps *.a *.o -debian -build-stamp-ngircd*

1 0