Dezember 2011 - ngIRCd GIT Updates

Alexander Barton : Op_Check(): always accept commands from a remote server itself
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 32bfafafd9e90f9e224bf95e4f2512cea729aac1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=32bfafaf… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:11:43 2011 +0100 Op_Check(): always accept commands from a remote server itself --- src/ngircd/op.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/ngircd/op.c b/src/ngircd/op.c index c93133c..588513d 100644 --- a/src/ngircd/op.c +++ b/src/ngircd/op.c @@ -81,6 +81,9 @@ Op_Check(CLIENT * Client, REQUEST * Req) if (!c) return NULL; + if (Client_Type(Client) == CLIENT_SERVER + && Client_Type(c) == CLIENT_SERVER) + return c; if (!Client_HasMode(c, 'o')) return NULL; if (!Client_OperByMe(c) && !Conf_AllowRemoteOper)

1 0

Alexander Barton : Class_GetList() now retuns a pointer to list_head structure
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 6ef20e0f9a6c6f82fbb82b6c60f98b8e8b401b8d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6ef20e0f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:11:07 2011 +0100 Class_GetList() now retuns a pointer to list_head structure --- src/ngircd/class.c | 4 ++-- src/ngircd/class.h | 2 +- src/ngircd/irc-info.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index 1a4d4c0..b7a5cbc 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -75,12 +75,12 @@ Class_DeleteMask(const int Class, const char *Mask) Lists_Del(&My_Classes[Class], Mask); } -GLOBAL struct list_head +GLOBAL struct list_head * Class_GetList(const int Class) { assert(Class < CLASS_COUNT); - return My_Classes[Class]; + return &My_Classes[Class]; } GLOBAL void diff --git a/src/ngircd/class.h b/src/ngircd/class.h index 3507836..8c06c2e 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -31,7 +31,7 @@ GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask)); GLOBAL bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); -GLOBAL struct list_head Class_GetList PARAMS((const int Class)); +GLOBAL struct list_head *Class_GetList PARAMS((const int Class)); GLOBAL void Class_Expire PARAMS((void)); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 736412f..1d91609 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -480,7 +480,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) COMMAND *cmd; time_t time_now; unsigned int days, hrs, mins; - struct list_head list; + struct list_head *list; struct list_elem *list_item; assert(Client != NULL); @@ -531,7 +531,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) list = Class_GetList(CLASS_GLINE); else list = Class_GetList(CLASS_KLINE); - list_item = Lists_GetFirst(&list); + list_item = Lists_GetFirst(list); while (list_item) { if (!IRC_WriteStrClient(from, RPL_STATSXLINE_MSG, Client_ID(from), query,

1 0

Alexander Barton : Check G-Line and K-Line lists after authenticating clients
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: e86e193e010b44bc567c0fb2dfbebd81b9735358 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e86e193e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 18:03:35 2011 +0100 Check G-Line and K-Line lists after authenticating clients --- src/ngircd/irc-login.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index eeecf96..140d68e 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -937,12 +937,6 @@ Hello_User(CLIENT * Client) } #endif - if (Class_IsMember(CLASS_GLINE, Client) || - Class_IsMember(CLASS_KLINE, Client)) { - Reject_Client(Client); - return DISCONNECTED; - } - #ifdef PAM if (!Conf_PAM) { /* Don't do any PAM authentication at all, instead emulate @@ -1068,6 +1062,12 @@ Reject_Client(CLIENT *Client) static bool Hello_User_PostAuth(CLIENT *Client) { + if (Class_IsMember(CLASS_GLINE, Client) || + Class_IsMember(CLASS_KLINE, Client)) { + Reject_Client(Client); + return DISCONNECTED; + } + Introduce_Client(NULL, Client, CLIENT_USER); if (!IRC_WriteStrClient

1 0

Alexander Barton : New functions Lists_Expire() and Class_Expire()
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: ae5ebfb9f0dc1b628a5eebbb39615b3483fe05db URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ae5ebfb9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 17:44:20 2011 +0100 New functions Lists_Expire() and Class_Expire() GLINE and KLINE lists are cleared automatically now, not when they are checked. So "STATS g" and "STATS k" no longer show expired entries :-) --- src/ngircd/class.c | 7 +++++++ src/ngircd/class.h | 2 ++ src/ngircd/conn.c | 4 ++++ src/ngircd/lists.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- src/ngircd/lists.h | 2 ++ 5 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index dd10ac8..1a4d4c0 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -83,4 +83,11 @@ Class_GetList(const int Class) return My_Classes[Class]; } +GLOBAL void +Class_Expire(void) +{ + Lists_Expire(&My_Classes[CLASS_GLINE], "G-Line"); + Lists_Expire(&My_Classes[CLASS_KLINE], "K-Line"); +} + /* -eof- */ diff --git a/src/ngircd/class.h b/src/ngircd/class.h index b93c3b6..3507836 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -33,6 +33,8 @@ GLOBAL bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); GLOBAL struct list_head Class_GetList PARAMS((const int Class)); +GLOBAL void Class_Expire PARAMS((void)); + #endif /* __class_h__ */ /* -eof- */ diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index aa754eb..4d5c223 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -65,6 +65,7 @@ #include "ngircd.h" #include "array.h" #include "client.h" +#include "class.h" #include "conf.h" #include "conn-ssl.h" #include "conn-zip.h" @@ -742,6 +743,9 @@ Conn_Handler(void) Check_Servers(); Check_Connections(); + /* Expire outdated class/list items */ + Class_Expire(); + /* Look for non-empty read buffers ... */ for (i = 0; i < Pool_Size; i++) { if ((My_Connections[i].sock > NONE) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 8e120bf..63c16b0 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -316,22 +316,16 @@ bool Lists_Check( struct list_head *h, CLIENT *Client) { struct list_elem *e, *last, *next; + time_t now; assert(h != NULL); e = h->first; last = NULL; + now = time(NULL); while (e) { next = e->next; - if (e->valid_until > 1 && e->valid_until < time(NULL)) { - /* Entry is expired, delete it */ - LogDebug("Deleted \"%s\" from list (expired).", - e->mask); - Lists_Unlink(h, last, e); - e = next; - continue; - } if (Match(e->mask, Client_Mask(Client))) { if (e->valid_until == 1) { /* Entry is valid only once, delete it */ @@ -348,4 +342,42 @@ Lists_Check( struct list_head *h, CLIENT *Client) return false; } +/** + * Check list and purge expired entries. + * + * @param h List head. + */ +GLOBAL void +Lists_Expire(struct list_head *h, const char *ListName) +{ + struct list_elem *e, *last, *next; + time_t now; + + assert(h != NULL); + + e = h->first; + last = NULL; + now = time(NULL); + + while (e) { + next = e->next; + if (e->valid_until > 1 && e->valid_until < now) { + /* Entry is expired, delete it */ + if (e->reason) + Log(LOG_INFO, + "Deleted \"%s\" (\"%s\") from %s list (expired).", + e->mask, e->reason, ListName); + else + Log(LOG_INFO, + "Deleted \"%s\" from %s list (expired).", + e->mask, ListName); + Lists_Unlink(h, last, e); + e = next; + continue; + } + last = e; + e = next; + } +} + /* -eof- */ diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index 316b134..f9a4c91 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -47,6 +47,8 @@ GLOBAL const char *Lists_GetMask PARAMS((const struct list_elem *e)); GLOBAL const char *Lists_GetReason PARAMS((const struct list_elem *e)); GLOBAL time_t Lists_GetValidity PARAMS((const struct list_elem *e)); +GLOBAL void Lists_Expire PARAMS((struct list_head *h, const char *ListName)); + #endif /* -eof- */

1 0

Alexander Barton : Implement IRC_xLINE(): handler for "GLINE" and "KLINE" commands
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: e9e6224aaeac6aab825caa12172bc207a00a86f9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e9e6224a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 16:57:36 2011 +0100 Implement IRC_xLINE(): handler for "GLINE" and "KLINE" commands --- src/ngircd/irc-oper.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ src/ngircd/irc-oper.h | 4 ++- src/ngircd/parse.c | 2 + 3 files changed, 76 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 6945fbb..1b269e3 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -27,6 +27,7 @@ #include "conn-func.h" #include "conf.h" #include "channel.h" +#include "class.h" #include "irc-write.h" #include "log.h" #include "match.h" @@ -414,5 +415,75 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) return CONNECTED; } /* IRC_WALLOPS */ +/** + * Handle <?>LINE commands (GLINE, KLINE). + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ +GLOBAL bool +IRC_xLINE(CLIENT *Client, REQUEST *Req) +{ + CLIENT *from; + int class; + char class_c; + + 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_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + switch(Req->command[0]) { + case 'g': + case 'G': + class = CLASS_GLINE; class_c = 'G'; + break; + case 'k': + case 'K': + class = CLASS_KLINE; class_c = 'K'; + break; + } + + if (Req->argc == 1) { + /* Delete mask from list */ + Class_DeleteMask(class, Req->argv[0]); + Log(LOG_NOTICE|LOG_snotice, + "\"%s\" deleted \"%s\" from %c-Line list.", + Client_Mask(from), Req->argv[0], class_c); + if (class == CLASS_GLINE) { + /* Inform other servers */ + IRC_WriteStrServersPrefix(Client, from, "%s %s", + Req->command, Req->argv[0]); + + } + } else { + /* Add new mask to list */ + if (Class_AddMask(class, Req->argv[0], + time(NULL) + atol(Req->argv[1]), + Req->argv[2])) { + Log(LOG_NOTICE|LOG_snotice, + "\"%s\" added \"%s\" to %c-Line list: \"%s\" (%ld seconds).", + Client_Mask(from), Req->argv[0], class_c, + Req->argv[2], atol(Req->argv[1])); + if (class == CLASS_GLINE) { + /* Inform other servers */ + IRC_WriteStrServersPrefix(Client, from, + "%s %s %s :%s", Req->command, + Req->argv[0], Req->argv[1], + Req->argv[2]); + } + } + } + + return CONNECTED; +} /* -eof- */ diff --git a/src/ngircd/irc-oper.h b/src/ngircd/irc-oper.h index 7d67a0b..bd68d4f 100644 --- a/src/ngircd/irc-oper.h +++ b/src/ngircd/irc-oper.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 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 @@ -25,6 +25,8 @@ GLOBAL bool IRC_CONNECT PARAMS((CLIENT *Client, REQUEST *Req )); GLOBAL bool IRC_DISCONNECT PARAMS((CLIENT *Client, REQUEST *Req )); GLOBAL bool IRC_WALLOPS PARAMS(( CLIENT *Client, REQUEST *Req )); +GLOBAL bool IRC_xLINE PARAMS((CLIENT *Client, REQUEST *Req)); + #endif /* -eof- */ diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index be3c864..02ab893 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -63,6 +63,7 @@ static COMMAND My_Commands[] = { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0 }, { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 0, 0, 0 }, { "ERROR", IRC_ERROR, 0xFFFF, 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 }, { "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, @@ -70,6 +71,7 @@ static COMMAND My_Commands[] = { "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "KLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },

1 0

Alexander Barton : Op_Check(): return client that initiated the request or NULL
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: e23f025dd6006eec2fe854ca0eaa623f0feb18ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e23f025d… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 16:52:31 2011 +0100 Op_Check(): return client that initiated the request or NULL The old behavior of returning true/false is compatible to this change, so there are no other code changes required. --- src/ngircd/op.c | 20 ++++++++++++++------ src/ngircd/op.h | 4 ++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ngircd/op.c b/src/ngircd/op.c index 7c0737f..c93133c 100644 --- a/src/ngircd/op.c +++ b/src/ngircd/op.c @@ -58,9 +58,15 @@ Op_NoPrivileges(CLIENT * Client, REQUEST * Req) /** - * Check that the client is an IRC operator allowed to administer this server. + * Check that the originator of a request is an IRC operator and allowed + * to administer this server. + * + * @param CLient Client from which the command has been received. + * @param Req Request structure. + * @return CLIENT structure of the client that initiated the command or + * NULL if client is not allowed to execute operator commands. */ -GLOBAL bool +GLOBAL CLIENT * Op_Check(CLIENT * Client, REQUEST * Req) { CLIENT *c; @@ -72,15 +78,17 @@ Op_Check(CLIENT * Client, REQUEST * Req) c = Client_Search(Req->prefix); else c = Client; + if (!c) - return false; + return NULL; if (!Client_HasMode(c, 'o')) - return false; + return NULL; if (!Client_OperByMe(c) && !Conf_AllowRemoteOper) - return false; + return NULL; + /* The client is an local IRC operator, or this server is configured * to trust remote operators. */ - return true; + return c; } /* Op_Check */ diff --git a/src/ngircd/op.h b/src/ngircd/op.h index a1a84a3..71748eb 100644 --- a/src/ngircd/op.h +++ b/src/ngircd/op.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2009 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 @@ -18,7 +18,7 @@ */ GLOBAL bool Op_NoPrivileges PARAMS((CLIENT * Client, REQUEST * Req)); -GLOBAL bool Op_Check PARAMS((CLIENT * Client, REQUEST * Req)); +GLOBAL CLIENT *Op_Check PARAMS((CLIENT * Client, REQUEST * Req)); #endif

1 0

Alexander Barton : irc-oper.c: code cleanup; more documentation
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 3ca87033099f4bcf3f51a8ee53abeee218e4505b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3ca87033… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 16:08:00 2011 +0100 irc-oper.c: code cleanup; more documentation --- src/ngircd/irc-oper.c | 121 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 94 insertions(+), 27 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index e8b8d26..6945fbb 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 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 @@ -37,7 +37,6 @@ #include <exp.h> #include "irc-oper.h" - /** * Handle invalid received OPER command. * Log OPER attempt and send error message to client. @@ -52,7 +51,15 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) Client_ID(Client)); } /* Bad_OperPass */ - +/** + * Handler for the IRC "OPER" command. + * + * See RFC 2812, 3.1.4 "Oper message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_OPER( CLIENT *Client, REQUEST *Req ) { @@ -62,7 +69,9 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc != 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); len = array_length(&Conf_Opers, sizeof(*op)); op = array_start(&Conf_Opers); @@ -77,20 +86,33 @@ IRC_OPER( CLIENT *Client, REQUEST *Req ) if (op[i].mask && (!Match(op[i].mask, Client_Mask(Client)))) return Bad_OperPass(Client, op[i].mask, "hostmask check failed"); - if( ! Client_HasMode( Client, 'o' )) - { - Client_ModeAdd( Client, 'o' ); - if( ! IRC_WriteStrClient( Client, "MODE %s :+o", Client_ID( Client ))) return DISCONNECTED; - IRC_WriteStrServersPrefix( NULL, Client, "MODE %s :+o", Client_ID( Client )); + if (!Client_HasMode(Client, 'o')) { + Client_ModeAdd(Client, 'o'); + if (!IRC_WriteStrClient(Client, "MODE %s :+o", + Client_ID(Client))) + return DISCONNECTED; + IRC_WriteStrServersPrefix(NULL, Client, "MODE %s :+o", + Client_ID(Client)); } - if( ! Client_OperByMe( Client )) Log( LOG_NOTICE|LOG_snotice, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client )); + if (!Client_OperByMe(Client)) + Log(LOG_NOTICE|LOG_snotice, + "Got valid OPER from \"%s\", user is an IRC operator now.", + Client_Mask(Client)); - Client_SetOperByMe( Client, true); - return IRC_WriteStrClient( Client, RPL_YOUREOPER_MSG, Client_ID( Client )); + Client_SetOperByMe(Client, true); + return IRC_WriteStrClient(Client, RPL_YOUREOPER_MSG, Client_ID(Client)); } /* IRC_OPER */ - +/** + * Handler for the IRC "DIE" command. + * + * See RFC 2812, 4.3 "Die message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_DIE(CLIENT * Client, REQUEST * Req) { @@ -133,7 +155,15 @@ IRC_DIE(CLIENT * Client, REQUEST * Req) return CONNECTED; } /* IRC_DIE */ - +/** + * Handler for the IRC "REHASH" command. + * + * See RFC 2812, 4.2 "Rehash message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_REHASH( CLIENT *Client, REQUEST *Req ) { @@ -146,15 +176,26 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req ) return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ - if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc != 0) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command ); - Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client )); + Log(LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", + Client_Mask(Client)); raise(SIGHUP); return CONNECTED; } /* IRC_REHASH */ - +/** + * Handler for the IRC "RESTART" command. + * + * See RFC 2812, 4.4 "Restart message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_RESTART( CLIENT *Client, REQUEST *Req ) { @@ -167,16 +208,25 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req ) return Op_NoPrivileges(Client, Req); /* Bad number of parameters? */ - if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc != 0) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - Log( LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", Client_Mask( Client )); + Log(LOG_NOTICE|LOG_snotice, "Got RESTART command from \"%s\" ...", + Client_Mask(Client)); NGIRCd_SignalRestart = true; + return CONNECTED; } /* IRC_RESTART */ - /** - * Connect configured or new server. + * Handler for the IRC "CONNECT" command. + * + * See RFC 2812, 3.4.7 "Connect message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_CONNECT(CLIENT * Client, REQUEST * Req) @@ -272,9 +322,15 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req) return CONNECTED; } /* IRC_CONNECT */ - /** - * Disconnect (and disable) configured server. + * Handler for the IRC "DISCONNECT" command. + * + * This command is not specified in the IRC RFCs, it is an extension + * of ngIRCd: it shuts down and disables a configured server connection. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) @@ -315,7 +371,15 @@ IRC_DISCONNECT(CLIENT * Client, REQUEST * Req) return DISCONNECTED; } /* IRC_DISCONNECT */ - +/** + * Handler for the IRC "WALLOPS" command. + * + * See RFC 2812, 4.7 "Operwall message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) { @@ -325,12 +389,14 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); if (Req->argc != 1) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); switch (Client_Type(Client)) { case CLIENT_USER: if (!Client_OperByMe(Client)) - return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, Client_ID(Client)); + return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, + Client_ID(Client)); from = Client; break; case CLIENT_SERVER: @@ -341,7 +407,8 @@ IRC_WALLOPS( CLIENT *Client, REQUEST *Req ) } if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); IRC_SendWallops(Client, from, "%s", Req->argv[0]); return CONNECTED;

1 0

Alexander Barton : Implement IRC "STATS g" and "STATS k" command
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: fc82efc3e8931e1670972e594140e03671370c1f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fc82efc3… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:50:19 2011 +0100 Implement IRC "STATS g" and "STATS k" command --- src/ngircd/irc-info.c | 26 ++++++++++++++++++++++++++ src/ngircd/messages.h | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 301da53..736412f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -28,8 +28,10 @@ #include "conn-func.h" #include "conn-zip.h" #include "channel.h" +#include "class.h" #include "conf.h" #include "defines.h" +#include "lists.h" #include "log.h" #include "messages.h" #include "match.h" @@ -478,6 +480,8 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) COMMAND *cmd; time_t time_now; unsigned int days, hrs, mins; + struct list_head list; + struct list_elem *list_item; assert(Client != NULL); assert(Req != NULL); @@ -516,6 +520,28 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) query = '*'; switch (query) { + case 'g': /* Network-wide bans ("G-Lines") */ + case 'G': + case 'k': /* Server-local bans ("K-Lines") */ + case 'K': + if (!Client_HasMode(from, 'o')) + return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG, + Client_ID(from)); + if (query == 'g' || query == 'G') + list = Class_GetList(CLASS_GLINE); + else + list = Class_GetList(CLASS_KLINE); + list_item = Lists_GetFirst(&list); + while (list_item) { + if (!IRC_WriteStrClient(from, RPL_STATSXLINE_MSG, + Client_ID(from), query, + Lists_GetMask(list_item), + Lists_GetValidity(list_item), + Lists_GetReason(list_item))) + return DISCONNECTED; + list_item = Lists_GetNext(list_item); + } + break; case 'l': /* Link status (servers and own link) */ case 'L': time_now = time(NULL); diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 78ac068..7bf7367 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -29,6 +29,7 @@ #define RPL_TRACESERVER_MSG "206 %s Serv 1 0S 0C %s[%s@%s] *!*@%s :V%s" #define RPL_STATSLINKINFO_MSG "211 %s %s %d %ld %ld %ld %ld :%ld" #define RPL_STATSCOMMANDS_MSG "212 %s %s %ld %ld %ld" +#define RPL_STATSXLINE_MSG "216 %s %c %s %ld :%s" #define RPL_ENDOFSTATS_MSG "219 %s %c :End of STATS report" #define RPL_UMODEIS_MSG "221 %s +%s" #define RPL_SERVLIST_MSG "234 %s %s %s %s %d %d :%s"

1 0

Alexander Barton : New function Class_GetList()
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: dc9fcb0fb2716757ef336e60febeb58f59325388 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dc9fcb0f… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:49:52 2011 +0100 New function Class_GetList() --- src/ngircd/class.c | 8 ++++++++ src/ngircd/class.h | 2 ++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/ngircd/class.c b/src/ngircd/class.c index aeecaae..dd10ac8 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -75,4 +75,12 @@ Class_DeleteMask(const int Class, const char *Mask) Lists_Del(&My_Classes[Class], Mask); } +GLOBAL struct list_head +Class_GetList(const int Class) +{ + assert(Class < CLASS_COUNT); + + return My_Classes[Class]; +} + /* -eof- */ diff --git a/src/ngircd/class.h b/src/ngircd/class.h index deb60f4..b93c3b6 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -31,6 +31,8 @@ GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask)); GLOBAL bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); +GLOBAL struct list_head Class_GetList PARAMS((const int Class)); + #endif /* __class_h__ */ /* -eof- */

1 0

Alexander Barton : lists.{c|h}: code cleanup; more documentation
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 2b95c69ea19c6711bb98ee048ee71cee94c5dde9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2b95c69e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:48:13 2011 +0100 lists.{c|h}: code cleanup; more documentation --- src/ngircd/lists.c | 189 +++++++++++++++++++++++++++++++++++----------------- src/ngircd/lists.h | 14 ++-- 2 files changed, 135 insertions(+), 68 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=2b95…

1 0