ircd/s_user.c
add showing of welcome messages on connect
-diff -r 42bf40ebc839 include/handlers.h
---- a/include/handlers.h Fri Jan 30 11:47:37 2009 +0100
-+++ b/include/handlers.h Fri Jan 30 13:14:46 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 a9b437e961ec include/client.h
+--- a/include/client.h
++++ b/include/client.h
+@@ -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 a9b437e961ec include/handlers.h
+--- a/include/handlers.h
++++ b/include/handlers.h
+@@ -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 42bf40ebc839 include/ircd_features.h
---- a/include/ircd_features.h Fri Jan 30 11:47:37 2009 +0100
-+++ b/include/ircd_features.h Fri Jan 30 13:14:46 2009 +0100
+ extern int ms_xquery(struct Client*, struct Client*, int, char*[]);
+ extern int ms_xreply(struct Client*, struct Client*, int, char*[]);
+diff -r a9b437e961ec include/ircd_features.h
+--- a/include/ircd_features.h
++++ b/include/ircd_features.h
@@ -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 42bf40ebc839 include/msg.h
---- a/include/msg.h Fri Jan 30 11:47:37 2009 +0100
-+++ b/include/msg.h Fri Jan 30 13:14:46 2009 +0100
+diff -r a9b437e961ec include/msg.h
+--- a/include/msg.h
++++ b/include/msg.h
@@ -196,6 +196,10 @@
#define TOK_NOTICE "O"
#define CMD_NOTICE MSG_NOTICE, TOK_NOTICE
#define MSG_WALLCHOPS "WALLCHOPS" /* WC */
#define TOK_WALLCHOPS "WC"
#define CMD_WALLCHOPS MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r 42bf40ebc839 include/numeric.h
---- a/include/numeric.h Fri Jan 30 11:47:37 2009 +0100
-+++ b/include/numeric.h Fri Jan 30 13:14:46 2009 +0100
+diff -r a9b437e961ec include/numeric.h
+--- a/include/numeric.h
++++ b/include/numeric.h
@@ -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 42bf40ebc839 include/welcome.h
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h Fri Jan 30 13:14:46 2009 +0100
-@@ -0,0 +1,60 @@
+diff -r a9b437e961ec include/welcome.h
+--- /dev/null
++++ b/include/welcome.h
+@@ -0,0 +1,66 @@
+#ifndef INCLUDED_welcome_h
+#define INCLUDED_welcome_h
+/*
+
+/* Maximum number of welcome entries (per type; X global, X local) */
+#define WELCOME_MAX_ENTRIES 10
++/* Maximum length of a welcome message */
++#define WELCOMELEN TOPICLEN
+/* Maximum timestamp drift in seconds allowed ahead of our idea of nettime
+ * before we throw a warning to ops
+ */
+#define WELCOME_MAX_DRIFT 600
+
++/* test if a welcome entry is in a valid range */
++#define WelcomeIsValid(x) ((x) >= 0 && (x) <= 2 * WELCOME_MAX_ENTRIES - 1)
++
+/* Describes a Welcome message entry. */
+struct Welcome {
+ time_t timestamp; /**< Timestamp of the welcome */
-+ char text[TOPICLEN + 1]; /**< Message */
++ char text[WELCOMELEN + 1]; /**< Message */
+ char who[ACCOUNTLEN + 1]; /**< Who set it */
+};
+
+#define WELCOME_LOCAL 0x01 /**< welcome is local */
+/** Welcome action flags */
+#define WELCOME_ANNOUNCE 0x02 /**< announce change to users */
++#define WELCOME_INSERT 0x04 /**< insert welcome message, move down all others one place */
+
-+extern int welcome_do(struct Client *cptr, struct Client *sptr, char *name, char *text,
-+ char *who, time_t timestamp, unsigned int flags);
++extern int welcome_do(struct Client *cptr, struct Client *sptr, char *name,
++ time_t timestamp, char *who, char *text, unsigned int flags);
+extern void welcome_announce(int name);
+extern void welcome_burst(struct Client *cptr);
+extern int welcome_list(struct Client *sptr, int connect);
+extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
+
+#endif /* INCLUDED_welcome_h */
-diff -r 42bf40ebc839 ircd/Makefile.in
---- a/ircd/Makefile.in Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/Makefile.in Fri Jan 30 13:14:46 2009 +0100
-@@ -187,6 +187,7 @@
+diff -r a9b437e961ec ircd/Makefile.in
+--- a/ircd/Makefile.in
++++ b/ircd/Makefile.in
+@@ -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 42bf40ebc839 ircd/ircd_features.c
---- a/ircd/ircd_features.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/ircd_features.c Fri Jan 30 13:14:46 2009 +0100
-@@ -355,6 +355,7 @@
+diff -r a9b437e961ec ircd/client.c
+--- a/ircd/client.c
++++ b/ircd/client.c
+@@ -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 a9b437e961ec ircd/ircd_features.c
+--- a/ircd/ircd_features.c
++++ b/ircd/ircd_features.c
+@@ -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 42bf40ebc839 ircd/m_welcome.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Fri Jan 30 13:14:46 2009 +0100
-@@ -0,0 +1,300 @@
+diff -r a9b437e961ec ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l
++++ b/ircd/ircd_lexer.l
+@@ -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 a9b437e961ec ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y
++++ b/ircd/ircd_parser.y
+@@ -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 a9b437e961ec ircd/m_welcome.c
+--- /dev/null
++++ b/ircd/m_welcome.c
+@@ -0,0 +1,296 @@
+/*
+ * 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"
+ /* 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);
-+ }
++ if ((parc > 1) && (hunt_server_cmd(sptr, CMD_WELCOME, cptr, feature_int(FEAT_HIS_REMOTE),
++ "%C", 1, parc, parv) != HUNTED_ISME))
++ return 0;
+
-+ /* just local listing */
++ /* local listing */
+ return welcome_list(sptr, 0);
+}
+
+ if (!feature_bool(FEAT_WELCOME))
+ return send_reply(sptr, ERR_DISABLED, "WELCOME");
+
-+ /* listing */
-+ if (parc < 2)
++ /* TODO: move feature check here? */
++ /* remote listing request, see if it is for me or a remote server */
++ if ((parc == 2) && (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME))
++ return 0;
++
++ /* local listing */
++ if (parc <= 2)
+ return welcome_list(sptr, 0);
+
-+ /* TODO: add PRIV_WELCOME? */
+ /* check PRIVS */
-+ if (!HasPriv(sptr,PRIV_SERVERINFO))
++ /* 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);
+
-+ /* 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);
-+ }
-+
+ /* set the parameters */
+
+ /* target not given, only name - setting local welcome */
+ /* 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 == '!') {
+ name++;
+ flags |= WELCOME_ANNOUNCE;
+ }
-+
++
++ /* check for insert prefix */
++ if (*name == '+') {
++ name++;
++ flags |= WELCOME_INSERT;
++ }
++
+ /* and do it */
-+ return welcome_do(cptr, sptr, name, text, who, timestamp, flags);
++ return welcome_do(cptr, sptr, name, timestamp, who, text, flags);
+}
+
+
+
+ /* remote listing request, see if it is for me or a remote server */
+ if (parc == 2) {
++ if (IsServer(sptr))
++ return protocol_violation(cptr, "WELCOME listing request from server %C", sptr);
+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME)
+ return 0;
+ return welcome_list(sptr, 0);
+ flags |= WELCOME_ANNOUNCE;
+ }
+
-+ /* 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.");
++ /* check for insert prefix */
++ if (*name == '+') {
++ name++;
++ flags |= WELCOME_INSERT;
+ }
-+ return 0;
++
++ /* and do it */
++ return welcome_do(cptr, sptr, name, timestamp, who, text, flags);
+}
-diff -r 42bf40ebc839 ircd/parse.c
---- a/ircd/parse.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/parse.c Fri Jan 30 13:14:46 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 a9b437e961ec ircd/parse.c
+--- a/ircd/parse.c
++++ b/ircd/parse.c
+@@ -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 42bf40ebc839 ircd/s_err.c
---- a/ircd/s_err.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/s_err.c Fri Jan 30 13:14:46 2009 +0100
+diff -r a9b437e961ec ircd/s_err.c
+--- a/ircd/s_err.c
++++ b/ircd/s_err.c
@@ -486,7 +486,7 @@
/* 226 */
{ RPL_STATSALINE, "%s", "226" },
/* 510 */
{ 0 },
/* 511 */
-diff -r 42bf40ebc839 ircd/s_serv.c
---- a/ircd/s_serv.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/s_serv.c Fri Jan 30 13:14:46 2009 +0100
+diff -r a9b437e961ec ircd/s_serv.c
+--- a/ircd/s_serv.c
++++ b/ircd/s_serv.c
@@ -57,6 +57,7 @@
#include "struct.h"
#include "sys.h"
/*
* Pass on my client information to the new server
-diff -r 42bf40ebc839 ircd/s_stats.c
---- a/ircd/s_stats.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/s_stats.c Fri Jan 30 13:14:46 2009 +0100
+diff -r a9b437e961ec ircd/s_stats.c
+--- a/ircd/s_stats.c
++++ b/ircd/s_stats.c
@@ -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 42bf40ebc839 ircd/s_user.c
---- a/ircd/s_user.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/s_user.c Fri Jan 30 13:14:46 2009 +0100
+diff -r a9b437e961ec ircd/s_user.c
+--- a/ircd/s_user.c
++++ b/ircd/s_user.c
@@ -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 42bf40ebc839 ircd/welcome.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c Fri Jan 30 13:14:46 2009 +0100
-@@ -0,0 +1,373 @@
+diff -r a9b437e961ec ircd/welcome.c
+--- /dev/null
++++ b/ircd/welcome.c
+@@ -0,0 +1,582 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+static int
+welcome_make(int name, char *text, char *who, time_t timestamp)
+{
-+ /* range 0 to 2 * max - 1 */
-+ assert(name >= 0 && name <= 2 * WELCOME_MAX_ENTRIES - 1);
++ /* valid range */
++ assert(WelcomeIsValid(name));
+
+ /* store it */
-+ ircd_strncpy(WelcomeArray[name].text, text, TOPICLEN);
++ ircd_strncpy(WelcomeArray[name].text, text, WELCOMELEN);
+ ircd_strncpy(WelcomeArray[name].who, who, ACCOUNTLEN);
+ WelcomeArray[name].timestamp = timestamp;
+
+}
+
+
++/** Propagate a welcome message.
++ * @param[in] cptr Local client that sent us the welcome.
++ * @param[in] sptr Originator of the welcome.
++ * @param[in] nameint Name of the message.
++ * @param[in] timestamp Timestamp of when the message was set.
++ * @param[in] who Who set this message.
++ * @param[in] text The welcome message.
++ * @param[in] flags Flags to set on welcome.
++ * @return Zero
++ */
++int
++welcome_propagate(struct Client *cptr, struct Client *sptr, int nameint,
++ time_t timestamp, char *who, char *text, unsigned int flags)
++{
++ /* must be global */
++ assert(!(flags & WELCOME_LOCAL));
++
++ sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%s%d %Tu %s :%s",
++ (flags & WELCOME_ANNOUNCE) ? "!" : "", (flags & WELCOME_INSERT) ? "+" : "",
++ nameint, timestamp, who, text);
++
++ return 0;
++}
++
++
++/** Log a welcome message.
++ * @param[in] sptr Originator of the welcome.
++ * @param[in] msg The message to show.
++ * @param[in] who Who set this message.
++ * @param[in] flags Flags to set on welcome.
++ * @return Zero
++ */
++int
++welcome_log(struct Client *sptr, char *msg, char *who, unsigned int flags)
++{
++
++ /* inform ops */
++ sendto_opmask_butone(0, SNO_OLDSNO, "%s %s",
++ (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ?
++ get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server), msg);
++
++ /* log it */
++ log_write(LS_NETWORK, L_INFO, LOG_NOSNOTICE, "%#C (%s) %s", sptr, who, msg);
++
++ /* welcome by remote user, inform oper of success */
++ if ((flags & WELCOME_LOCAL) && IsUser(sptr) && !MyUser(sptr)) {
++ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s",
++ sptr, get_client_name_and_opername(sptr), msg);
++
++ /* 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", get_client_name_and_opername(sptr), msg);
++ }
++
++ return 0;
++}
++
++
++/** Set a welcome message.
++ * @param[in] cptr Local client that sent us the welcome.
++ * @param[in] sptr Originator of the welcome.
++ * @param[in] nameint Name of the message.
++ * @param[in] namearray Array entry.
++ * @param[in] timestamp Timestamp of when the message was set.
++ * @param[in] who Who set this message.
++ * @param[in] text The message.
++ * @param[in] flags Flags to set on welcome.
++ * @return Zero
++ */
++int
++welcome_set(struct Client *cptr, struct Client *sptr, int nameint,
++ int namearray, time_t timestamp, char *who, char *text, unsigned int flags)
++{
++ char msg[BUFSIZE]; /* msg for logging */
++ int new = 0;
++
++ /* debug */
++ Debug((DEBUG_DEBUG, "welcome_set(\"%s\", \"%s\", %d, %d, %Tu, \"%s\", \"%s\", 0x%04x)",
++ cli_name(cptr), cli_name(sptr), nameint, namearray, timestamp, who, text, flags));
++
++ /* not set */
++ if (*WelcomeArray[namearray].text == 0)
++ new = 1;
++
++ /* update */
++ welcome_make(namearray, text, who, timestamp);
++
++ /* create msg for log */
++ ircd_snprintf(0, msg, 0, "%s%s%s WELCOME %d \"%s\" [%Tu]",
++ new ? "setting" : "changing",
++ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
++ (flags & WELCOME_LOCAL) ? "local" : "global",
++ nameint, text, timestamp);
++
++ /* log it */
++ welcome_log(sptr, msg, who, flags);
++
++ /* propagate it */
++ if (!(flags & WELCOME_LOCAL))
++ welcome_propagate(cptr, sptr, nameint, timestamp, who, text, flags);
++
++ /* announce it */
++ if (flags & WELCOME_ANNOUNCE)
++ welcome_announce(namearray);
++
++ return 0;
++}
++
++
++/** Unset a welcome message.
++ * @param[in] cptr Local client that sent us the welcome.
++ * @param[in] sptr Originator of the welcome.
++ * @param[in] nameint Name of the message.
++ * @param[in] namearray Array entry.
++ * @param[in] timestamp Timestamp of when the message was set.
++ * @param[in] who Who set this message.
++ * @param[in] flags Flags to set on welcome.
++ * @return Zero
++ */
++int
++welcome_unset(struct Client *cptr, struct Client *sptr, int nameint,
++ int namearray, time_t timestamp, char *who, unsigned int flags)
++{
++ char msg[BUFSIZE]; /* msg for logging */
++ char text[WELCOMELEN + 1]; /* save old text */
++ int i; /* loop variable */
++ int empty = namearray; /* first empty spot in array after arrayname */
++ int end = WELCOME_MAX_ENTRIES -1; /* last element to check in array */
++
++ /* debug */
++ Debug((DEBUG_DEBUG, "welcome_unset(\"%s\", \"%s\", %d, %d, %Tu, \"%s\", 0x%04x)",
++ cli_name(cptr), cli_name(sptr), nameint, namearray, timestamp, who, flags));
++
++ /* save text */
++ ircd_strncpy(text, WelcomeArray[namearray].text, WELCOMELEN);
++
++ /* update */
++ welcome_make(namearray, "", who, timestamp);
++
++ /* create msg for log */
++ ircd_snprintf(0, msg, 0, "unsetting %s WELCOME %d \"%s\" [%Tu]",
++ (flags & WELCOME_LOCAL) ? "local" : "global", nameint, text, timestamp);
++
++ /* log it */
++ welcome_log(sptr, msg, who, flags);
++
++ /* propagate it, but not when inserting */
++ if (!(flags & (WELCOME_LOCAL|WELCOME_INSERT)))
++ welcome_propagate(cptr, sptr, nameint, timestamp, who, "", flags);
++
++ /* correct end for local offset */
++ if (flags & WELCOME_LOCAL)
++ end += WELCOME_MAX_ENTRIES;
++
++ /* move entries up, update timestamp */
++ for (i = namearray; i < end; i++)
++ welcome_make(i, WelcomeArray[i+1].text, WelcomeArray[i+1].who, timestamp);
++
++ /* clear last entry, update timestamp */
++ welcome_make(end, "", who, timestamp);
++
++ return 0;
++}
++
++
++/** Insert a welcome message.
++ * @param[in] cptr Local client that sent us the welcome.
++ * @param[in] sptr Originator of the welcome.
++ * @param[in] nameint Name of the message.
++ * @param[in] namearray Array entry.
++ * @param[in] timestamp Timestamp of when the message was set.
++ * @param[in] who Who set this message.
++ * @param[in] text The welcome message.
++ * @param[in] flags Flags to set on welcome.
++ * @return Zero
++ */
++int
++welcome_insert(struct Client *cptr, struct Client *sptr, int nameint,
++ int namearray, time_t timestamp, char *who, char *text, unsigned int flags)
++{
++ char msg[BUFSIZE]; /* msg for logging */
++ int i; /* loop variable */
++ int empty = -1; /* first empty spot in array after arrayname */
++ int end = WELCOME_MAX_ENTRIES -1; /* last element to check in array */
++ int last = end; /* last welcome message to feed to welcome_unset */
++
++ /* debug */
++ Debug((DEBUG_DEBUG, "welcome_insert(\"%s\", \"%s\", %d, %d, %Tu, \"%s\", \"%s\", 0x%04x)",
++ cli_name(cptr), cli_name(sptr), nameint, namearray, timestamp, who, text, flags));
++
++ /* correct end for local offset */
++ if (flags & WELCOME_LOCAL)
++ end += WELCOME_MAX_ENTRIES;
++
++ /* find first empty spot */
++ for (i = namearray; i <= end; i++) {
++ if (*WelcomeArray[i].text == 0) {
++ empty = i;
++ break;
++ }
++ }
++
++ /* no empty spot, need to unset last */
++ if (empty == -1) {
++ welcome_unset(cptr, sptr, end, namearray, timestamp, who, flags);
++ empty = end;
++ }
++
++ /* move entries down, update timestamp */
++ for (i = empty; i > namearray; i--)
++ welcome_make(i, WelcomeArray[i-1].text, WelcomeArray[i-1].who, timestamp);
++
++ /* correct empty for local offset */
++ if (flags & WELCOME_LOCAL)
++ empty -= WELCOME_MAX_ENTRIES;
++
++ /* create msg for log */
++ if (nameint == empty)
++ ircd_snprintf(0, msg, 0, "moving %s WELCOME message %d one place down",
++ (flags & WELCOME_LOCAL) ? "local" : "global", nameint);
++ else
++ ircd_snprintf(0, msg, 0, "moving %s WELCOME message %d %s %d one place down",
++ (flags & WELCOME_LOCAL) ? "local" : "global", nameint, (empty - nameint > 1) ? "to" : "and" , empty);
++
++ /* log it */
++ welcome_log(sptr, msg, who, flags);
++
++ /* set it */
++ welcome_set(cptr, sptr, nameint, namearray, timestamp, who, text, flags);
++
++ return 0;
++}
++
++
+/** Change a welcome message.
+ * @param[in] cptr Local client that sent us the welcome.
+ * @param[in] sptr Originator of the welcome.
+ * @param[in] name Name of the message.
-+ * @param[in] text The welcome message.
+ * @param[in] timestamp Timestamp of when the message was set.
++ * @param[in] who Who set this message.
++ * @param[in] text The welcome message.
+ * @param[in] flags Flags to set on welcome.
+ * @return Zero
+ */
+int
-+welcome_do(struct Client *cptr, struct Client *sptr, char *name, char *text,
-+ char *who, time_t timestamp, unsigned int flags)
++welcome_do(struct Client *cptr, struct Client *sptr, char *name,
++ time_t timestamp, char *who, char *text, unsigned int flags)
+{
+ int nameint = atoi(name); /* transform to int */
+ int namearray = nameint - 1; /* used to test the array element */
-+ char oldtext[TOPICLEN + 1]; /* save old text when unsetting */
-+ static time_t rate;
++ int max = WELCOME_MAX_ENTRIES; /* max number of entries */
++ static time_t rate; /* rate limit snomask message */
+
+ assert(NULL != cptr);
+ assert(NULL != sptr);
+ assert(NULL != who);
+
+ /* debug */
-+ Debug((DEBUG_DEBUG, "welcome_do(\"%s\", \"%s\", \"%s\", \"%s\" \"%s\", %Tu, 0x%04x)",
-+ cli_name(cptr), cli_name(sptr), name, text, who, timestamp, flags));
++ Debug((DEBUG_DEBUG, "welcome_do(\"%s\", \"%s\", \"%s\", %Tu, \"%s\", \"%s\", 0x%04x)",
++ cli_name(cptr), cli_name(sptr), name, timestamp, who, text, flags));
++
++ /* name empty after taking off the prefixes? */
++ if (EmptyString(name)) {
++ if (IsUser(sptr))
++ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :WELCOME: No message number given", sptr);
++ else
++ protocol_violation(cptr, "WELCOME: No message number given by %C", sptr);
++ return 0;
++ }
+
+ /* check name */
-+ if (nameint < 1 || nameint > WELCOME_MAX_ENTRIES) {
++ if (!WelcomeIsValid(namearray)) {
+ if (IsUser(sptr))
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
+ "%C :WELCOME: Invalid message number %s - should between 1 and %d",
-+ sptr, name, WELCOME_MAX_ENTRIES);
++ sptr, name, max);
++ else {
++ protocol_violation(cptr, "WELCOME: Invalid message number %s from %C - should be between 1 and %d",
++ name, sptr, max);
++ /* nameint greater than max, perhaps we are upgrading, but used extra slots too soon?
++ * propagate it manually
++ * TODO: cant do announce here?
++ */
++ if (nameint > max && !(flags & WELCOME_LOCAL))
++ welcome_propagate(cptr, sptr, nameint, timestamp, who, text, flags);
++ }
+ return 0;
+ }
+
+ if (flags & WELCOME_LOCAL)
+ namearray += WELCOME_MAX_ENTRIES;
+
++ /* must be true by now */
++ assert(WelcomeIsValid(namearray));
++
+ /* cannot unset welcome that is not set */
+ if (WelcomeArray[namearray].timestamp == 0 && EmptyString(text)) {
+
+ if (WelcomeArray[namearray].timestamp != 0) {
+
+ /* global */
-+ if (namearray < WELCOME_MAX_ENTRIES) {
++ if (!(flags & WELCOME_LOCAL)) {
+
+ /* netburst and we got the same or a newer one
+ *
+ if (ircd_strcmp(text, WelcomeArray[namearray].text) == 0) {
+ if (IsUser(sptr))
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
-+ "%C :WELCOME: Cannot change %smessage for %s - nothing to change.",
-+ sptr, (flags & WELCOME_LOCAL) ? "local " : "", name);
++ "%C :WELCOME: Cannot change %s message for %s - nothing to change.",
++ sptr, (flags & WELCOME_LOCAL) ? "local" : "global", name);
+ return 0;
+ }
+ }
+
++ /* do not insert for last global/local entry and when not set yet */
++ if ((flags & WELCOME_INSERT) && ((WelcomeArray[namearray].timestamp == 0) || (nameint == max)))
++ flags &= ~WELCOME_INSERT;
++
+ /* TODO: rate limited for what? max 10 welcome messages..? */
+ /* possible timestamp drift - warn ops */
+ if (timestamp - TStime() > WELCOME_MAX_DRIFT) {
+ sptr, cli_user(sptr)->server, timestamp - TStime());
+ }
+
-+ /* unsetting - do not announce, save text */
++ /* unset */
+ if (EmptyString(text)) {
-+ flags &= ~WELCOME_ANNOUNCE;
-+ ircd_strncpy(oldtext, WelcomeArray[namearray].text, TOPICLEN);
-+ }
-+
-+ /* update */
-+ welcome_make(namearray, text, who, timestamp);
-+
-+ /* inform ops */
-+ 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),
-+ 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%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);
-+
-+ /* 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%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);
++ /* clear insert flag,
++ * when this flag is set, welcome_set() assumes it is being called from welcome_insert()
++ * and wont propagate the change
++ */
++ flags &= ~WELCOME_INSERT;
++ return welcome_unset(cptr, sptr, nameint, namearray, timestamp, who, flags);
+ }
+
-+ /* propagate it */
-+ if (!(flags & WELCOME_LOCAL))
-+ sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%d %Tu %s :%s",
-+ (flags & WELCOME_ANNOUNCE) ? "!" : "", nameint,
-+ WelcomeArray[namearray].timestamp, WelcomeArray[namearray].who,
-+ WelcomeArray[namearray].text);
-+
-+ /* announce it */
-+ if (flags & WELCOME_ANNOUNCE)
-+ welcome_announce(namearray);
++ /* insert */
++ if (flags & WELCOME_INSERT)
++ return welcome_insert(cptr, sptr, nameint, namearray, timestamp, who, text, flags);
+
-+ return 0;
++ /* new or change */
++ return welcome_set(cptr, sptr, nameint, namearray, timestamp, who, text, flags);
+}
+
+
+ struct MsgBuf *msgbuf;
+ int i;
+
-+ /* range 0 to 2 * max - 1 */
-+ assert(name >= 0 && name <= 2 * WELCOME_MAX_ENTRIES - 1);
++ /* valid range */
++ assert(WelcomeIsValid(name));
+
+ /* TODO: target is $* as if it were a global broadcast
+ * could make it $servername for local message announcement
+
+ assert(NULL != sptr);
+
-+ /* send header so the client knows what we are showing */
-+ send_reply(sptr, SND_EXPLICIT | RPL_STATSHEADER,
-+ "W Name Target Opername Timestamp :Message");
-+
+ /* loop over all entries - range 0 to 2 * max - 1*/
+ for (name = 0; name <= 2 * WELCOME_MAX_ENTRIES - 1; name++) {
+
projects / irc / quakenet / snircd-patchqueue.git / blobdiff