- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : "WHO <hostmask>": use displayed hostname for matching
by alex＠arthur.barton.de 08 Feb '13

08 Feb '13

Module: ngircd.git Branch: master Commit: 1e8b775a7a6d0c390e037bd73332072e7c510525 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e8b775a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Feb 8 17:18:43 2013 +0100 "WHO <hostmask>": use displayed hostname for matching Use the currently "displayed hostname" (which can be cloaked!) for hostname matching, not the real one. In other words: don't display all the cloaked users on a specific real hostname! Thanks to DNS <dns(a)rbose.org> for reporting this issue. --- 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 e9c1ff5..f9c9b0d 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -951,7 +951,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) if (Mask) { /* Match pattern against user host/server/name/nick */ client_match = MatchCaseInsensitive(Mask, - Client_Hostname(c)); + Client_HostnameDisplayed(c)); if (!client_match) client_match = MatchCaseInsensitive(Mask, Client_ID(Client_Introducer(c)));

1 0

Alexander Barton : Rename ports_initlisteners() to Init_Listeners()
by alex＠arthur.barton.de 03 Feb '13

03 Feb '13

Module: ngircd.git Branch: master Commit: f16d230530424f93541b4ca36e2686ddfb76834a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f16d2305… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 21:10:50 2013 +0100 Rename ports_initlisteners() to Init_Listeners() --- src/ngircd/conn.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 07f26f3..14d337b 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -454,7 +454,7 @@ Conn_CloseAllSockets(int ExceptOf) * @returns Number of listening sockets created. */ static unsigned int -ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short)) +Init_Listeners(array *a, const char *listen_addr, void (*func)(int,short)) { unsigned int created = 0; size_t len; @@ -470,8 +470,9 @@ ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short)) continue; } if (!io_event_create( fd, IO_WANTREAD, func )) { - Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!", - fd, (unsigned int) *port, strerror(errno)); + Log(LOG_ERR, + "io_event_create(): Can't add fd %d (port %u): %s!", + fd, (unsigned int) *port, strerror(errno)); close(fd); port++; continue; @@ -500,7 +501,8 @@ Conn_InitListeners( void ) /* can't use Conf_ListenAddress directly, see below */ copy = strdup(Conf_ListenAddress); if (!copy) { - Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, strerror(errno)); + Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, + strerror(errno)); return 0; } listen_addr = strtok(copy, ","); @@ -508,9 +510,11 @@ Conn_InitListeners( void ) while (listen_addr) { ngt_TrimStr(listen_addr); if (*listen_addr) { - created += ports_initlisteners(&Conf_ListenPorts, listen_addr, cb_listen); + created += Init_Listeners(&Conf_ListenPorts, + listen_addr, cb_listen); #ifdef SSL_SUPPORT - created += ports_initlisteners(&Conf_SSLOptions.ListenPorts, listen_addr, cb_listen_ssl); + created += Init_Listeners(&Conf_SSLOptions.ListenPorts, + listen_addr, cb_listen_ssl); #endif }

1 0

Alexander Barton : NewListener(): Code cleanup
by alex＠arthur.barton.de 03 Feb '13

03 Feb '13

Module: ngircd.git Branch: master Commit: 3a3b3225d42ede7a062fa5e4403a7f445baf518b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3a3b3225… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 20:57:25 2013 +0100 NewListener(): Code cleanup --- src/ngircd/conn.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 142cf23..07f26f3 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -620,8 +620,9 @@ NewListener(const char *listen_addr, UINT16 Port) af = ng_ipaddr_af(&addr); sock = socket(af, SOCK_STREAM, 0); - if( sock < 0 ) { - Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, strerror(errno)); + if (sock < 0) { + Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, + strerror(errno)); return -1; } @@ -632,21 +633,22 @@ NewListener(const char *listen_addr, UINT16 Port) if (bind(sock, (struct sockaddr *)&addr, ng_ipaddr_salen(&addr)) != 0) { Log(LOG_CRIT, "Can't bind socket to address %s:%d - %s!", - ng_ipaddr_tostr(&addr), Port, strerror(errno)); + ng_ipaddr_tostr(&addr), Port, strerror(errno)); close(sock); return -1; } - if( listen( sock, 10 ) != 0 ) { - Log( LOG_CRIT, "Can't listen on socket: %s!", strerror( errno )); - close( sock ); + if (listen(sock, 10) != 0) { + Log(LOG_CRIT, "Can't listen on socket: %s!", strerror(errno)); + close(sock); return -1; } /* keep fd in list so we can close it when ngircd restarts/shuts down */ - if (!array_catb( &My_Listeners,(char*) &sock, sizeof(int) )) { - Log( LOG_CRIT, "Can't add socket to My_Listeners array: %s!", strerror( errno )); - close( sock ); + if (!array_catb(&My_Listeners, (char *)&sock, sizeof(int))) { + Log(LOG_CRIT, "Can't add socket to My_Listeners array: %s!", + strerror(errno)); + close(sock); return -1; }

1 0

Alexander Barton : Enable WHOIS to display information about IRC Services
by alex＠arthur.barton.de 03 Feb '13

03 Feb '13

Module: ngircd.git Branch: master Commit: 84a599ece472c4f2ef6d2f553addf898e0ed73f9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=84a599ec… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 3 21:32:53 2013 +0100 Enable WHOIS to display information about IRC Services This patch introduces the new numeric 310(RPL_WHOISSERVICE) and enables WHOIS to display information about IRC services. This numeric is used for this purpose by InspIRCd, for example -- but as usual, other numerics are in use, too, like 613 in UltimateIRCd ... Please note that neither the Operator (+o) not the "bot status" (+B) of an IRC service id displayed in the output. Change suggested by Federico G. Schwindt <fgsch(a)lodoss.net>, Thanks. --- src/ngircd/irc-info.c | 13 ++++++++++--- src/ngircd/messages.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index aaa607d..e9c1ff5 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1133,14 +1133,20 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) return DISCONNECTED; } + /* Service? */ + if (Client_Type(c) == CLIENT_SERVICE && + !IRC_WriteStrClient(from, RPL_WHOISSERVICE_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; + /* IRC-Operator? */ - if (Client_HasMode(c, 'o') && + if (Client_HasMode(c, 'o') && Client_Type(c) != CLIENT_SERVICE && !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG, Client_ID(from), Client_ID(c))) return DISCONNECTED; /* IRC-Bot? */ - if (Client_HasMode(c, 'B') && + if (Client_HasMode(c, 'B') && Client_Type(c) != CLIENT_SERVICE && !IRC_WriteStrClient(from, RPL_WHOISBOT_MSG, Client_ID(from), Client_ID(c))) return DISCONNECTED; @@ -1262,7 +1268,8 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) */ if (!has_wildcards || is_remote) { c = Client_Search(query); - if (c && Client_Type(c) == CLIENT_USER) { + if (c && (Client_Type(c) == CLIENT_USER + || Client_Type(c) == CLIENT_SERVICE)) { if (!IRC_WHOIS_SendReply(Client, from, c)) return DISCONNECTED; } else { diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index a6a6d8c..371abc2 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -56,6 +56,7 @@ #define RPL_UNAWAY_MSG "305 %s :You are no longer marked as being away" #define RPL_NOWAWAY_MSG "306 %s :You have been marked as being away" #define RPL_WHOISREGNICK_MSG "307 %s %s :is a registered nick" +#define RPL_WHOISSERVICE_MSG "310 %s %s :is an IRC service" #define RPL_WHOISUSER_MSG "311 %s %s %s %s * :%s" #define RPL_WHOISSERVER_MSG "312 %s %s %s :%s" #define RPL_WHOISOPERATOR_MSG "313 %s %s :is an IRC operator"

1 0

Alexander Barton : Exit message: use singular & plural :-)
by alex＠arthur.barton.de 27 Jan '13

27 Jan '13

Module: ngircd.git Branch: master Commit: 999c11ad49ea1e9c2615e4668f23aae483e549dc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=999c11ad… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 23:22:00 2013 +0100 Exit message: use singular & plural :-) --- src/ngircd/log.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 51bd2a5..375f4bc 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -109,8 +109,9 @@ Log_ReInit(void) GLOBAL void Log_Exit( void ) { - Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME, - NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted()); + Log(LOG_NOTICE, "%s done%s, served %lu connection%s.", PACKAGE_NAME, + NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(), + Conn_CountAccepted() == 1 ? "" : "s"); #ifdef SYSLOG closelog(); #endif

1 0

Alexander Barton : autogen.sh: Don't use "egrep -o", use "sed"
by alex＠arthur.barton.de 27 Jan '13

27 Jan '13

Module: ngircd.git Branch: master Commit: 419ff38a07cb0b1637b444c96cd6868a7a9e5524 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=419ff38a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 12:25:58 2013 +0100 autogen.sh: Don't use "egrep -o", use "sed" "egrep -o" isn't portable and not available on OpenBSD, for example. So let's use sed instead to get the automake version. The expression used now is less specific but should work as well ... --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index b1fa883..08cd4c2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -153,7 +153,7 @@ echo "Searching for required tools ..." [ -z "$AUTOMAKE" ] && Notfound automake [ -z "$AUTOCONF" ] && Notfound autoconf -AM_VERSION=`$AUTOMAKE --version|head -n 1|egrep -o "([1-9]\.[0-9]+(\.[0-9]+)*)"` +AM_VERSION=`$AUTOMAKE --version | head -n 1 | sed -e 's/.* //g'` ifs=$IFS; IFS="."; set $AM_VERSION; IFS=$ifs AM_MAJOR="$1"; AM_MINOR="$2"; AM_PATCHLEVEL="$3" echo "Detected automake $AM_VERSION ..."

1 0

Alexander Barton : autogen.sh: Check for autoconf/automake wrapper scripts
by alex＠arthur.barton.de 27 Jan '13

27 Jan '13

Module: ngircd.git Branch: master Commit: c891b5f250c71c1b8f94a002c13db6035ad28305 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c891b5f2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 12:54:48 2013 +0100 autogen.sh: Check for autoconf/automake wrapper scripts For example OpenBSD uses a "autoconf" and "automake" wrapper script which tells the user to set AUTOCONF_VERSION and AUTOMAKE_VERSION environment variables. This patch enhances autogen.sh to not detect these wrapper scripts as regular autoconf/automake commands but to set the required environment variables after detecting the real "command-X.Y" commands. Tested on OpenBSD 5.1. --- autogen.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index 08cd4c2..cab3ca6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -73,8 +73,12 @@ Search() for name in $searchlist; do $EXIST "${name}" >/dev/null 2>&1 if [ $? -eq 0 ]; then - echo "${name}" - return 0 + "${name}" --version 2>&1 \ + | grep -v "environment variable" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "${name}" + return 0 + fi fi done @@ -144,6 +148,15 @@ echo "Searching for required tools ..." [ -z "$AUTOCONF" ] && AUTOCONF=`Search autoconf 2` [ "$VERBOSE" = "1" ] && echo " - AUTOCONF=$AUTOCONF" +AUTOCONF_VERSION=`echo $AUTOCONF | cut -d'-' -f2-` +[ -n "$AUTOCONF_VERSION" -a "$AUTOCONF_VERSION" != "autoconf" ] \ + && export AUTOCONF_VERSION || unset AUTOCONF_VERSION +[ "$VERBOSE" = "1" ] && echo " - AUTOCONF_VERSION=$AUTOCONF_VERSION" +AUTOMAKE_VERSION=`echo $AUTOMAKE | cut -d'-' -f2-` +[ -n "$AUTOMAKE_VERSION" -a "$AUTOMAKE_VERSION" != "automake" ] \ + && export AUTOMAKE_VERSION || unset AUTOMAKE_VERSION +[ "$VERBOSE" = "1" ] && echo " - AUTOMAKE_VERSION=$AUTOMAKE_VERSION" + [ $# -gt 0 ] && CONFIGURE_ARGS=" $@" || CONFIGURE_ARGS="" [ -z "$GO" -a -n "$CONFIGURE_ARGS" ] && GO=1 @@ -195,7 +208,7 @@ done export ACLOCAL AUTOHEADER AUTOMAKE AUTOCONF # Generate files -echo "Generating files using GNU $AUTOCONF and $AUTOMAKE ..." +echo "Generating files using \"$AUTOCONF\" and \"$AUTOMAKE\" ..." Run $ACLOCAL && \ Run $AUTOCONF && \ Run $AUTOHEADER && \

1 0

Alexander Barton : IRC_WHO_Channel(): Use strlcpy() instead of strcpy()
by alex＠arthur.barton.de 27 Jan '13

27 Jan '13

Module: ngircd.git Branch: master Commit: 8d8201502f79bfe6fdaf8e94a11544332bb9630a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8d820150… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 01:00:32 2013 +0100 IRC_WHO_Channel(): Use strlcpy() instead of strcpy() This fixes the following warning, at least on OpenBSD 4.8: irc-info.o(.text+0x2427): In function `IRC_WHO': src/ngircd/irc-info.c:896: warning: strcpy() is almost always misused, please use strlcpy() --- src/ngircd/irc-info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 57d6e1a..aaa607d 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -893,7 +893,8 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) is_visible = strchr(client_modes, 'i') == NULL; if (is_member || is_visible) { - strcpy(flags, who_flags_status(client_modes)); + strlcpy(flags, who_flags_status(client_modes), + sizeof(flags)); if (is_ircop) strlcat(flags, "*", sizeof(flags));

1 0

Alexander Barton : Streamline punctuation of log messages
by alex＠arthur.barton.de 26 Jan '13

26 Jan '13

Module: ngircd.git Branch: master Commit: d38d153f51738da31d40036c7c48b32d82234018 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d38d153f… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 26 16:52:41 2013 +0100 Streamline punctuation of log messages Make sure that all log messages end with a correct punctuation mark. The rules for formatting log messages are: 1. Add punctuation marks to all messages passed to the actual logging functions like Log() and LogDebug(). 2. Don't add any punctuation marks to messages that are stored in variables for later use or are passed over the network. 3. IP addresses, DNS host names and IRC server names should be quoted. 4. Messages originating in the network should be quoted (at least if they are "untrusted" or variable). Most probably this patch doesn't fix all mistakes, but it should be a good starting point ... --- src/ngircd/channel.c | 4 ++-- src/ngircd/client.c | 41 ++++++++++++++++++++++++++--------------- src/ngircd/conn.c | 29 +++++++++++++---------------- src/ngircd/io.c | 2 +- src/ngircd/irc-login.c | 11 ++++++----- src/ngircd/irc-server.c | 4 ++-- src/ngircd/irc.c | 2 +- src/ngircd/ngircd.c | 22 ++++++++++++---------- 8 files changed, 63 insertions(+), 52 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=d38d…

1 0

Alexander Barton : configure: "netinet/in_systm.h" is optional
by alex＠arthur.barton.de 24 Jan '13

24 Jan '13

Module: ngircd.git Branch: master Commit: fd260404caa7ce174ada663024d19cd789c152b5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fd260404… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jan 24 22:45:00 2013 +0100 configure: "netinet/in_systm.h" is optional The header file "netinet/in_systm.h" already is optional in ngIRCd, so don't require it in the configure script. Now ngIRCd can be built on Minix 3 again :-) --- configure.ng | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ng b/configure.ng index c89096f..034b565 100644 --- a/configure.ng +++ b/configure.ng @@ -120,14 +120,14 @@ AC_HEADER_TIME # Required header files AC_CHECK_HEADERS([ \ - fcntl.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h \ + fcntl.h netdb.h netinet/in.h stdlib.h string.h \ strings.h sys/socket.h sys/time.h unistd.h \ ],,AC_MSG_ERROR([required C header missing!])) # Optional header files AC_CHECK_HEADERS_ONCE([ \ - arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \ - stdint.h varargs.h \ + arpa/inet.h inttypes.h malloc.h netinet/in_systm.h netinet/ip.h \ + stdbool.h stddef.h stdint.h varargs.h \ ]) # -- Datatypes --

1 0