August 2011 - ngIRCd GIT Updates

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

Alexander Barton : New function Proc_Close() to shutdown pipes to child processes
by alex＠arthur.barton.de 23 Aug '11

23 Aug '11

Module: ngircd.git Branch: master Commit: be6994aece929425a7ac6bbdc770477cc527f2e8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=be6994ae… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 23 12:31:17 2011 +0200 New function Proc_Close() to shutdown pipes to child processes --- src/ngircd/proc.c | 12 +++++++++++- src/ngircd/proc.h | 5 ++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index 54b3919..2a5eda8 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.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 @@ -148,4 +148,14 @@ Proc_Read(PROC_STAT *proc, void *buffer, size_t buflen) return (size_t)bytes_read; } +/** + * Close pipe to a forked child process. + */ +GLOBAL void +Proc_Close(PROC_STAT *proc) +{ + io_close(proc->pipe_fd); + Proc_InitStruct(proc); +} + /* -eof- */ diff --git a/src/ngircd/proc.h b/src/ngircd/proc.h index 84b61f2..4a80edf 100644 --- a/src/ngircd/proc.h +++ b/src/ngircd/proc.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 @@ -38,6 +38,9 @@ GLOBAL void Proc_GenericSignalHandler PARAMS((int Signal)); GLOBAL size_t Proc_Read PARAMS((PROC_STAT *proc, void *buffer, size_t buflen)); +GLOBAL void Proc_Close PARAMS((PROC_STAT *proc)); + + #endif /* -eof- */

1 0

Alexander Barton : Introduce DEBUG_BUFFER, rework some debug messages
by alex＠arthur.barton.de 23 Aug '11

23 Aug '11

Module: ngircd.git Branch: master Commit: 1361b3742df0c5c8d51272248ff70164d0a3cd11 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1361b374… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 23 12:28:04 2011 +0200 Introduce DEBUG_BUFFER, rework some debug messages DEBUG_BUFFER is off by default and therefore disables these messages: - "Handle_Write() called for connection XX, YY bytes pending ..." - "Connection XX: ZZ bytes left in read buffer." --- src/ngircd/conn.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 3350e20..1a9ac47 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -9,6 +9,8 @@ * Please read the file COPYING, README and AUTHORS for more information. */ +#undef DEBUG_BUFFER + #define CONN_MODULE #include "portab.h" @@ -1255,9 +1257,11 @@ Handle_Write( CONN_ID Idx ) return true; } +#ifdef DEBUG_BUFFER LogDebug ("Handle_Write() called for connection %d, %ld bytes pending ...", Idx, wdatalen); +#endif #ifdef SSL_SUPPORT if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_SSL )) { @@ -1326,6 +1330,8 @@ New_Connection(int Sock) assert(Sock > NONE); + LogDebug("Accepting new connection on socket %d ...", Sock); + new_sock_len = (int)sizeof(new_addr); new_sock = accept(Sock, (struct sockaddr *)&new_addr, (socklen_t *)&new_sock_len); @@ -1753,8 +1759,10 @@ Handle_Buffer(CONN_ID Idx) return 0; /* error -> connection has been closed */ array_moveleft(&My_Connections[Idx].rbuf, 1, len); +#ifdef DEBUG_BUFFER LogDebug("Connection %d: %d bytes left in read buffer.", Idx, array_bytes(&My_Connections[Idx].rbuf)); +#endif #ifdef ZLIB if ((!old_z) && (My_Connections[Idx].options & CONN_ZIP) && (array_bytes(&My_Connections[Idx].rbuf) > 0)) { @@ -2051,13 +2059,14 @@ Init_Socket( int Sock ) /* Set type of service (TOS) */ #if defined(IPPROTO_IP) && defined(IPTOS_LOWDELAY) value = IPTOS_LOWDELAY; - LogDebug("Setting IP_TOS on socket %d to IPTOS_LOWDELAY.", Sock); if (setsockopt(Sock, IPPROTO_IP, IP_TOS, &value, (socklen_t) sizeof(value))) { LogDebug("Can't set socket option IP_TOS: %s!", strerror(errno)); /* ignore this error */ - } + } else + LogDebug("IP_TOS on socket %d has been set to IPTOS_LOWDELAY.", + Sock); #endif return true;

1 0

Alexander Barton : Testsuite: bind to loopback (127.0.0.1) interface only
by alex＠arthur.barton.de 22 Aug '11

22 Aug '11

Module: ngircd.git Branch: master Commit: d3036c74e9336f8e1ab8b39ebe8e13fabad74802 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d3036c74… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 22 16:54:24 2011 +0200 Testsuite: bind to loopback (127.0.0.1) interface only --- src/testsuite/ngircd-test1.conf | 1 + src/testsuite/ngircd-test2.conf | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/testsuite/ngircd-test1.conf b/src/testsuite/ngircd-test1.conf index f65f706..1e40fd3 100644 --- a/src/testsuite/ngircd-test1.conf +++ b/src/testsuite/ngircd-test1.conf @@ -4,6 +4,7 @@ [Global] Name = ngircd.test.server Info = ngIRCd Test-Server 1 + Listen = 127.0.0.1 Ports = 6789 MotdFile = ngircd-test1.motd AdminEMail = admin(a)irc.server diff --git a/src/testsuite/ngircd-test2.conf b/src/testsuite/ngircd-test2.conf index 5d2e28f..e3f8867 100644 --- a/src/testsuite/ngircd-test2.conf +++ b/src/testsuite/ngircd-test2.conf @@ -4,6 +4,7 @@ [Global] Name = ngircd.test.server2 Info = ngIRCd Test-Server 2 + Listen = 127.0.0.1 Ports = 6790 MotdFile = ngircd-test2.motd AdminEMail = admin(a)irc.server2 @@ -23,7 +24,7 @@ [Server] Name = ngircd.test.server - Host = localhost + Host = 127.0.0.1 Port = 6789 MyPassword = pwd2 PeerPassword = pwd1

1 0

Alexander Barton : doc/Platforms.txt: ngIRCd 18 on Nexenta works
by alex＠arthur.barton.de 19 Aug '11

19 Aug '11

Module: ngircd.git Branch: master Commit: 553e8b6aa3fd7bcf9e8c1f586c16c2b8ae16f877 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=553e8b6a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 19 15:51:56 2011 +0200 doc/Platforms.txt: ngIRCd 18 on Nexenta works Thanks to Götz Hoffart for testing! --- doc/Platforms.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 0346ac6..58913c3 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -35,6 +35,7 @@ i386/apple/darwin10.7.0 gcc 4.2.1 18 11-07-05 alex Y Y Y Y (3) i386/apple/darwin11.0.0 gcc 4.2.1 18 11-07-02 alex Y Y Y Y (3) 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 18 11-07-10 alex Y Y N Y (4) +i386/pc/solaris2.11 gcc 4.2.3 18 11-08-17 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 18 11-07-10 alex Y Y Y Y (3) i386/unknown/freebsd7.3 gcc 4.2.1 18 11-07-10 alex Y Y Y Y (3)

1 0

Alexander Barton : New 2nd message "Nickname too long" for error code 432
by alex＠arthur.barton.de 19 Aug '11

19 Aug '11

Module: ngircd.git Branch: master Commit: 51d7674ee7b17553a7481b7a154145300797d6e3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=51d7674e… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 19 11:09:40 2011 +0200 New 2nd message "Nickname too long" for error code 432 --- src/ngircd/client.c | 9 +++++++-- src/ngircd/messages.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 0f151ac..16c551f 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -864,8 +864,13 @@ Client_CheckNick(CLIENT *Client, char *Nick) assert(Nick != NULL); if (!Client_IsValidNick(Nick)) { - IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, - Client_ID(Client), Nick); + if (strlen(Nick ) >= Conf_MaxNickLength) + IRC_WriteStrClient(Client, ERR_NICKNAMETOOLONG_MSG, + Client_ID(Client), Nick, + Conf_MaxNickLength - 1); + else + IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, + Client_ID(Client), Nick); return false; } diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 93bef3d..12791d2 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -105,6 +105,7 @@ #define ERR_NOMOTD_MSG "422 %s :MOTD file is missing" #define ERR_NONICKNAMEGIVEN_MSG "431 %s :No nickname given" #define ERR_ERRONEUSNICKNAME_MSG "432 %s %s :Erroneous nickname" +#define ERR_NICKNAMETOOLONG_MSG "432 %s %s :Nickname too long, max. %u characters" #define ERR_NICKNAMEINUSE_MSG "433 %s %s :Nickname already in use" #define ERR_USERNOTINCHANNEL_MSG "441 %s %s %s :They aren't on that channel" #define ERR_NOTONCHANNEL_MSG "442 %s %s :You are not on that channel"

1 0

Alexander Barton : Client_CheckNick(), Client_IsValidNick(): code cleanup
by alex＠arthur.barton.de 19 Aug '11

19 Aug '11

Module: ngircd.git Branch: master Commit: 1189200d4a1df4cf338c7d5979c2a54fc7edfc8d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1189200d… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 19 10:44:26 2011 +0200 Client_CheckNick(), Client_IsValidNick(): code cleanup --- src/ngircd/client.c | 57 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 83c80f8..0f151ac 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -847,23 +847,32 @@ Client_Away( CLIENT *Client ) } /* Client_Away */ +/** + * Make sure that a given nickname is valid. + * + * If the nickname is not valid for the given client, this function sends back + * the appropriate error messages. + * + * @param Client Client that wants to change the nickname. + * @param Nick New nick name. + * @returns true if nickname is valid, false otherwise. + */ GLOBAL bool -Client_CheckNick( CLIENT *Client, char *Nick ) +Client_CheckNick(CLIENT *Client, char *Nick) { - assert( Client != NULL ); - assert( Nick != NULL ); + assert(Client != NULL); + assert(Nick != NULL); - if (! Client_IsValidNick( Nick )) - { - IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick ); + if (!Client_IsValidNick(Nick)) { + IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, + Client_ID(Client), Nick); return false; } - /* Nick bereits vergeben? */ - if( Client_Search( Nick )) - { - /* den Nick gibt es bereits */ - IRC_WriteStrClient( Client, ERR_NICKNAMEINUSE_MSG, Client_ID( Client ), Nick ); + /* Nickname already registered? */ + if (Client_Search(Nick)) { + IRC_WriteStrClient(Client, ERR_NICKNAMEINUSE_MSG, + Client_ID(Client), Nick); return false; } @@ -1019,23 +1028,31 @@ Client_MyMaxUserCount( void ) } /* Client_MyMaxUserCount */ +/** + * Check that a given nickname is valid. + * + * @param Nick the nickname to check. + * @returns true if nickname is valid, false otherwise. + */ GLOBAL bool -Client_IsValidNick( const char *Nick ) +Client_IsValidNick(const char *Nick) { const char *ptr; static const char goodchars[] = ";0123456789-"; - assert( Nick != NULL ); + assert (Nick != NULL); - if( Nick[0] == '#' ) return false; - if( strchr( goodchars, Nick[0] )) return false; - if( strlen( Nick ) >= Conf_MaxNickLength) return false; + if (strchr(goodchars, Nick[0])) + return false; + if (strlen(Nick ) >= Conf_MaxNickLength) + return false; ptr = Nick; - while( *ptr ) - { - if (( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return false; - if ( *ptr > '}' ) return false; + while (*ptr) { + if (*ptr < 'A' && !strchr(goodchars, *ptr )) + return false; + if (*ptr > '}') + return false; ptr++; }

1 0

Alexander Barton : Merge branch 'ServerMode'
by alex＠arthur.barton.de 13 Aug '11

13 Aug '11

Module: ngircd.git Branch: master Commit: 7795b07c53f29bfdcfb2e4ebb5a9d18e283773c0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7795b07c… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 13 21:04:01 2011 +0200 Merge branch 'ServerMode' * ServerMode: Handle channel user modes 'a', 'h', and 'q' from remote servers Handle unknown channel modes on server links Handle unknown user modes on server links IRC_MODE(), Client_Mode(): code cleanup [2/2] Enlarge client user mode buffer, reduce client flags buffer Infom clients when other servers change their user modes IRC_MODE(), Client_Mode(): code cleanup [1/2] ---

1 0