ircd/s_user.c
add showing of welcome messages on connect
-diff -r ed0f71fe7e22 include/handlers.h
---- a/include/handlers.h Wed Jan 28 14:01:58 2009 +0100
-+++ b/include/handlers.h Wed Jan 28 15:15:51 2009 +0100
-@@ -151,6 +151,7 @@
+include/client.h
+ircd/client.c
+ircd/ircd_lexer.l
+ircd/ircd_parser.y
+add PRIV_LOCAL_WELCOME PRIV_WELCOME
+
+diff -r 47d03ce52e8e include/client.h
+--- a/include/client.h Tue Mar 23 20:10:46 2010 +0100
++++ b/include/client.h Tue Mar 23 20:11:20 2010 +0100
+@@ -142,6 +142,8 @@
+ PRIV_USER_PRIVACY, /* oper can bypass user privacy +x etc gives i.e. see real ip's */
+ PRIV_CHANNEL_PRIVACY, /* oper can bypass channel privacy i.e. can see modes on channels they are not on and channel keys */
+ PRIV_SERVERINFO, /* oper can use /get, /stats, /hash, retrieve remote information */
++ PRIV_WELCOME, /* oper can WELCOME */
++ PRIV_LOCAL_WELCOME, /* oper can local WELCOME */
+ PRIV_LAST_PRIV /**< number of privileges */
+ };
+
+diff -r 47d03ce52e8e include/handlers.h
+--- a/include/handlers.h Tue Mar 23 20:10:46 2010 +0100
++++ b/include/handlers.h Tue Mar 23 20:11:20 2010 +0100
+@@ -138,6 +138,7 @@
extern int m_version(struct Client*, struct Client*, int, char*[]);
extern int m_wallchops(struct Client*, struct Client*, int, char*[]);
extern int m_wallvoices(struct Client*, struct Client*, int, char*[]);
extern int m_who(struct Client*, struct Client*, int, char*[]);
extern int m_whois(struct Client*, struct Client*, int, char*[]);
extern int m_whowas(struct Client*, struct Client*, int, char*[]);
-@@ -185,6 +186,7 @@
+@@ -172,6 +173,7 @@
extern int mo_version(struct Client*, struct Client*, int, char*[]);
extern int mo_wallops(struct Client*, struct Client*, int, char*[]);
extern int mo_wallusers(struct Client*, struct Client*, int, char*[]);
+extern int mo_welcome(struct Client*, struct Client*, int, char*[]);
+ extern int mo_xquery(struct Client*, struct Client*, int, char*[]);
extern int mr_error(struct Client*, struct Client*, int, char*[]);
extern int mr_error(struct Client*, struct Client*, int, char*[]);
- extern int mr_pong(struct Client*, struct Client*, int, char*[]);
-@@ -242,6 +244,7 @@
+@@ -230,6 +232,7 @@
extern int ms_wallops(struct Client*, struct Client*, int, char*[]);
extern int ms_wallusers(struct Client*, struct Client*, int, char*[]);
extern int ms_wallvoices(struct Client*, struct Client*, int, char*[]);
+extern int ms_welcome(struct Client*, struct Client*, int, char*[]);
extern int ms_whois(struct Client*, struct Client*, int, char*[]);
-
- extern int mh_nohelp(struct Client*, struct Client*, int, char*[]);
-@@ -308,6 +311,7 @@
- extern int mh_wallops(struct Client*, struct Client*, int, char*[]);
- extern int mh_wallusers(struct Client*, struct Client*, int, char*[]);
- extern int mh_wallvoices(struct Client*, struct Client*, int, char*[]);
-+extern int mh_welcome(struct Client*, struct Client*, int, char*[]);
- extern int mh_who(struct Client*, struct Client*, int, char*[]);
- extern int mh_whois(struct Client*, struct Client*, int, char*[]);
- extern int mh_whowas(struct Client*, struct Client*, int, char*[]);
-diff -r ed0f71fe7e22 include/ircd_features.h
---- a/include/ircd_features.h Wed Jan 28 14:01:58 2009 +0100
-+++ b/include/ircd_features.h Wed Jan 28 15:15:51 2009 +0100
+ extern int ms_xquery(struct Client*, struct Client*, int, char*[]);
+ extern int ms_xreply(struct Client*, struct Client*, int, char*[]);
+diff -r 47d03ce52e8e include/ircd_features.h
+--- a/include/ircd_features.h Tue Mar 23 20:10:46 2010 +0100
++++ b/include/ircd_features.h Tue Mar 23 20:11:20 2010 +0100
@@ -101,6 +101,7 @@
FEAT_IRCD_RES_TIMEOUT,
FEAT_AUTH_TIMEOUT,
/* features that affect all operators */
FEAT_EXTENDED_CHECKCMD,
-@@ -143,6 +144,7 @@
+@@ -142,6 +143,7 @@
FEAT_HIS_STATS_u,
FEAT_HIS_STATS_U,
FEAT_HIS_STATS_v,
FEAT_HIS_STATS_w,
FEAT_HIS_STATS_x,
FEAT_HIS_STATS_y,
-diff -r ed0f71fe7e22 include/msg.h
---- a/include/msg.h Wed Jan 28 14:01:58 2009 +0100
-+++ b/include/msg.h Wed Jan 28 15:15:51 2009 +0100
-@@ -195,6 +195,10 @@
- #define MSG_NOTICE "NOTICE" /* NOTI */
+diff -r 47d03ce52e8e include/msg.h
+--- a/include/msg.h Tue Mar 23 20:10:46 2010 +0100
++++ b/include/msg.h Tue Mar 23 20:11:20 2010 +0100
+@@ -196,6 +196,10 @@
#define TOK_NOTICE "O"
#define CMD_NOTICE MSG_NOTICE, TOK_NOTICE
-+
+
+#define MSG_WELCOME "WELCOME" /* WELC */
+#define TOK_WELCOME "WE"
+#define CMD_WELCOME MSG_WELCOME, TOK_WELCOME
-
++
#define MSG_WALLCHOPS "WALLCHOPS" /* WC */
#define TOK_WALLCHOPS "WC"
-diff -r ed0f71fe7e22 include/numeric.h
---- a/include/numeric.h Wed Jan 28 14:01:58 2009 +0100
-+++ b/include/numeric.h Wed Jan 28 15:15:51 2009 +0100
+ #define CMD_WALLCHOPS MSG_WALLCHOPS, TOK_WALLCHOPS
+diff -r 47d03ce52e8e include/numeric.h
+--- a/include/numeric.h Tue Mar 23 20:10:46 2010 +0100
++++ b/include/numeric.h Tue Mar 23 20:11:20 2010 +0100
@@ -116,6 +116,7 @@
RPL_STATSGLINE 227 Dalnet
RPL_STATSVLINE 227 unreal */
#define RPL_STATSALINE 226 /* Hybrid, Undernet */
+#define RPL_STATSWELCOME 227 /* QuakeNet extension */
#define RPL_STATSQLINE 228 /* Undernet extension */
- #define RPL_STATSHEADER 230 /* QuakeNet extension */
-@@ -445,6 +446,8 @@
+ /* RPL_SERVICEINFO 231 unused */
+@@ -440,6 +441,8 @@
/* ERR_GHOSTEDCLIENT 503 efnet */
/* ERR_VWORLDWARN 503 austnet */
#define ERR_SILELISTFULL 511 /* Undernet extension */
/* ERR_NOTIFYFULL 512 aircd */
/* ERR_TOOMANYWATCH 512 Numeric List: Dalnet */
-diff -r ed0f71fe7e22 include/welcome.h
+diff -r 47d03ce52e8e include/welcome.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h Wed Jan 28 15:15:51 2009 +0100
-@@ -0,0 +1,56 @@
++++ b/include/welcome.h Tue Mar 23 20:11:20 2010 +0100
+@@ -0,0 +1,60 @@
+#ifndef INCLUDED_welcome_h
+#define INCLUDED_welcome_h
+/*
+struct StatDesc;
+
+/* Maximum number of welcome entries (per type; X global, X local) */
-+#define WELCOME_MAX_ENTRIES 10
++#define WELCOME_MAX_ENTRIES 10
++/* Maximum timestamp drift in seconds allowed ahead of our idea of nettime
++ * before we throw a warning to ops
++ */
++#define WELCOME_MAX_DRIFT 600
+
+/* Describes a Welcome message entry. */
+struct Welcome {
-+ char text[TOPICLEN]; /**< Message */
-+ char who[ACCOUNTLEN]; /**< Who set it */
-+ time_t timestamp; /**< Timestamp of the welcome */
++ time_t timestamp; /**< Timestamp of the welcome */
++ char text[TOPICLEN + 1]; /**< Message */
++ char who[ACCOUNTLEN + 1]; /**< Who set it */
+};
+
+/** Welcome type flags */
+extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
+
+#endif /* INCLUDED_welcome_h */
-\ No newline at end of file
-diff -r ed0f71fe7e22 ircd/Makefile.in
---- a/ircd/Makefile.in Wed Jan 28 14:01:58 2009 +0100
-+++ b/ircd/Makefile.in Wed Jan 28 15:15:51 2009 +0100
-@@ -187,6 +187,7 @@
+diff -r 47d03ce52e8e ircd/Makefile.in
+--- a/ircd/Makefile.in Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/Makefile.in Tue Mar 23 20:11:20 2010 +0100
+@@ -186,6 +186,7 @@
m_wallops.c \
m_wallusers.c \
m_wallvoices.c \
m_who.c \
m_whois.c \
m_whowas.c \
-@@ -214,6 +215,7 @@
+@@ -215,6 +216,7 @@
send.c \
uping.c \
userload.c \
whocmds.c \
whowas.c \
y.tab.c
-@@ -1168,6 +1170,11 @@
+@@ -1161,6 +1163,11 @@
../include/ircd_reply.h ../include/ircd_string.h \
../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
../include/numnicks.h ../include/s_user.h ../include/send.h
m_who.o: m_who.c ../config.h ../include/channel.h ../include/ircd_defs.h \
../include/res.h ../config.h ../include/client.h ../include/dbuf.h \
../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
-@@ -1429,6 +1436,13 @@
+@@ -1422,6 +1429,13 @@
../include/numnicks.h ../include/querycmds.h ../include/ircd_features.h \
../include/s_misc.h ../include/s_stats.h ../include/send.h \
../include/struct.h ../include/sys.h
whocmds.o: whocmds.c ../config.h ../include/whocmds.h \
../include/channel.h ../include/ircd_defs.h ../include/res.h \
../config.h ../include/client.h ../include/dbuf.h ../include/msgq.h \
-diff -r ed0f71fe7e22 ircd/ircd_features.c
---- a/ircd/ircd_features.c Wed Jan 28 14:01:58 2009 +0100
-+++ b/ircd/ircd_features.c Wed Jan 28 15:15:51 2009 +0100
-@@ -355,6 +355,7 @@
+diff -r 47d03ce52e8e ircd/client.c
+--- a/ircd/client.c Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/client.c Tue Mar 23 20:11:20 2010 +0100
+@@ -177,6 +177,7 @@
+ FlagSet(&privs_local, PRIV_WHOX);
+ FlagSet(&privs_local, PRIV_DISPLAY);
+ FlagSet(&privs_local, PRIV_FORCE_LOCAL_OPMODE);
++ FlagSet(&privs_local, PRIV_LOCAL_WELCOME);
+
+ privs_defaults_set = 1;
+ }
+@@ -223,6 +224,7 @@
+ ClrPriv(client, PRIV_JUPE);
+ ClrPriv(client, PRIV_OPMODE);
+ ClrPriv(client, PRIV_BADCHAN);
++ ClrPriv(client, PRIV_WELCOME);
+ }
+ }
+
+@@ -244,7 +246,7 @@
+ P(CHANSERV), P(XTRA_OPER), P(NOIDLE), P(FREEFORM),
+ P(PARANOID), P(CHECK), P(WALL), P(CLOSE),
+ P(ROUTE), P(ROUTEINFO), P(SERVERINFO), P(CHANNEL_PRIVACY),
+- P(USER_PRIVACY),
++ P(USER_PRIVACY), P(WELCOME), P(LOCAL_WELCOME),
+ #undef P
+ { 0, 0 }
+ };
+diff -r 47d03ce52e8e ircd/ircd_features.c
+--- a/ircd/ircd_features.c Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/ircd_features.c Tue Mar 23 20:11:20 2010 +0100
+@@ -366,6 +366,7 @@
F_I(IRCD_RES_TIMEOUT, 0, 4, 0),
F_I(AUTH_TIMEOUT, 0, 9, 0),
F_B(ANNOUNCE_INVITES, 0, 0, 0),
/* features that affect all operators */
F_B(EXTENDED_CHECKCMD, 0, 0, 0),
-@@ -397,6 +398,7 @@
+@@ -407,6 +408,7 @@
F_B(HIS_STATS_u, 0, 1, 0),
F_B(HIS_STATS_U, 0, 1, 0),
F_B(HIS_STATS_v, 0, 1, 0),
F_B(HIS_STATS_w, 0, 1, 0),
F_B(HIS_STATS_x, 0, 1, 0),
F_B(HIS_STATS_y, 0, 1, 0),
-diff -r ed0f71fe7e22 ircd/m_welcome.c
+diff -r 47d03ce52e8e ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/ircd_lexer.l Tue Mar 23 20:11:20 2010 +0100
+@@ -166,6 +166,8 @@
+ { "serverinfo", TPRIV_SERVERINFO },
+ { "user_privacy", TPRIV_USER_PRIVACY },
+ { "channel_privacy", TPRIV_CHANNEL_PRIVACY },
++ { "local_welcome", TPRIV_LOCAL_WELCOME },
++ { "welcome", TPRIV_WELCOME },
+ { NULL, 0 }
+ };
+ static int ntokens;
+diff -r 47d03ce52e8e ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/ircd_parser.y Tue Mar 23 20:11:20 2010 +0100
+@@ -189,6 +189,7 @@
+ %token TPRIV_CHANSERV TPRIV_XTRA_OPER TPRIV_NOIDLE TPRIV_FREEFORM TPRIV_PARANOID
+ %token TPRIV_CHECK TPRIV_WALL TPRIV_CLOSE TPRIV_ROUTE TPRIV_ROUTEINFO TPRIV_SERVERINFO
+ %token TPRIV_CHANNEL_PRIVACY TPRIV_USER_PRIVACY TPRIV_LIST_CHAN
++%token TPRIV_LOCAL_WELCOME TPRIV_WELCOME
+ /* and some types... */
+ %type <num> sizespec
+ %type <num> timespec timefactor factoredtimes factoredtime
+@@ -703,6 +704,8 @@
+ TPRIV_SERVERINFO { $$ = PRIV_SERVERINFO ; } |
+ TPRIV_CHANNEL_PRIVACY { $$ = PRIV_CHANNEL_PRIVACY ; } |
+ TPRIV_USER_PRIVACY { $$ = PRIV_USER_PRIVACY ; } |
++ TPRIV_LOCAL_WELCOME { $$ = PRIV_LOCAL_WELCOME; } |
++ TPRIV_WELCOME { $$ = PRIV_WELCOME; } |
+ TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
+ yesorno: YES { $$ = 1; } | NO { $$ = 0; };
+
+diff -r 47d03ce52e8e ircd/m_welcome.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Wed Jan 28 15:15:51 2009 +0100
-@@ -0,0 +1,269 @@
++++ b/ircd/m_welcome.c Tue Mar 23 20:11:20 2010 +0100
+@@ -0,0 +1,288 @@
+/*
+ * IRC - Internet Relay Chat, ircd/m_welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+#include "ircd_features.h"
+#include "ircd_log.h"
+#include "ircd_reply.h"
++#include "ircd_snprintf.h"
+#include "ircd_string.h"
+#include "msg.h"
+#include "numeric.h"
+ * m_welcome - local generic message handler
+ *
+ * parv[0] = Send prefix
++ * parv[1] = [remote server to query]
+ */
+int m_welcome(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+{
+ /* feature disabled */
+ if (!feature_bool(FEAT_WELCOME))
+ return send_reply(sptr, ERR_DISABLED, "WELCOME");
++
++ /* only opers can set the welcome messages */
++ if (parc > 2)
++ return send_reply(sptr, ERR_NOPRIVILEGES);
++
++ /* remote listing request, see if it is for me or a remote server
++ * check FEAT_HIS_REMOTE to decide if an ordinary user can do this
++ */
++ if (parc == 2) {
++ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, feature_int(FEAT_HIS_REMOTE),
++ "%C", 1, parc, parv) != HUNTED_ISME)
++ return 0;
++ return welcome_list(sptr, 0);
++ }
++
++ /* just local listing */
+ return welcome_list(sptr, 0);
+}
+
+ *
+ * set global or on remote server:
+ * parv[0] = Send prefix
-+ * parv[1] = Target: server or * for global
++ * parv[1] = Target: server or * for global (or left out for this server)
+ * parv[2] = Name
+ * parv[3] = Text
+ */
+ char *target, *name, *who, *text, pattern[BUFSIZE];
+ time_t timestamp;
+ unsigned int flags = 0;
-+ int local = 0; /* 1 when it is for me */
++ int local = 0;
+
+ /* feature disabled */
+ if (!feature_bool(FEAT_WELCOME))
+ if (parc < 2)
+ return welcome_list(sptr, 0);
+
-+ /* TODO: add PRIV_WELCOME? */
-+ /* check PRIVS */
-+ if (!HasPriv(sptr,PRIV_SERVERINFO))
-+ return send_reply(sptr, ERR_NOPRIVILEGES);
-+
++ /* TODO: move feature check here? */
+ /* remote listing request, see if it is for me or a remote server */
+ if (parc == 2) {
+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME)
+ return 0;
+ return welcome_list(sptr, 0);
+ }
-+
++
++ /* check PRIVS */
++ /* local - need PRIV LOCAL_WELCOME or WELCOME */
++ if (parc == 3 && !HasPriv(sptr,PRIV_LOCAL_WELCOME) && !HasPriv(sptr,PRIV_WELCOME))
++ return send_reply(sptr, ERR_NOPRIVILEGES);
++
++ /* global or remote - need PRIV WELCOME */
++ if (parc >= 4 && !HasPriv(sptr,PRIV_WELCOME))
++ return send_reply(sptr, ERR_NOPRIVILEGES);
++
+ /* set the parameters */
-+ /* less than 4 parameters, assume target was left out, making it local for me */
++
++ /* target not given, only name - setting local welcome */
+ if (parc < 4) {
+ local++;
+ target = cli_name(&me);
+ name = parv[1];
+ flags |= WELCOME_LOCAL;
-+ } else { /* otherwise set as it should */
++
++ /* target and name given */
++ } else {
+ target = parv[1];
+ name = parv[2];
+ }
+
+ /* target is not global */
+ if (!(target[0] == '*' && target[1] == '\0') && !local) {
++
+ /* build a pattern for hunt_server_cmd since we do not have all we need in parv */
+ ircd_snprintf(0, pattern, sizeof(pattern), "%s %s %Tu %s :%s", "%C", name, timestamp, who, text);
+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, pattern, 1, 2, parv) != HUNTED_ISME)
+ return 0;
-+ flags |= WELCOME_LOCAL; /* local welcome, for me */
++
++ /* else it is a local welcome, for me */
++ flags |= WELCOME_LOCAL;
+ }
+
+ /* TODO: disallow global announcement from oper?
+ * as PRIVMSG/NOTICE to $* is not allowed either by the ircd
+ * when PRIV for that is added, use that here? PRIV_BROADCAST or something
++ *
++ * change prefix to $ ?
+ */
+ /* check for anounce prefix */
+ if (*name == '!') {
+ time_t timestamp;
+ unsigned int flags = 0;
+
-+ /* not enough */
-+ if (parc < 2)
++ /* not enough - complain */
++ if (parc < 2) {
++ protocol_violation(sptr, "Too few parameters for WELCOME (got %d - need 2)", parc);
+ return need_more_params(sptr, "WELCOME");
++ }
+
+ /* remote listing request, see if it is for me or a remote server */
+ if (parc == 2) {
-+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) == HUNTED_ISME)
-+ return welcome_list(sptr, 0);
++ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME)
++ return 0;
++ return welcome_list(sptr, 0);
+ }
+
-+ /* we need at least 6 parameters to continue */
-+ if (parc < 6)
++ /* we need at least 6 parameters to continue - complain */
++ if (parc < 6) {
++ protocol_violation(sptr, "Too few parameters for WELCOME (got %d - need 6)", parc);
+ return need_more_params(sptr, "WELCOME");
++ }
+
+ /* set the parameters */
+ target = parv[1];
+ name = parv[2];
+ timestamp = atoi(parv[3]);
+ who = parv[4];
-+ text = parv[parc - 1];
++ text = parv[parc - 1]; /* parse reason as last parameter */
+
+ /* target is not global */
+ if (!(target[0] == '*' && target[1] == '\0')) {
++
+ /* not for me, and forward it */
+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C %s %s %s :%s", 1, parc, parv) != HUNTED_ISME)
+ return 0;
-+ flags |= WELCOME_LOCAL; /* local welcome, for me */
++
++ /* local welcome for me */
++ flags |= WELCOME_LOCAL;
+ }
+
+ /* check for anounce prefix */
+ /* and do it */
+ return welcome_do(cptr, sptr, name, text, who, timestamp, flags);
+}
-+
-+
-+/*
-+ * mh_welcome - help message handler
-+ */
-+int mh_welcome(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
-+{
-+ if (!IsAnOper(sptr)) {
-+ send_reply(sptr, SND_EXPLICIT | RPL_HELP,
-+ "WELCOME :WELCOME");
-+ send_reply(sptr, SND_EXPLICIT | RPL_HELP,
-+ "WELCOME :Shows welcome messages set on the server.");
-+ } else {
-+ send_reply(sptr, SND_EXPLICIT | RPL_HELP,
-+ "WELCOME :WELCOME [<target>] [[!]<name> :<message>]");
-+ send_reply(sptr, SND_EXPLICIT | RPL_HELP,
-+ "WELCOME :Shows or sets welcome messages on a server.");
-+ }
-+ return 0;
-+}
-diff -r ed0f71fe7e22 ircd/parse.c
---- a/ircd/parse.c Wed Jan 28 14:01:58 2009 +0100
-+++ b/ircd/parse.c Wed Jan 28 15:15:51 2009 +0100
-@@ -667,6 +667,15 @@
- /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
- { m_unregistered, m_not_oper, ms_opkick, mo_opkick, m_ignore, mh_nohelp }
+diff -r 47d03ce52e8e ircd/parse.c
+--- a/ircd/parse.c Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/parse.c Tue Mar 23 20:11:20 2010 +0100
+@@ -661,6 +661,15 @@
+ /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+ { m_unregistered, m_not_oper, ms_check, mo_check, m_ignore }
},
+
+ /* add command for WELCOME */
+ TOK_WELCOME,
+ 0, MAXPARA, MFLG_SLOW, 0, NULL,
+ /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
-+ { m_unregistered, m_welcome, ms_welcome, mo_welcome, m_ignore, mh_welcome }
++ { m_unregistered, m_welcome, ms_welcome, mo_welcome, m_ignore }
+ },
/* This command is an alias for QUIT during the unregistered part of
* of the server. This is because someone jumping via a broken web
-diff -r ed0f71fe7e22 ircd/s_err.c
---- a/ircd/s_err.c Wed Jan 28 14:01:58 2009 +0100
-+++ b/ircd/s_err.c Wed Jan 28 15:15:51 2009 +0100
+diff -r 47d03ce52e8e ircd/s_err.c
+--- a/ircd/s_err.c Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/s_err.c Tue Mar 23 20:11:20 2010 +0100
@@ -486,7 +486,7 @@
/* 226 */
{ RPL_STATSALINE, "%s", "226" },
/* 510 */
{ 0 },
/* 511 */
-diff -r ed0f71fe7e22 ircd/s_serv.c
---- a/ircd/s_serv.c Wed Jan 28 14:01:58 2009 +0100
-+++ b/ircd/s_serv.c Wed Jan 28 15:15:51 2009 +0100
+diff -r 47d03ce52e8e ircd/s_serv.c
+--- a/ircd/s_serv.c Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/s_serv.c Tue Mar 23 20:11:20 2010 +0100
@@ -57,6 +57,7 @@
#include "struct.h"
#include "sys.h"
/*
* Pass on my client information to the new server
-diff -r ed0f71fe7e22 ircd/s_stats.c
---- a/ircd/s_stats.c Wed Jan 28 14:01:58 2009 +0100
-+++ b/ircd/s_stats.c Wed Jan 28 15:15:51 2009 +0100
+diff -r 47d03ce52e8e ircd/s_stats.c
+--- a/ircd/s_stats.c Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/s_stats.c Tue Mar 23 20:11:20 2010 +0100
@@ -54,6 +54,7 @@
#include "send.h"
#include "struct.h"
#include <stdio.h>
#include <stdlib.h>
-@@ -689,9 +690,12 @@
+@@ -654,9 +655,12 @@
{ 'V', "vserversmach", (STAT_FLAG_OPERFEAT | STAT_FLAG_VARPARAM | STAT_FLAG_CASESENS), FEAT_HIS_STATS_v,
stats_servers_verbose, 0,
"Verbose server information." },
{ 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
stats_meminfo, 0,
"List usage information." },
-diff -r ed0f71fe7e22 ircd/s_user.c
---- a/ircd/s_user.c Wed Jan 28 14:01:58 2009 +0100
-+++ b/ircd/s_user.c Wed Jan 28 15:15:51 2009 +0100
+diff -r 47d03ce52e8e ircd/s_user.c
+--- a/ircd/s_user.c Tue Mar 23 20:10:46 2010 +0100
++++ b/ircd/s_user.c Tue Mar 23 20:11:20 2010 +0100
@@ -63,6 +63,7 @@
#include "userload.h"
#include "version.h"
#include "handlers.h" /* m_motd and m_lusers */
-@@ -411,6 +412,9 @@
+@@ -410,6 +411,9 @@
cli_info(sptr), NumNick(cptr) /* two %s's */);
IPcheck_connect_succeeded(sptr);
}
else {
struct Client *acptr = user->server;
-diff -r ed0f71fe7e22 ircd/welcome.c
+diff -r 47d03ce52e8e ircd/welcome.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c Wed Jan 28 15:15:51 2009 +0100
-@@ -0,0 +1,355 @@
++++ b/ircd/welcome.c Tue Mar 23 20:11:20 2010 +0100
+@@ -0,0 +1,369 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+
+
+/** List of welcome messages - first MAX for global, second MAX for local */
-+static struct Welcome WelcomeArray[WELCOME_MAX_ENTRIES * 2];
-+
++static struct Welcome WelcomeArray[WELCOME_MAX_ENTRIES * 2] = { { 0 } };
+
+
+/** Allocate a new welcome with the given parameters.
+{
+ int nameint = atoi(name); /* transform to int */
+ int namearray = nameint - 1; /* used to test the array element */
-+ int notext = (text[0] == '\0') ? 1 : 0; /* 1 when text is empty */
-+ char *action; /* used for logging */
-+ /* TODO: these needed? */
-+ /*
-+ who[ACCOUNTLEN-1] = 0;
-+ text[WELCOMELEN-1] = 0;
-+ */
-+
-+ /* TODO: NULL or 0 ? they are pointers, so NULL? */
-+ assert(0 != cptr);
-+ assert(0 != sptr);
-+ assert(0 != name);
-+ /* TODO: assert(0 != text); */
-+ assert(0 != who);
++ char oldtext[TOPICLEN + 1]; /* save old text when unsetting */
++ static time_t rate;
++
++ assert(NULL != cptr);
++ assert(NULL != sptr);
++ assert(NULL != name);
++ assert(NULL != text);
++ assert(NULL != who);
+
+ /* debug */
+ Debug((DEBUG_DEBUG, "welcome_do(\"%s\", \"%s\", \"%s\", \"%s\" \"%s\", %Tu, 0x%04x)",
+ namearray += WELCOME_MAX_ENTRIES;
+
+ /* cannot unset welcome that is not set */
-+ if (WelcomeArray[namearray].timestamp == 0 && notext) {
++ if (WelcomeArray[namearray].timestamp == 0 && EmptyString(text)) {
++
+ /* from user, throw error */
+ if (IsUser(sptr))
+ return send_reply(sptr, ERR_NOSUCHWELCOME, name);
-+ /* new local welcome from server, but empty - ignore */
++
++ /* new local welcome from server, but empty - ignore
++ * we do accept a new global welcome message that is empty
++ */
+ if (flags & WELCOME_LOCAL)
+ return 0;
-+ /* new global welcome message, but empty, accept from server
-+ * otherwise we do not have the same state as them
-+ */
+ }
+
-+ /* TODO: check if we receive an entry with a timestamp >> TStime()
-+ * ..so from the future
-+ * something is wrong there - either side is wrong about the time (or both)
-+ *
-+ * if we accept a global welcome message with a timestamp far into the future
-+ * it will not be possible to change it - well, not until we pass that point in time
-+ * or /settime to get to it, or hack with a service..
-+ *
-+ * how to handle this - like CREATE and settime? hm, or throw error to ops?
-+ */
+ /* check if there is something to change */
-+ if (WelcomeArray[namearray].timestamp != 0) { /* we got a record for it */
-+ if (namearray < WELCOME_MAX_ENTRIES) { /* global */
-+ if (timestamp == WelcomeArray[namearray].timestamp) /* we got this version already */
++ /* we got a record for it */
++ if (WelcomeArray[namearray].timestamp != 0) {
++
++ /* global */
++ if (namearray < WELCOME_MAX_ENTRIES) {
++
++ /* netburst and we got the same or a newer one
++ *
++ * we only use the timestamp for resolving conflicts in net burst
++ * outside of netburst, we simply parse whatever we get
++ * this way we will not get stuck with a welcome message set by a server
++ * running ahead with the time
++ */
++ if (IsBurstOrBurstAck(cptr) && timestamp <= WelcomeArray[namearray].timestamp)
+ return 0;
-+ if (timestamp < WelcomeArray[namearray].timestamp) { /* we got a later version */
-+ if (IsBurstOrBurstAck(cptr)) /* middle of a burst, it will resync on its own */
-+ return 0;
-+ return welcome_resend(cptr, namearray); /* resync the server */
-+ }
++
++ /* local welcome - we use our idea of the time */
+ } else
-+ /* local welcome, set timestamp to nettime, accept any change
-+ * we parse local welcome messages in the order we receive them
-+ * they cannot cross on the network and are not bursted,
-+ * and thus timestamp is not required for conflict resolving.
-+ */
+ timestamp = TStime();
+
+ /* compare new message with old message */
+ }
+ }
+
++ /* TODO: rate limited for what? max 10 welcome messages..? */
++ /* possible timestamp drift - warn ops */
++ if (timestamp - TStime() > WELCOME_MAX_DRIFT) {
++ sendto_opmask_butone_ratelimited(0, SNO_NETWORK, &rate,
++ "Possible timestamp drift from %C; timestamp in WELCOME message is %is ahead of time",
++ IsServer(sptr) ? sptr : cli_user(sptr)->server, timestamp - TStime());
++
++ /* warn remote oper too */
++ if (IsUser(sptr))
++ sendcmdto_one(&me, CMD_NOTICE, sptr,
++ "%C :Possible timestamp drift from %C; timestamp in WELCOME message is %is ahead of time",
++ sptr, cli_user(sptr)->server, timestamp - TStime());
++ }
++
++ /* unsetting - do not announce, save text */
++ if (EmptyString(text)) {
++ flags &= ~WELCOME_ANNOUNCE;
++ ircd_strncpy(oldtext, WelcomeArray[namearray].text, TOPICLEN);
++ }
++
+ /* update */
+ welcome_make(namearray, text, who, timestamp);
+
-+ /* set action */
-+ if (flags & WELCOME_LOCAL)
-+ action = notext ? "removing local" : "changing local";
-+ else
-+ action = notext ? "unsetting" : "changing";
-+
-+ /* TODO: WALLOPS for local welcome messages, so that all operators know about it? */
+ /* inform ops */
-+ sendto_opmask_butone(0, SNO_OLDSNO, "%s %s WELCOME for %d%s%s",
++ sendto_opmask_butone(0, SNO_OLDSNO, "%s %s%s%sWELCOME %d \"%s\" [%Tu]",
+ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
+ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server),
-+ action, nameint, notext ? "" : " to :", notext ? "" : WelcomeArray[namearray].text);
++ EmptyString(text) ? "unsetting" : "changing",
++ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
++ (flags & WELCOME_LOCAL) ? "local " : "",
++ nameint,
++ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
++ WelcomeArray[namearray].timestamp);
+
+ /* log it */
-+ log_write(LS_NETWORK, L_INFO, LOG_NOSNOTICE, "%#C (%s) %s WELCOME for %d%s%s [%Tu]",
-+ sptr, WelcomeArray[namearray].who, action, nameint,
-+ notext ? "" : " to :", notext ? "" : WelcomeArray[namearray].text,
++ log_write(LS_NETWORK, L_INFO, LOG_NOSNOTICE, "%#C (%s) %s%s%sWELCOME %d \"%s\" [%Tu]",
++ sptr, WelcomeArray[namearray].who,
++ EmptyString(text) ? "unsetting" : "changing",
++ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
++ (flags & WELCOME_LOCAL) ? "local " : "",
++ nameint,
++ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
+ WelcomeArray[namearray].timestamp);
+
-+ /* TODO: or WALLOPS here, local message remotely set? */
+ /* welcome set by remote user, inform oper of success */
-+ if ((flags & WELCOME_LOCAL) && IsUser(sptr) && !MyUser(sptr))
-+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s WELCOME for %d%s%s",
-+ sptr, get_client_name_and_opername(sptr), action, nameint,
-+ notext ? "" : " to :", notext ? "" : WelcomeArray[namearray].text);
++ if ((flags & WELCOME_LOCAL) && IsUser(sptr) && !MyUser(sptr)) {
++ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s%s local WELCOME %d \"%s\" [%Tu]",
++ sptr, get_client_name_and_opername(sptr),
++ EmptyString(text) ? "unsetting" : "changing",
++ (flags & WELCOME_ANNOUNCE) ? " and announcing" : "",
++ nameint,
++ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
++ WelcomeArray[namearray].timestamp);
++
++ /* TODO: wallops all local changes, by both local and remote opers? */
++ /* tell all opers about the local message being set remotely */
++ sendwallto_group_butone(&me, WALL_WALLOPS, 0,
++ "%s %s%s local WELCOME %d \"%s\" [%Tu]",
++ get_client_name_and_opername(sptr),
++ EmptyString(text) ? "unsetting" : "changing",
++ (flags & WELCOME_ANNOUNCE) ? " and announcing" : "",
++ nameint,
++ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
++ WelcomeArray[namearray].timestamp);
++ }
+
+ /* propagate it */
+ if (!(flags & WELCOME_LOCAL))
+ WelcomeArray[namearray].text);
+
+ /* announce it */
-+ if ((flags & WELCOME_ANNOUNCE) && !notext)
++ if (flags & WELCOME_ANNOUNCE)
+ welcome_announce(namearray);
+
+ return 0;
+{
+ struct Client *acptr;
+ struct MsgBuf *msgbuf;
++ int i;
+
+ /* range 0 to 2 * max - 1 */
+ assert(name >= 0 && name <= 2 * WELCOME_MAX_ENTRIES - 1);
+ name >= WELCOME_MAX_ENTRIES ? cli_name(&me) : feature_str(FEAT_NETWORK),
+ WelcomeArray[name].text);
+
-+ /* go over clients */
-+ for (acptr = GlobalClientList; acptr; acptr = cli_next(acptr)) {
++ /* go over local clients */
++ for (i = HighestFd; i > 0; --i) {
+
-+ /* skip remote users
-+ * skip unregistered clients - they see the message during login
++ /* skip unregistered clients - they see the message during login
++ * skip servers
+ */
-+ if (!MyUser(acptr) || !IsRegistered(acptr))
++ if (!(acptr = LocalClientArray[i]) || !IsRegistered(acptr) || IsServer(acptr))
+ continue;
+
-+ /* send it away */
++ /* send it away */
+ send_buffer(acptr, msgbuf, 0);
+ }
+}
+{
+ int name;
+
++ assert(NULL != cptr);
++
+ /* loop over global entries - 0 to max - 1*/
+ for (name = 0; name <= WELCOME_MAX_ENTRIES - 1; name++) {
+ if (WelcomeArray[name].timestamp != 0)
+}
+
+
-+/** Forward a welcome to another server.
-+ * @param[in] cptr %Server to send welcome to.
-+ * @param[in] welcome Welcome to forward.
-+ */
-+int
-+welcome_resend(struct Client *cptr, int name)
-+{
-+ sendcmdto_one(&me, CMD_WELCOME, cptr, "* %d %Tu %s :%s",
-+ name + 1, WelcomeArray[name].timestamp, WelcomeArray[name].who,
-+ WelcomeArray[name].text);
-+ return 0;
-+}
-+
-+
+/** List welcome messages.
+ * @param[in] sptr Client requesting the listing.
+ * @param[in] connect When non zero do not report no welcome is set
+{
+ int found = 0, local = 0, name;
+
++ assert(NULL != sptr);
++
+ /* loop over all entries - range 0 to 2 * max - 1 */
+ for (name = 0; name <= 2 * WELCOME_MAX_ENTRIES - 1; name++) {
+
+ local = 1;
+
+ /* not set or empty - skip */
++ /* TODO: EmptyString? */
+ if (WelcomeArray[name].timestamp == 0 || *WelcomeArray[name].text == 0)
+ continue;
+
+{
+ int name, local = 0;
+
-+ /* TODO: change "Who" to "Opername" or "OperID" as that is what it is? */
-+ /* send header so the client knows what we are showing */
-+ send_reply(sptr, SND_EXPLICIT | RPL_STATSHEADER,
-+ "W Name Target Who Timestamp :Message");
++ assert(NULL != sptr);
+
+ /* loop over all entries - range 0 to 2 * max - 1*/
+ for (name = 0; name <= 2 * WELCOME_MAX_ENTRIES - 1; name++) {
+
+ /* send it */
+ send_reply(sptr, RPL_STATSWELCOME,
-+ local ? name + 1 - WELCOME_MAX_ENTRIES : name + 1, local ? cli_name(&me) : "*",
++ local ? name + 1 - WELCOME_MAX_ENTRIES : name + 1,
++ local ? cli_name(&me) : "*",
+ WelcomeArray[name].who, WelcomeArray[name].timestamp,
-+ (*WelcomeArray[name].text == 0) ? "<Empty>" : WelcomeArray[name].text);
++ EmptyString(WelcomeArray[name].text) ? "<Empty>" : WelcomeArray[name].text);
+ }
+}
projects / irc / quakenet / snircd-patchqueue.git / blobdiff