November 2012 - ngIRCd GIT Updates

Alexander Barton : Update doc/Platforms.txt
by alex＠arthur.barton.de 26 Nov '12

26 Nov '12

Module: ngircd.git Branch: master Commit: 12768e7a548f31c71d4149884acaf32c0e30d8ce URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=12768e7a… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 26 11:54:23 2012 +0100 Update doc/Platforms.txt --- doc/Platforms.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 44c9000..9ff3b6c 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -39,8 +39,8 @@ i386/pc/solaris2.9 gcc 3.2.2 CVSHEAD 04-02-24 alex Y Y Y Y i386/pc/solaris2.11 gcc 3.4.3 19 12-02-26 alex Y Y N Y (4) i386/pc/solaris2.11 gcc 4.2.3 19.1 12-05-29 goetz Y Y Y Y (4) i386/unknown/freebsd5.2.1 gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y -i386/unknown/freebsd6.2 gcc 3.4.6 19 12-02-26 alex Y Y Y Y (3) -i386/unknown/freebsd7.3 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) +i386/unknown/freebsd6.2 gcc 3.4.6 20~rc1 12-11-13 alex Y Y Y Y (3) +i386/unknown/freebsd7.3 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3) i686/unknown/gnu0.3 gcc 4.4.5 19 12-02-29 alex Y Y Y Y i686/unkn./kfreebsd7.2-gnu gcc 4.3.4 15 09-12-02 alex Y Y Y Y (3) i386/unknown/netbsdelf1.6.2 gcc 2.95.3 18 11-07-10 goetz Y Y Y Y @@ -73,10 +73,12 @@ 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 sparc/sun/solaris2.7 gcc 3.3 0.8.0 04-05-30 alex Y Y Y Y sparc/unkn./netbsdelf1.6.1 gcc 2.95.3 0.8.0 04-05-30 alex Y Y Y Y -x86_64/unknown/freebsd8.1 gcc 4.2.1 19 12-02-26 alex Y Y Y Y (3) +x86_64/apple/darwin12.2.0 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3) +x86_64/unknown/freebsd8.1 gcc 4.2.1 20~rc1 12-11-13 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 gcc 4.4.5 19 12-02-26 alex Y Y Y Y (1) -x86_64/unknown/openbsd4.7 gcc 3.3.5 19 12-02-26 alex Y Y Y Y (3) +x86_64/unknown/linux-gnu gcc 4.4.5 20~rc1 12-02-26 alex Y Y Y Y (1) +x86_64/unknown/openbsd4.7 gcc 3.3.5 20~rc1 12-02-26 alex Y Y Y Y (3) +x86_64/unknown/openbsd4.8 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3) Notes

1 0

Alexander Barton : Rework cloaked hostname handling, implement " METADATA cloakhost"
by alex＠arthur.barton.de 24 Nov '12

24 Nov '12

Module: ngircd.git Branch: master Commit: 35e2dcff88e29617db0e5af1d016ab76a31ab677 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=35e2dcff… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 24 16:15:35 2012 +0100 Rework cloaked hostname handling, implement "METADATA cloakhost" Now ngIRCd uses two fields internally, one to store the "real" hostname and one to save the "cloaked" hostname. And both fields can be set independently using the "METADATA host" and "METADATA cloakhost" commands. This allows "foreign servers" (aka "IRC services") to alter the real and cloaked hostnames of clients without problems, even when the user itself issues additional "MODE +x" and "MODE -x" commands. --- doc/Protocol.txt | 1 + src/ngircd/client.c | 78 +++++++++++++++++++++++++++++++++------------ src/ngircd/client.h | 6 ++++ src/ngircd/irc-metadata.c | 21 ++++++++++-- src/ngircd/irc-mode.c | 35 ++++++-------------- src/ngircd/numeric.c | 44 +++++++++++++++++-------- 6 files changed, 123 insertions(+), 62 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=35e2…

1 0

Alexander Barton : RPL_UMODEIS: send correct target name, even on server links
by alex＠arthur.barton.de 24 Nov '12

24 Nov '12

Module: ngircd.git Branch: master Commit: dc89e42ef5a60dda96707d2520fad998bf9ac74f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dc89e42e… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 24 15:57:45 2012 +0100 RPL_UMODEIS: send correct target name, even on server links --- src/ngircd/irc-mode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 907c929..ec12e28 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -156,7 +156,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) /* Mode request: let's answer it :-) */ if (Req->argc == 1) return IRC_WriteStrClient(Origin, RPL_UMODEIS_MSG, - Client_ID(Origin), + Client_ID(Target), Client_Modes(Target)); mode_arg = 1;

1 0

Alexander Barton : Client_HostnameCloaked() -> Client_HostnameDisplayed()
by alex＠arthur.barton.de 24 Nov '12

24 Nov '12

Module: ngircd.git Branch: master Commit: 4a2d74c9abb6dbf5c64062c984c6f9e87a2c17ae URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a2d74c9… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 24 13:37:56 2012 +0100 Client_HostnameCloaked() -> Client_HostnameDisplayed() --- src/ngircd/client.c | 8 ++++---- src/ngircd/client.h | 2 +- src/ngircd/irc-info.c | 6 +++--- src/ngircd/irc-mode.c | 4 ++-- src/ngircd/irc.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 2f8d771..54c0129 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -686,7 +686,7 @@ Client_Hostname(CLIENT *Client) /** - * Get potentially cloaked hostname of a client. + * Get (potentially cloaked) hostname of a client to display it to other users. * * If the client has not enabled cloaking, the real hostname is used. * Please note that this function uses a global static buffer, so you can't @@ -696,7 +696,7 @@ Client_Hostname(CLIENT *Client) * @return Pointer to client hostname */ GLOBAL char * -Client_HostnameCloaked(CLIENT *Client) +Client_HostnameDisplayed(CLIENT *Client) { static char Cloak_Buffer[CLIENT_HOST_LEN]; @@ -837,7 +837,7 @@ Client_MaskCloaked(CLIENT *Client) return Client_Mask(Client); snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, - Client_HostnameCloaked(Client)); + Client_HostnameDisplayed(Client)); return Mask_Buffer; } /* Client_MaskCloaked */ @@ -1346,7 +1346,7 @@ Client_RegisterWhowas( CLIENT *Client ) sizeof( My_Whowas[slot].id )); strlcpy( My_Whowas[slot].user, Client_User( Client ), sizeof( My_Whowas[slot].user )); - strlcpy( My_Whowas[slot].host, Client_HostnameCloaked( Client ), + strlcpy( My_Whowas[slot].host, Client_HostnameDisplayed( Client ), sizeof( My_Whowas[slot].host )); strlcpy( My_Whowas[slot].info, Client_Info( Client ), sizeof( My_Whowas[slot].info )); diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 7a383af..82b6901 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -107,7 +107,7 @@ GLOBAL char *Client_User PARAMS(( CLIENT *Client )); GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client )); #endif GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client )); -GLOBAL char *Client_HostnameCloaked PARAMS(( CLIENT *Client )); +GLOBAL char *Client_HostnameDisplayed PARAMS(( CLIENT *Client )); GLOBAL char *Client_Modes PARAMS(( CLIENT *Client )); GLOBAL char *Client_Flags PARAMS(( CLIENT *Client )); GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client )); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 40d4635..57d6e1a 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -727,7 +727,7 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req) strlcat(rpl, "+", sizeof(rpl)); strlcat(rpl, Client_User(c), sizeof(rpl)); strlcat(rpl, "@", sizeof(rpl)); - strlcat(rpl, Client_HostnameCloaked(c), sizeof(rpl)); + strlcat(rpl, Client_HostnameDisplayed(c), sizeof(rpl)); strlcat(rpl, " ", sizeof(rpl)); } } @@ -792,7 +792,7 @@ write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *f { return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client), channelname, Client_User(c), - Client_HostnameCloaked(c), + Client_HostnameDisplayed(c), Client_ID(Client_Introducer(c)), Client_ID(c), flags, Client_Hops(c), Client_Info(c)); } @@ -1080,7 +1080,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) /* Nick, user, hostname and client info */ if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from), Client_ID(c), Client_User(c), - Client_HostnameCloaked(c), Client_Info(c))) + Client_HostnameDisplayed(c), Client_Info(c))) return DISCONNECTED; /* Server */ diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 1cf19af..907c929 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -393,12 +393,12 @@ Announce_Client_Hostname(CLIENT *Origin, CLIENT *Client) /* Inform the client itself */ IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, Client_ID(Client), - Client_HostnameCloaked(Client)); + Client_HostnameDisplayed(Client)); /* Inform other servers in the network */ IRC_WriteStrServersPrefixFlag(Origin, Client_ThisServer(), 'M', "METADATA %s host :%s", Client_ID(Client), - Client_HostnameCloaked(Client)); + Client_HostnameDisplayed(Client)); } diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 9d9d3f0..63c4813 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -457,7 +457,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) if (nick != NULL && host != NULL) { if (strcasecmp(nick, Client_ID(cl)) == 0 && strcasecmp(user, Client_User(cl)) == 0 && - strcasecmp(host, Client_HostnameCloaked(cl)) == 0) + strcasecmp(host, Client_HostnameDisplayed(cl)) == 0) break; else continue; @@ -465,7 +465,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) if (strcasecmp(user, Client_User(cl)) != 0) continue; if (host != NULL && strcasecmp(host, - Client_HostnameCloaked(cl)) != 0) + Client_HostnameDisplayed(cl)) != 0) continue; if (server != NULL && strcasecmp(server, Client_ID(Client_Introducer(cl))) != 0)

1 0

Alexander Barton : platformtest.sh: Only generate configure script when missing
by alex＠arthur.barton.de 13 Nov '12

13 Nov '12

Module: ngircd.git Branch: master Commit: cd48b8128ea514a0fd87033571dbba103e1c41d6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cd48b812… Author: Alexander Barton <alex(a)barton.de> Date: Tue Nov 13 23:21:09 2012 +0100 platformtest.sh: Only generate configure script when missing --- contrib/platformtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index cc42434..cfa1ecc 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -54,8 +54,8 @@ if [ $? -ne 0 ]; then cd .. fi -echo "$NAME: Checking for \"./autogen.sh\" script ..." -if [ -r ./autogen.sh ]; then +echo "$NAME: Checking for \"./configure\" script ..." +if [ ! -e ./configure ]; then echo "$NAME: Running \"./autogen.sh\" ..." [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null fi

1 0

Alexander Barton : Update platformtest.sh to follow autoconf changes
by alex＠arthur.barton.de 13 Nov '12

13 Nov '12

Module: ngircd.git Branch: master Commit: 301d4915bc7bd8f86461c1d47f72a50d6005e761 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=301d4915… Author: Alexander Barton <alex(a)barton.de> Date: Tue Nov 13 22:42:49 2012 +0100 Update platformtest.sh to follow autoconf changes --- contrib/platformtest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index afe9420..cc42434 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -76,7 +76,7 @@ if [ -r ./configure ]; then R_RUN=$R_CHECK else ./src/ngircd/ngircd --help 2>/dev/null \ - | grep "^ngircd" >/dev/null + | grep "^ngIRCd" >/dev/null [ $? -eq 0 ] && R_RUN=1 fi fi @@ -85,9 +85,9 @@ fi # Get target platform information if [ -r "src/config.h" ]; then - CPU=`grep "TARGET_CPU" "src/config.h" | cut -d'"' -f2` - OS=`grep "TARGET_OS" "src/config.h" | cut -d'"' -f2` - VENDOR=`grep "TARGET_VENDOR" "src/config.h" | cut -d'"' -f2` + CPU=`grep "HOST_CPU" "src/config.h" | cut -d'"' -f2` + OS=`grep "HOST_OS" "src/config.h" | cut -d'"' -f2` + VENDOR=`grep "HOST_VENDOR" "src/config.h" | cut -d'"' -f2` PLATFORM="$CPU/$VENDOR/$OS" fi if [ -z "$PLATFORM" ]; then

1 0

Alexander Barton : Test suite: correctly execute tests when stdout is redirected
by alex＠arthur.barton.de 13 Nov '12

13 Nov '12

Module: ngircd.git Branch: master Commit: 8061056cec2a4105212d257fcb278b3248c41e4c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8061056c… Author: Alexander Barton <alex(a)barton.de> Date: Tue Nov 13 22:41:23 2012 +0100 Test suite: correctly execute tests when stdout is redirected --- src/testsuite/tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh index 8ecf8ab..1989205 100755 --- a/src/testsuite/tests.sh +++ b/src/testsuite/tests.sh @@ -45,7 +45,7 @@ if test -t 1 2>/dev/null; then fi echo_n "running ${test} ..." -expect "$e_tmp" > logs/${test}.log; r=$? +expect "$e_exec" > logs/${test}.log; r=$? [ $r -eq 0 ] && echo " ok." || echo " failure!" rm -f "$e_tmp"

1 0

Alexander Barton : Add a few casts, fix compiler warnings on NetBSD 5
by alex＠arthur.barton.de 13 Nov '12

13 Nov '12

Module: ngircd.git Branch: master Commit: 44926b7f9ff031c37be48b33c314e47e2f84ff9f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=44926b7f… Author: Alexander Barton <alex(a)barton.de> Date: Mon Nov 12 22:39:57 2012 +0100 Add a few casts, fix compiler warnings on NetBSD 5 This fixes a few warnings of this type: XXX.c: In function 'AAA': XXX.c:YY: warning: array subscription has type 'char' Tested on NetBSD 5.0.2 with gcc 4.1.3. --- src/ngircd/irc-login.c | 2 +- src/tool/tool.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 5ec6162..80a6627 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -443,7 +443,7 @@ IRC_USER(CLIENT * Client, REQUEST * Req) punctuation is allowed.*/ ptr = Req->argv[0]; while (*ptr) { - if (!isalnum(*ptr) && + if (!isalnum((int)*ptr) && *ptr != '+' && *ptr != '-' && *ptr != '.' && *ptr != '_') { Conn_Close(Client_Conn(Client), NULL, diff --git a/src/tool/tool.c b/src/tool/tool.c index eb6c131..1bb3ebe 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -84,7 +84,7 @@ ngt_UpperStr(char *String) ptr = String; while(*ptr) { - *ptr = toupper(*ptr); + *ptr = toupper((int)*ptr); ptr++; } return String; @@ -103,7 +103,7 @@ ngt_LowerStr(char *String) ptr = String; while(*ptr) { - *ptr = tolower(*ptr); + *ptr = tolower((int)*ptr); ptr++; } return String;

1 0

Alexander Barton : irc-info.c: Use strlcpy() instead of strcpy()
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: master Commit: d11a700589b2abab71b67ffb81f17f38936a169c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d11a7005… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 16:46:57 2012 +0100 irc-info.c: Use strlcpy() instead of strcpy() This fixes the following warning of gcc (tested on OpenBSD 5.0:) irc-info.c:990: warning: strcpy() is almost always misused, please use strlcpy --- src/ngircd/irc-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 54f8317..40d4635 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -987,7 +987,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO")) break; - strcpy(flags, who_flags_status(Client_Modes(c))); + strlcpy(flags, who_flags_status(Client_Modes(c)), sizeof(flags)); if (strchr(Client_Modes(c), 'o')) strlcat(flags, "*", sizeof(flags));

1 0

Tag rel-20-rc1: Alexander Barton : ngIRCd Release 20~rc1
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: refs/tags/rel-20-rc1 Tag: ba7cbc5fbddfcc6d691d762f268773159e6e1b3c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=ba7cbc5fbdd… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 16:09:15 2012 +0100 ngIRCd Release 20~rc1

1 0