- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Only use AI_NUMERICHOST if it is #define'd
by alex＠arthur.barton.de 06 Nov '11

06 Nov '11

Module: ngircd.git Branch: master Commit: a7911e35afce4de5f387f9dae0f414ae35006b25 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a7911e35… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 6 14:13:49 2011 +0100 Only use AI_NUMERICHOST if it is #define'd It isn't using GNU libc 2.0.7, for example ... --- src/ipaddr/ng_ipaddr.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ipaddr/ng_ipaddr.c b/src/ipaddr/ng_ipaddr.c index a47a40d..05ef6ec 100644 --- a/src/ipaddr/ng_ipaddr.c +++ b/src/ipaddr/ng_ipaddr.c @@ -32,7 +32,9 @@ ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, UINT16 port) assert(ip_str); memset(&hints, 0, sizeof(hints)); +#ifdef AI_NUMERICHOST hints.ai_flags = AI_NUMERICHOST; +#endif #ifndef WANT_IPV6 /* do not convert ipv6 addresses */ hints.ai_family = AF_INET; #endif

1 0

Alexander Barton : Test for gai_strerror()
by alex＠arthur.barton.de 06 Nov '11

06 Nov '11

Module: ngircd.git Branch: master Commit: 13d9e0c5a7e03559a2b5bf405b526098b15bd0e6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=13d9e0c5… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 6 14:16:59 2011 +0100 Test for gai_strerror() If gai_strerror() isn't available, use a macro that simply returns a static error message (regardless of the real error code). For example, GNU libc 2.0.7 doesn't implement gai_strerror(). --- configure.in | 8 +++++--- src/portab/portab.h | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index e48e9e3..92434ec 100644 --- a/configure.in +++ b/configure.in @@ -160,10 +160,12 @@ AC_FUNC_STRFTIME AC_CHECK_FUNCS([ \ bind gethostbyaddr gethostbyname gethostname inet_ntoa \ - setsid setsockopt socket strcasecmp waitpid],,AC_MSG_ERROR([required function missing!])) + setsid setsockopt socket strcasecmp waitpid],, + AC_MSG_ERROR([required function missing!])) -AC_CHECK_FUNCS(getaddrinfo getnameinfo inet_aton sigaction sigprocmask snprintf \ - vsnprintf strdup strlcpy strlcat strtok_r) +AC_CHECK_FUNCS([ \ + gai_strerror getaddrinfo getnameinfo inet_aton sigaction \ + sigprocmask snprintf vsnprintf strdup strlcpy strlcat strtok_r]) # -- Configuration options -- diff --git a/src/portab/portab.h b/src/portab/portab.h index a75aa34..90f36a0 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -164,6 +164,10 @@ extern char * strtok_r PARAMS((char *str, const char *delim, char **saveptr)); extern int vsnprintf PARAMS(( char *str, size_t count, const char *fmt, va_list args )); #endif +#ifndef HAVE_GAI_STRERROR +#define gai_strerror(r) "unknown error" +#endif + #ifndef PACKAGE_NAME #define PACKAGE_NAME PACKAGE #endif

1 0

Alexander Barton : defines.h: fix comment: "lenth" -> "length"
by alex＠arthur.barton.de 05 Nov '11

05 Nov '11

Module: ngircd.git Branch: master Commit: 60812b6fdf8ec8b644e1209802cd001a0a032d23 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=60812b6f… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 5 00:35:18 2011 +0100 defines.h: fix comment: "lenth" -> "length" Reported by Christoph Biedl in #ngircd. Thanks! --- src/ngircd/defines.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 8db59e8..4bcb6af 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -44,7 +44,7 @@ see RFC 2812, section 1.2.1 */ #define CLIENT_NAME_LEN 32 /* Max. length of "real names" */ #define CLIENT_HOST_LEN 64 /* Max. host name length */ -#define CLIENT_MODE_LEN 16 /* Max. lenth of all client modes */ +#define CLIENT_MODE_LEN 16 /* Max. length of all client modes */ #define CLIENT_INFO_LEN 64 /* Max. length of server info texts */ #define CLIENT_AWAY_LEN 128 /* Max. length of away messages */ #define CLIENT_FLAGS_LEN 16 /* Max. length of client flags */

1 0

Alexander Barton : Init_Server_Struct(): correctly zero Server->bind_addr
by alex＠arthur.barton.de 05 Nov '11

05 Nov '11

Module: ngircd.git Branch: master Commit: 1ea681161652c118d7acb7932678e1acf6646611 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1ea68116… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 5 00:21:19 2011 +0100 Init_Server_Struct(): correctly zero Server->bind_addr Don't use the size of the pointer, use the size of the variable! --- src/ngircd/conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 97634af..dccc9c7 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -2048,7 +2048,7 @@ Init_Server_Struct( CONF_SERVER *Server ) Proc_InitStruct(&Server->res_stat); Server->conn_id = NONE; - memset(&Server->bind_addr, 0, sizeof(&Server->bind_addr)); + memset(&Server->bind_addr, 0, sizeof(Server->bind_addr)); } /* -eof- */

1 0

Alexander Barton : Clean up and fix comments of Check_ArgIsTrue()
by alex＠arthur.barton.de 03 Nov '11

03 Nov '11

Module: ngircd.git Branch: master Commit: d2f54abbedb299a8c3d32295c24397535a4bd2af URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d2f54abb… Author: Alexander Barton <alex(a)barton.de> Date: Thu Nov 3 09:54:28 2011 +0100 Clean up and fix comments of Check_ArgIsTrue() Thanks to kaFux for pointing this out! And fix code formatting as well ... --- src/ngircd/conf.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 4991918..97634af 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -978,17 +978,21 @@ Read_Config( bool ngircd_starting ) } /** - * Check whether an string argument is true or false. + * Check whether a string argument is "true" or "false". * * @param Arg Input string. - * @returns true if string has been parsed as "yes"/"true"/"on". + * @returns true if the input string has been parsed as "yes", "true" + * (case insensitive) or a non-zero integer value. */ static bool -Check_ArgIsTrue( const char *Arg ) +Check_ArgIsTrue(const char *Arg) { - if( strcasecmp( Arg, "yes" ) == 0 ) return true; - if( strcasecmp( Arg, "true" ) == 0 ) return true; - if( atoi( Arg ) != 0 ) return true; + if (strcasecmp(Arg, "yes") == 0) + return true; + if (strcasecmp(Arg, "true") == 0) + return true; + if (atoi(Arg) != 0) + return true; return false; }

1 0

Alexander Barton : Update doc/GIT.txt
by alex＠arthur.barton.de 07 Sep '11

07 Sep '11

Module: ngircd.git Branch: master Commit: 07dbb73c929aa3f478abc51575c2dcafe6a62111 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=07dbb73c… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 7 15:39:41 2011 +0200 Update doc/GIT.txt --- doc/GIT.txt | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/doc/GIT.txt b/doc/GIT.txt index 4375184..f3b2e63 100644 --- a/doc/GIT.txt +++ b/doc/GIT.txt @@ -9,13 +9,23 @@ -- GIT.txt -- -The source code of ngIRCd is maintained using git, the stupid content -tracker. +The source code of ngIRCd is maintained using GIT, an distributed version +control system. Homepage including documentation: <http://git-scm.com/>. -I. Getting the source code -~~~~~~~~~~~~~~~~~~~~~~~~~~ -To access the source tree anonymously, run: +I. Viewing the source code online +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The ngIRCd "GITweb" interface allows you to browse the GIT repository and +to see all individual files, tags, branches, commits etc.: + + <http://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git> + + +II. Getting the source code +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To access (copy, clone) the source tree repository anonymously, run: $ git clone git://ngircd.barton.de/ngircd.git @@ -23,23 +33,23 @@ Thereby a new folder "ngircd" will be created containing all the individual source files. The newly created directory ("ngircd") is the "working directory", all -git commands will be executed from within this directory in the future. +GIT commands will be executed from within this directory in the future. -Please note: When checking out a fresh copy of ngIRCd using git, the +Please note: When checking out a fresh copy of ngIRCd using GIT, the configure script doesn't exist; you have to run the autogen.sh shell script (which is included in the source tree) to generate it. This requires you to have GNU automake and GNU autoconf installed on your system. Please see the file INSTALL for details! -To update the git tree: +To update the local GIT repository: $ git pull This retrieves all changes and merges them into the current branch. -II. Contributing -~~~~~~~~~~~~~~~~ +III. Contributing +~~~~~~~~~~~~~~~~~ Patches should be sent to the ngircd mailing list. List homepage: http://arthur.barton.de/mailman/listinfo/ngircd-ml @@ -48,7 +58,8 @@ If you do not want to send them to the list, you can also mail them to Alex Barton, <alex(a)barton.de>. -III. Write Access -~~~~~~~~~~~~~~~~~ -If you want to contribute a couple of patches and write access to the git +IV. Write Access +~~~~~~~~~~~~~~~~ + +If you want to contribute a couple of patches and write access to the GIT repository would be handy, please contact Alex Barton, <alex(a)barton.de>.

1 0

Alexander Barton : Only close "unrelated" sockets in forked child processes
by alex＠arthur.barton.de 07 Sep '11

07 Sep '11

Module: ngircd.git Branch: master Commit: 30796698a9fca0037ea48f70ceafac1e783d06fb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=30796698… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 7 14:51:16 2011 +0200 Only close "unrelated" sockets in forked child processes This fixes the problem that ngIRCd can't do any IDENT lookups because of the socket has already been closed in the child process. The bug has been introduced starting with ngIRCd 17 ... :-( (commit ID 6ebb31ab35e) --- src/ngircd/conn.c | 7 ++++--- src/ngircd/conn.h | 4 ++-- src/ngircd/irc-login.c | 3 ++- src/ngircd/proc.c | 1 - src/ngircd/resolve.c | 6 ++++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 407da1a..aa754eb 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 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 @@ -435,12 +435,13 @@ Conn_Exit( void ) * they don't hold connections open that the main process wants to close. */ GLOBAL void -Conn_CloseAllSockets(void) +Conn_CloseAllSockets(int ExceptOf) { CONN_ID idx; for(idx = 0; idx < Pool_Size; idx++) { - if(My_Connections[idx].sock > NONE) + if(My_Connections[idx].sock > NONE && + My_Connections[idx].sock != ExceptOf) close(My_Connections[idx].sock); } } diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index c813729..251da2a 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 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 @@ -106,7 +106,7 @@ GLOBAL long WCounter; GLOBAL void Conn_Init PARAMS((void )); GLOBAL void Conn_Exit PARAMS(( void )); -GLOBAL void Conn_CloseAllSockets PARAMS((void)); +GLOBAL void Conn_CloseAllSockets PARAMS((int ExceptOf)); GLOBAL unsigned int Conn_InitListeners PARAMS(( void )); GLOBAL void Conn_ExitListeners PARAMS(( void )); diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 0577cd9..884a06b 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 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 @@ -959,6 +959,7 @@ Hello_User(CLIENT * Client) } else { /* Sub process */ Log_Init_Subprocess("Auth"); + Conn_CloseAllSockets(NONE); result = PAM_Authenticate(Client); if (write(pipefd[1], &result, sizeof(result)) != sizeof(result)) Log_Subprocess(LOG_ERR, diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index fd2df1d..7addb47 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -79,7 +79,6 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout signal(SIGALRM, Proc_GenericSignalHandler); close(pipefds[0]); alarm(timeout); - Conn_CloseAllSockets(); return 0; } diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index 9b17af9..c7e6003 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 by 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 @@ -75,7 +75,8 @@ Resolve_Addr(PROC_STAT * s, const ng_ipaddr_t *Addr, int identsock, } else if( pid == 0 ) { /* Sub process */ Log_Init_Subprocess("Resolver"); - Do_ResolveAddr( Addr, identsock, pipefd[1]); + Conn_CloseAllSockets(identsock); + Do_ResolveAddr(Addr, identsock, pipefd[1]); Log_Exit_Subprocess("Resolver"); exit(0); } @@ -104,6 +105,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short)) } else if( pid == 0 ) { /* Sub process */ Log_Init_Subprocess("Resolver"); + Conn_CloseAllSockets(NONE); Do_ResolveName(Host, pipefd[1]); Log_Exit_Subprocess("Resolver"); exit(0);

1 0

Alexander Barton : Added doc/Modes.txt: document modes supported by ngIRCd
by alex＠arthur.barton.de 26 Aug '11

26 Aug '11

Module: ngircd.git Branch: master Commit: f173a974bee5181d8131519ed07b3b5261bf6366 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f173a974… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 26 16:16:53 2011 +0200 Added doc/Modes.txt: document modes supported by ngIRCd --- doc/Makefile.am | 19 +++++++-------- doc/Modes.txt | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 10 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 92e5f8f..c153fec 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,13 +1,12 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) +# Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # .tmpl: @@ -17,9 +16,9 @@ SUFFIXES = .tmpl -static_docs = Bopm.txt FAQ.txt GIT.txt HowToRelease.txt PAM.txt Platforms.txt \ - Protocol.txt README-AUX.txt README-BeOS.txt README-Interix.txt RFC.txt \ - SSL.txt Services.txt +static_docs = Bopm.txt FAQ.txt GIT.txt HowToRelease.txt Modes.txt PAM.txt \ + Platforms.txt Protocol.txt README-AUX.txt README-BeOS.txt \ + README-Interix.txt RFC.txt SSL.txt Services.txt doc_templates = sample-ngircd.conf.tmpl diff --git a/doc/Modes.txt b/doc/Modes.txt new file mode 100644 index 0000000..d644a48 --- /dev/null +++ b/doc/Modes.txt @@ -0,0 +1,67 @@ + + ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ + + (c)2001-2011 Alexander Barton and Contributors. + ngIRCd is free software and published under the + terms of the GNU General Public License. + + -- Modes.txt -- + + +This document lists the different user modes, channel modes, and channel +user modes that ngIRCd supports. + + +I. User Modes +~~~~~~~~~~~~~ + +User modes are attributes a user has in the network, regardless of the +channels he is using at the moment. + + mode since description + + a 0.3.0 User is away. + c 17 IRC operator wants to receive connect/disconnect NOTICEs. + i 0.0.1 User is "invisible". + o 0.0.1 User is IRC operator. + r 0.0.1 User is restricted. + R 19 User is registered (e.g. by NickServ). + s 0.4.0 User wants to receive server notices. + w 0.11.0 User wants to receive WALLOPS messages. + x 17 Hostname of this user is "cloaked". + +II. Channel Modes +~~~~~~~~~~~~~~~~~ + +Channel modes are attributes of specific channels which are valid for all +users joined (or trying to join) to this channel. Some modes add and remove +users to lists (e.g. "invite list", "ban list"), others have parameters +(like "channel key"), most are simple flags (like "moderated"). + + mode since description + + b 0.5.0 Add/remove a host mask to the ban list. + i 0.5.0 Channel is "invite only". + I 0.5.0 Add/remove a host mask to the invite list. + k 0.6.0 Channel has a "key" (a password). + l 0.6.0 Channel has a user limit. + m 0.3.0 Channel is moderated, only "voiced" users can send messages. + n 0.3.0 Channel doesn't allow messages of users not being members. + O 18 Only IRC operators are allowed to join this channel. + P 0.5.0 Channel is "persistent". + R 19 Only registered users are allowed to join this channel. + s 0.9.0 Channel is "secret". + t 0.3.0 Only ChanOps are allowed to modify the channel topic. + z 16 Only users connected via SSL are allowed to join the channel. + +III. Channel User Modes +~~~~~~~~~~~~~~~~~~~~~~~ + +Channel user modes are attributes that a particular user has in a specific +channel of which he is a member. + + mode since description + + o 0.2.0 User is channel operator and can op/kick/... other members. + v 0.2.0 User is "voiced" and can speak even if channel is moderated.

1 0

Alexander Barton : Implemented user mode "R" and channel mode "R"
by alex＠arthur.barton.de 26 Aug '11

26 Aug '11

Module: ngircd.git Branch: master Commit: 8aac36680265124067994391e7efef4e241a0ffd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8aac3668… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 26 15:26:38 2011 +0200 Implemented user mode "R" and channel mode "R" - User mode "R": indicates that the nick name of this user is "registered". This mode isn't handled by ngIRCd itself, but must be set and unset by IRC services like Anope. - Channel mode "R": only registered users (having the user mode "R" set) are allowed to join this channel. --- src/ngircd/defines.h | 4 ++-- src/ngircd/irc-channel.c | 7 +++++++ src/ngircd/irc-mode.c | 1 + src/ngircd/messages.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 8f62279..8db59e8 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -82,8 +82,8 @@ #define RECONNECT_DELAY 3 /* Time to delay re-connect attempts in seconds. */ -#define USERMODES "aciorswx" /* Supported user modes. */ -#define CHANMODES "biIklmnoOPstvz" /* Supported channel modes. */ +#define USERMODES "aciorRswx" /* Supported user modes. */ +#define CHANMODES "biIklmnoOPRstvz" /* Supported channel modes. */ #define CONNECTED true /* Internal status codes. */ #define DISCONNECTED false diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 66b3eeb..233e173 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -137,6 +137,13 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return false; } + if (strchr(channel_modes, 'R') && !strchr(Client_Modes(Client), 'R')) { + /* Only registered users are allowed! */ + IRC_WriteStrClient(Client, ERR_REGONLYCHANNEL_MSG, + Client_ID(Client), channame); + return false; + } + return true; } /* join_allowed */ diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 3cceaeb..ba44a3b 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -479,6 +479,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) case 'i': /* Invite only */ case 'm': /* Moderated */ case 'n': /* Only members can write */ + case 'R': /* Registered users only */ case 's': /* Secret channel */ case 't': /* Topic locked */ case 'z': /* Secure connections only */ diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 12791d2..78ac068 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -120,6 +120,7 @@ #define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l)" #define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z)" #define ERR_OPONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+O)" +#define ERR_REGONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+R)" #define ERR_UNKNOWNMODE_MSG "472 %s: %c :is unknown mode char for %s" #define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i)" #define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b)"

1 0

Alexander Barton : Use Proc_Close() to remove no longer unused pipes to child processes
by alex＠arthur.barton.de 23 Aug '11

23 Aug '11

Module: ngircd.git Branch: master Commit: 69803d6ff1ac8deb95e023bda6ad2aef435dc69a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=69803d6f… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 23 12:32:05 2011 +0200 Use Proc_Close() to remove no longer unused pipes to child processes This removes spurious (but harmless) debug messages. --- src/ngircd/conn.c | 2 ++ src/ngircd/irc-login.c | 1 + src/ngircd/proc.c | 11 ++++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 1a9ac47..407da1a 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2107,6 +2107,7 @@ cb_Connect_to_Server(int fd, UNUSED short events) /* Read result from pipe */ len = Proc_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs)); + Proc_Close(&Conf_Server[i].res_stat); if (len == 0) { /* Error resolving hostname: reset server structure */ Conf_Server[i].conn_id = NONE; @@ -2166,6 +2167,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) /* Read result from pipe */ len = Proc_Read(&My_Connections[i].proc_stat, readbuf, sizeof readbuf -1); + Proc_Close(&My_Connections[i].proc_stat); if (len == 0) return; diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index edaefd6..0577cd9 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -1009,6 +1009,7 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) /* Read result from pipe */ len = Proc_Read(proc, &result, sizeof(result)); + Proc_Close(proc); if (len == 0) return; diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index 2a5eda8..fd2df1d 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -138,13 +138,14 @@ Proc_Read(PROC_STAT *proc, void *buffer, size_t buflen) return 0; Log(LOG_CRIT, "Can't read from child process %ld: %s", proc->pid, strerror(errno)); + Proc_Close(proc); bytes_read = 0; + } else if (bytes_read == 0) { + /* EOF: clean up */ + LogDebug("Child process %ld: EOF reached, closing pipe.", + proc->pid); + Proc_Close(proc); } -#if DEBUG - else if (bytes_read == 0) - LogDebug("Can't read from child process %ld: EOF", proc->pid); -#endif - Proc_InitStruct(proc); return (size_t)bytes_read; }

1 0