- ngIRCd GIT Updates - lists.barton.de

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 : Handle unknown user modes on server links
by alex＠arthur.barton.de 13 Aug '11

13 Aug '11

Module: ngircd.git Branch: master Commit: 2dfa24d2fa42bdfece472da57c823a3968230fae URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2dfa24d2… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 22:09:40 2011 +0200 Handle unknown user modes on server links --- src/ngircd/irc-mode.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 7861868..b469a16 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -242,16 +242,25 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) x[0] = 'x'; break; default: - Log(LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", - set ? '+' : '-', *mode_ptr, Client_ID(Origin)); - if (Client_Type(Client) != CLIENT_SERVER) + if (Client_Type(Client) != CLIENT_SERVER) { + Log(LOG_DEBUG, + "Unknown mode \"%c%c\" from \"%s\"!?", + set ? '+' : '-', *mode_ptr, + Client_ID(Origin)); ok = IRC_WriteStrClient(Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID(Origin), set ? '+' : '-', *mode_ptr); - x[0] = '\0'; - goto client_exit; + x[0] = '\0'; + goto client_exit; + } else { + Log(LOG_DEBUG, + "Handling unknown mode \"%c%c\" from \"%s\" for \"%s\" ...", + set ? '+' : '-', *mode_ptr, + Client_ID(Origin), Client_ID(Target)); + x[0] = *mode_ptr; + } } if (!ok)

1 0

Alexander Barton : Handle unknown channel modes on server links
by alex＠arthur.barton.de 13 Aug '11

13 Aug '11

Module: ngircd.git Branch: master Commit: 2fd42667c2a064bab6e28523a7e68383604a1e15 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2fd42667… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 22:30:00 2011 +0200 Handle unknown channel modes on server links --- src/ngircd/irc-mode.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index b469a16..326c104 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -650,18 +650,25 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } break; default: - Log(LOG_DEBUG, - "Unknown mode \"%c%c\" from \"%s\" on %s!?", - set ? '+' : '-', *mode_ptr, Client_ID(Origin), - Channel_Name(Channel)); - if (Client_Type(Client) != CLIENT_SERVER) + if (Client_Type(Client) != CLIENT_SERVER) { + Log(LOG_DEBUG, + "Unknown mode \"%c%c\" from \"%s\" on %s!?", + set ? '+' : '-', *mode_ptr, + Client_ID(Origin), Channel_Name(Channel)); connected = IRC_WriteStrClient(Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID(Origin), set ? '+' : '-', *mode_ptr); - x[0] = '\0'; - goto chan_exit; - } /* switch() */ + x[0] = '\0'; + goto chan_exit; + } else { + Log(LOG_DEBUG, + "Handling unknown mode \"%c%c\" from \"%s\" on %s ...", + set ? '+' : '-', *mode_ptr, + Client_ID(Origin), Channel_Name(Channel)); + x[0] = *mode_ptr; + } + } if (!connected) break;

1 0

Alexander Barton : Handle channel user modes 'a', 'h', and 'q' from remote servers
by alex＠arthur.barton.de 13 Aug '11

13 Aug '11

Module: ngircd.git Branch: master Commit: 989c9fa531d83c9b1a302b222a4bcfeef767c2b6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=989c9fa5… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 23:30:55 2011 +0200 Handle channel user modes 'a', 'h', and 'q' from remote servers These channel user modes aren't used for anything at the moment, but ngIRCd knows that these three modes are "channel user modes" and not "channel modes", that is that these modes take an "nick name" argument. Like unknown user and channel modes, these modes are saved and forwarded, but ignored otherwise. --- src/ngircd/irc-mode.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 326c104..3cceaeb 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -594,6 +594,16 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Channel_Name(Channel)); break; /* --- Channel user modes --- */ + case 'a': + case 'h': + case 'q': + if (Client_Type(Client) != CLIENT_SERVER) { + connected = IRC_WriteStrClient(Origin, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(Origin), + Channel_Name(Channel)); + goto chan_exit; + } case 'o': /* Channel operator */ case 'v': /* Voice */ if (arg_arg > mode_arg) {

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