- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : IRC_SetPenalty(): Code cleanup
by alex＠arthur.barton.de 07 Sep '13

07 Sep '13

Module: ngircd.git Branch: master Commit: 131364def157263d1416e559636593a4daaca72a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=131364de… Author: Alexander Barton <alex(a)barton.de> Date: Sat Sep 7 00:05:49 2013 +0200 IRC_SetPenalty(): Code cleanup --- src/ngircd/irc-write.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index 526e2fb..25cecaf 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -538,24 +538,27 @@ va_dcl /** * Set a "penalty time" for an IRC client. * - * Note: penalty times are never set for server links! + * Note: penalty times are never set for server links or remote clients! * * @param Client The client. * @param Seconds The additional "penalty time" to enforce. */ GLOBAL void -IRC_SetPenalty( CLIENT *Client, time_t Seconds ) +IRC_SetPenalty(CLIENT *Client, time_t Seconds) { CONN_ID c; - assert( Client != NULL ); - assert( Seconds > 0 ); + assert(Client != NULL); + assert(Seconds > 0); + + if (Client_Type(Client) == CLIENT_SERVER) + return; - if( Client_Type( Client ) == CLIENT_SERVER ) return; + c = Client_Conn(Client); + if (c <= NONE) + return; - c = Client_Conn( Client ); - if (c > NONE) - Conn_SetPenalty(c, Seconds); + Conn_SetPenalty(c, Seconds); } /* IRC_SetPenalty */ static const char *

1 0

Federico G. Schwindt : Add more penalty times
by alex＠arthur.barton.de 07 Sep '13

07 Sep '13

Module: ngircd.git Branch: master Commit: bcb45da1b416e7ee4b50dcf16947fb9703f713cf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bcb45da1… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Sep 5 17:11:38 2013 +0100 Add more penalty times Ensure before every numeric 461 there is a call to IRC_SetPenalty(). --- src/ngircd/irc-channel.c | 12 +++++++++--- src/ngircd/irc-info.c | 4 +++- src/ngircd/irc-login.c | 5 ++++- src/ngircd/irc-mode.c | 3 +++ src/ngircd/irc-op.c | 1 + src/ngircd/irc-oper.c | 12 +++++++++--- src/ngircd/irc-server.c | 12 +++++++++--- src/ngircd/irc.c | 1 + 8 files changed, 39 insertions(+), 11 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index ce04204..d5e7bdd 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -323,9 +323,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) channame = strtok_r(channame, ",", &lastchan); /* Make sure that "channame" is not the empty string ("JOIN :") */ - if (! channame) + if (!channame) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } while (channame) { flags = NULL; @@ -445,9 +447,11 @@ IRC_PART(CLIENT * Client, REQUEST * Req) chan = strtok(Req->argv[0], ","); /* Make sure that "chan" is not the empty string ("PART :") */ - if (! chan) + if (!chan) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } while (chan) { Channel_Part(target, Client, chan, @@ -662,9 +666,11 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); /* Bad number of parameters? */ - if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) + if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } /* Compatibility kludge */ if (Req->argc == 5) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 88455c7..1c250a4 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1146,11 +1146,13 @@ IRC_WHO(CLIENT *Client, REQUEST *Req) if (strcmp(Req->argv[1], "o") == 0) only_ops = true; #ifdef STRICT_RFC - else + else { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } #endif } diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 67a0fbf..013481d 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -81,6 +81,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) } else if (Client_Type(Client) == CLIENT_UNKNOWN || Client_Type(Client) == CLIENT_UNKNOWNSERVER) { /* Unregistered connection, but wrong number of arguments: */ + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); } else { @@ -270,9 +271,11 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) /* Server or service introduces new client */ /* Bad number of parameters? */ - if (Req->argc != 2 && Req->argc != 7) + if (Req->argc != 2 && Req->argc != 7) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } if (Req->argc >= 7) { /* RFC 2813 compatible syntax */ diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 38fec0d..e2fa59a 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -622,6 +622,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) #ifdef STRICT_RFC /* Only send error message in "strict" mode, * this is how ircd2.11 and others behave ... */ + IRC_SetPenalty(Origin, 2); connected = IRC_WriteErrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); @@ -666,6 +667,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) #ifdef STRICT_RFC /* Only send error message in "strict" mode, * this is how ircd2.11 and others behave ... */ + IRC_SetPenalty(Origin, 2); connected = IRC_WriteErrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); @@ -767,6 +769,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) * mode, because most other servers don't do * it as well and some clients send "wired" * MODE commands like "MODE #chan -ooo nick". */ + IRC_SetPenalty(Origin, 2); connected = IRC_WriteErrClient(Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID(Origin), Req->command); diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 23db579..5212687 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -122,6 +122,7 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) nickCount--; } } else { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); } diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 4063317..4d17085 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -208,14 +208,18 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) /* Bad number of parameters? */ if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 && - Req->argc != 5 && Req->argc != 6) + Req->argc != 5 && Req->argc != 6) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } /* Invalid port number? */ - if ((Req->argc > 1) && atoi(Req->argv[1]) < 1) + if ((Req->argc > 1) && atoi(Req->argv[1]) < 1) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } if (Client_Type(Client) != CLIENT_SERVER && !Client_HasMode(Client, 'o')) @@ -391,9 +395,11 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req) assert(Req != NULL); /* Bad number of parameters? */ - if (Req->argc != 1 && Req->argc != 3) + if (Req->argc != 1 && Req->argc != 3) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } from = Op_Check(Client, Req); if (!from) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 80bb6a6..030c3cd 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -72,10 +72,12 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) LogDebug("Connection %d: got SERVER command (new server link) ...", Client_Conn(Client)); - if (Req->argc != 2 && Req->argc != 3) + if (Req->argc != 2 && Req->argc != 3) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } /* Get configuration index of new remote server ... */ for (i = 0; i < MAX_SERVERS; i++) @@ -183,9 +185,11 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) { /* New server is being introduced to the network */ - if (Req->argc != 4) + if (Req->argc != 4) { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } /* check for existing server with same ID */ if (!Client_CheckID(Client, Req->argv[0])) @@ -231,9 +235,11 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Client_MyToken(c), Client_Info(c)); return CONNECTED; - } else + } else { + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + } } /* IRC_SERVER */ /* diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 7dafaf0..d41439e 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -510,6 +510,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) if (Req->argc > 2) { if (!SendErrors) return CONNECTED; + IRC_SetPenalty(Client, 2); return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); }

1 0

Federico G. Schwindt : Rework check for number of parameters
by alex＠arthur.barton.de 07 Sep '13

07 Sep '13

Module: ngircd.git Branch: master Commit: 08f9d31d60220e8a389a2d24f42625be7749f090 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=08f9d31d… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Sep 5 17:01:49 2013 +0100 Rework check for number of parameters Move most of the checks that return numeric 461 into Handle_Request(). --- src/ngircd/irc-cap.c | 2 - src/ngircd/irc-channel.c | 4 -- src/ngircd/irc-encoding.c | 4 -- src/ngircd/irc-info.c | 17 ------ src/ngircd/irc-login.c | 8 --- src/ngircd/irc-metadata.c | 4 -- src/ngircd/irc-mode.c | 3 -- src/ngircd/irc-op.c | 2 - src/ngircd/irc-oper.c | 22 -------- src/ngircd/irc-server.c | 4 -- src/ngircd/irc.c | 4 -- src/ngircd/parse.c | 131 ++++++++++++++++++++++++--------------------- src/ngircd/parse.h | 2 + 13 files changed, 73 insertions(+), 134 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=08f9…

1 0

Federico G. Schwindt : Reorder checks
by alex＠arthur.barton.de 07 Sep '13

07 Sep '13

Module: ngircd.git Branch: master Commit: 37609d6a4f036b175fdc304d0ee466bd8ad57bf9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=37609d6a… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Sep 5 13:45:14 2013 +0100 Reorder checks Move oper and Conf_MorePrivacy checks after checking the number of parameters. --- src/ngircd/irc-info.c | 8 ++++---- src/ngircd/irc-oper.c | 38 +++++++++++++++++++------------------- src/ngircd/irc-server.c | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index ea0ed4e..9b7dfda 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1317,10 +1317,6 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Do not reveal any info on disconnected users? */ - if (Conf_MorePrivacy) - return CONNECTED; - /* Wrong number of parameters? */ if (Req->argc < 1) return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG, @@ -1330,6 +1326,10 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client) _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 2, prefix) + /* Do not reveal any info on disconnected users? */ + if (Conf_MorePrivacy) + return CONNECTED; + /* Forward? */ if (target != Client_ThisServer()) { IRC_WriteStrClientPrefix(target, prefix, "WHOWAS %s %s %s", diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 9907371..dd408a6 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -119,15 +119,15 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Op_Check(Client, Req)) - return Op_NoPrivileges(Client, Req); - #ifdef STRICT_RFC _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0) #else _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1) #endif + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); + /* Is a message given? */ if (Req->argc > 0) { c = Conn_First(); @@ -162,11 +162,11 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0) + if (!Op_Check(Client, Req)) return Op_NoPrivileges(Client, Req); - _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 0) - Log(LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask(Client)); IRC_WriteStrClient(Client, RPL_REHASHING_MSG, Client_ID(Client)); @@ -191,14 +191,14 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if (!Op_Check(Client, Req)) - return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ if (Req->argc != 0) return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); + Log(LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", Client_Mask(Client)); NGIRCd_SignalRestart = true; @@ -221,10 +221,6 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (Client_Type(Client) != CLIENT_SERVER - && !Client_HasMode(Client, 'o')) - return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 && Req->argc != 5 && Req->argc != 6) @@ -236,6 +232,10 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (Client_Type(Client) != CLIENT_SERVER + && !Client_HasMode(Client, 'o')) + return Op_NoPrivileges(Client, Req); + from = Client; target = Client_ThisServer(); @@ -325,14 +325,14 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (!Op_Check(Client, Req)) - return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ if (Req->argc != 1) return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (!Op_Check(Client, Req)) + return Op_NoPrivileges(Client, Req); + IRC_SendWallops(Client_ThisServer(), Client_ThisServer(), "Received DISCONNECT %s from %s", Req->argv[0], Client_ID(Client)); @@ -412,15 +412,15 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL); - from = Op_Check(Client, Req); - if (!from) - return Op_NoPrivileges(Client, Req); - /* Bad number of parameters? */ if (Req->argc != 1 && Req->argc != 3) return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + from = Op_Check(Client, Req); + if (!from) + return Op_NoPrivileges(Client, Req); + switch(Req->command[0]) { case 'g': case 'G': diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index d1df18a..107c44a 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -341,12 +341,12 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) + if (Client_Type(Client) != CLIENT_SERVER && !Client_HasMode(Client, 'o')) return Op_NoPrivileges(Client, Req); - _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) - if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) { from = Client_Search(Req->prefix); if (Client_Type(from) != CLIENT_SERVER

1 0

Federico G. Schwindt : Move the IRC_SetPenalty() call after the asserts
by alex＠arthur.barton.de 07 Sep '13

07 Sep '13

Module: ngircd.git Branch: master Commit: 33c2d5e4e255f314d5d7136d8edeb662128bd79a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=33c2d5e4… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Sep 5 13:07:19 2013 +0100 Move the IRC_SetPenalty() call after the asserts --- src/ngircd/irc-info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 6013fa0..ea0ed4e 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -718,11 +718,11 @@ IRC_SERVLIST(CLIENT *Client, REQUEST *Req) { CLIENT *c; - IRC_SetPenalty(Client, 1); - assert(Client != NULL); assert(Req != NULL); + IRC_SetPenalty(Client, 1); + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) if (Req->argc < 2 || strcmp(Req->argv[1], "0") == 0) {

1 0

Federico G. Schwindt : Correct numeric returned by whois
by alex＠arthur.barton.de 07 Sep '13

07 Sep '13

Module: ngircd.git Branch: master Commit: a98bbc8e0b937f4fedf7ad852eaf109c6a9c5b8f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a98bbc8e… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Sep 5 10:46:13 2013 +0100 Correct numeric returned by whois As per RFC whois should return 431 if no nick is provided. While here convert upper check to use irc-macros. As a bonus we get to set the penalty for free. --- src/ngircd/irc-info.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 3d77237..6013fa0 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1211,11 +1211,12 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) IRC_SetPenalty(Client, 1); - /* Bad number of parameters? */ - if (Req->argc < 1 || Req->argc > 2) - return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + /* Wrong number of parameters? */ + if (Req->argc < 1) + return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG, + Client_ID(Client)); + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) /* Get target server for this command */

1 0

Federico G. Schwindt : Minor cosmetic change
by alex＠arthur.barton.de 07 Sep '13

07 Sep '13

Module: ngircd.git Branch: master Commit: 9f74c0ff075dc67e068b8c2da0c069b6c622e436 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9f74c0ff… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Sep 5 10:40:39 2013 +0100 Minor cosmetic change Add a define to indicate any client. While I'm here use hex values instead of decimal, it's somewhat clearer that they could be OR'ed together. --- src/ngircd/client.h | 23 ++++++++++++----------- src/ngircd/parse.c | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/ngircd/client.h b/src/ngircd/client.h index c104a75..e5c48b7 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -17,19 +17,20 @@ * Client management (header) */ -#define CLIENT_UNKNOWN 1 /* connection of unknown type */ -#define CLIENT_GOTPASS 2 /* client did send PASS */ -#define CLIENT_GOTNICK 4 /* client did send NICK */ -#define CLIENT_GOTUSER 8 /* client did send USER */ -#define CLIENT_USER 16 /* client is an IRC user */ -#define CLIENT_SERVER 32 /* client is a server */ -#define CLIENT_SERVICE 64 /* client is a service */ -#define CLIENT_UNKNOWNSERVER 128 /* unregistered server connection */ -#define CLIENT_GOTPASS_2813 256 /* client did send PASS, RFC 2813 style */ +#define CLIENT_UNKNOWN 0x0001 /* connection of unknown type */ +#define CLIENT_GOTPASS 0x0002 /* client did send PASS */ +#define CLIENT_GOTNICK 0x0004 /* client did send NICK */ +#define CLIENT_GOTUSER 0x0008 /* client did send USER */ +#define CLIENT_USER 0x0010 /* client is an IRC user */ +#define CLIENT_SERVER 0x0020 /* client is a server */ +#define CLIENT_SERVICE 0x0040 /* client is a service */ +#define CLIENT_UNKNOWNSERVER 0x0080 /* unregistered server connection */ +#define CLIENT_GOTPASS_2813 0x0100 /* client did send PASS, RFC 2813 style */ #ifndef STRICT_RFC -# define CLIENT_WAITAUTHPING 512 /* waiting for AUTH PONG from client */ +# define CLIENT_WAITAUTHPING 0x0200 /* waiting for AUTH PONG from client */ #endif -#define CLIENT_WAITCAPEND 1024 /* waiting for "CAP END" command */ +#define CLIENT_WAITCAPEND 0x0400 /* waiting for "CAP END" command */ +#define CLIENT_ANY 0xFFFF #define CLIENT_TYPE int diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index e5eaa6e..68aa945 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -62,11 +62,11 @@ static COMMAND My_Commands[] = { { "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "AWAY", IRC_AWAY, CLIENT_USER, 0, 0, 0 }, - { "CAP", IRC_CAP, 0xFFFF, 0, 0, 0 }, + { "CAP", IRC_CAP, CLIENT_ANY, 0, 0, 0 }, { "CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0 }, { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 0, 0, 0 }, - { "ERROR", IRC_ERROR, 0xFFFF, 0, 0, 0 }, + { "ERROR", IRC_ERROR, CLIENT_ANY, 0, 0, 0 }, { "GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "HELP", IRC_HELP, CLIENT_USER, 0, 0, 0 }, { "INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, @@ -83,20 +83,20 @@ static COMMAND My_Commands[] = { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "NICK", IRC_NICK, 0xFFFF, 0, 0, 0 }, + { "NICK", IRC_NICK, CLIENT_ANY, 0, 0, 0 }, { "NJOIN", IRC_NJOIN, CLIENT_SERVER, 0, 0, 0 }, - { "NOTICE", IRC_NOTICE, 0xFFFF, 0, 0, 0 }, + { "NOTICE", IRC_NOTICE, CLIENT_ANY, 0, 0, 0 }, { "OPER", IRC_OPER, CLIENT_USER, 0, 0, 0 }, { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "PASS", IRC_PASS, 0xFFFF, 0, 0, 0 }, + { "PASS", IRC_PASS, CLIENT_ANY, 0, 0, 0 }, { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "PONG", IRC_PONG, 0xFFFF, 0, 0, 0 }, + { "PONG", IRC_PONG, CLIENT_ANY, 0, 0, 0 }, { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 }, + { "QUIT", IRC_QUIT, CLIENT_ANY, 0, 0, 0 }, { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 }, { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 }, - { "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 }, - { "SERVICE", IRC_SERVICE, 0xFFFF, 0, 0, 0 }, + { "SERVER", IRC_SERVER, CLIENT_ANY, 0, 0, 0 }, + { "SERVICE", IRC_SERVICE, CLIENT_ANY, 0, 0, 0 }, { "SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 0, 0 }, { "SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, @@ -106,7 +106,7 @@ static COMMAND My_Commands[] = { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "USER", IRC_USER, 0xFFFF, 0, 0, 0 }, + { "USER", IRC_USER, CLIENT_ANY, 0, 0, 0 }, { "USERHOST", IRC_USERHOST, CLIENT_USER, 0, 0, 0 }, { "USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0

Alexander Barton : Commands.txt: Document proprietary DIE <message> parameter
by alex＠arthur.barton.de 05 Sep '13

05 Sep '13

Module: ngircd.git Branch: master Commit: e5cdd61fe3d78fa976836192dbca64874160a493 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e5cdd61f… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 5 00:18:49 2013 +0200 Commands.txt: Document proprietary DIE <message> parameter --- doc/Commands.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index e049f5e..dde1498 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -668,10 +668,13 @@ Administrative Commands - RFC 2812, 3.4.7 "Connect message" - DIE - DIE + DIE [<message>] . Instructs the server to shut down. . + The optional (and non-standard) <message> text is sent to each client + connected to this server before all connections are closed. + . To use this command, the user must be an IRC Operator. References:

1 0

Alexander Barton : getpid.sh: use /bin/pidof when available
by alex＠arthur.barton.de 03 Sep '13

03 Sep '13

Module: ngircd.git Branch: master Commit: e3a2a6c44d30a68f3afeab17ba19a5559e09f3a5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e3a2a6c4… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 3 21:33:22 2013 +0200 getpid.sh: use /bin/pidof when available --- src/testsuite/getpid.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh index 96ab474..f200afb 100755 --- a/src/testsuite/getpid.sh +++ b/src/testsuite/getpid.sh @@ -1,10 +1,11 @@ #!/bin/sh # ngIRCd Test Suite -# $Id: getpid.sh,v 1.5 2006/08/05 00:15:28 alex Exp $ # did we get a name? [ $# -ne 1 ] && exit 1 +[ -x /bin/pidof ] && exec /bin/pidof -s $@ + # detect flags for "ps" and "head" UNAME=`uname` if [ $UNAME = "FreeBSD" ]; then

1 0

Alexander Barton : Don't enforce channel types for other servers
by alex＠arthur.barton.de 03 Sep '13

03 Sep '13

Module: ngircd.git Branch: master Commit: aad92ceafe8b4b0091867415504f83930a74428b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=aad92cea… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 3 17:13:46 2013 +0200 Don't enforce channel types for other servers The configuration option "AllowedChannelTypes" must only be enforced for regular clients and not for remote servers. Channels created by other servres are always allowed, because they already exist and the daemon must stay in sync with the network. --- src/ngircd/irc-channel.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 78332ea..4bd5a9d 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -341,12 +341,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } chan = Channel_Search(channame); - if (!chan && !strchr(Conf_AllowedChannelTypes, channame[0])) { - /* channel must be created, but forbidden by config */ - IRC_WriteErrClient(Client, ERR_NOSUCHCHANNEL_MSG, - Client_ID(Client), channame); - goto join_next; - } /* Local client? */ if (Client_Type(Client) == CLIENT_USER) { @@ -354,6 +348,15 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* Already existing channel: already member? */ if (Channel_IsMemberOf(chan, Client)) goto join_next; + } else { + /* Channel must be created */ + if (!strchr(Conf_AllowedChannelTypes, channame[0])) { + /* ... but channel type is not allowed! */ + IRC_WriteErrClient(Client, + ERR_NOSUCHCHANNEL_MSG, + Client_ID(Client), channame); + goto join_next; + } } /* Test if the user has reached the channel limit */

1 0