ircd/ircd_parser.y
add PRIV_LOCAL_WELCOME PRIV_WELCOME
-diff -r 5169dae4207d include/client.h
---- a/include/client.h Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/client.h Wed Feb 04 17:58:05 2009 +0100
-@@ -149,6 +149,8 @@
- PRIV_GLINE_LOOKUP, /* staff can use /GLINE to lookup a gline */
- PRIV_HIDE_CHANS, /* oper can set usermode +n */
- PRIV_CHECK_CHANNEL, /* staff can /CHECK #channel */
+diff -r 211f48754a7f 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 5169dae4207d include/handlers.h
---- a/include/handlers.h Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/handlers.h Wed Feb 04 17:58:05 2009 +0100
-@@ -154,6 +154,7 @@
+diff -r 211f48754a7f 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*[]);
-@@ -189,6 +190,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*[]);
-@@ -247,6 +249,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*[]);
-@@ -313,6 +316,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 5169dae4207d include/ircd_features.h
---- a/include/ircd_features.h Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/ircd_features.h Wed Feb 04 17:58:05 2009 +0100
+ extern int ms_xquery(struct Client*, struct Client*, int, char*[]);
+ extern int ms_xreply(struct Client*, struct Client*, int, char*[]);
+diff -r 211f48754a7f 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 5169dae4207d include/msg.h
---- a/include/msg.h Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/msg.h Wed Feb 04 17:58:05 2009 +0100
-@@ -200,6 +200,10 @@
+diff -r 211f48754a7f 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 5169dae4207d include/numeric.h
---- a/include/numeric.h Wed Feb 04 17:28:20 2009 +0100
-+++ b/include/numeric.h Wed Feb 04 17:58:05 2009 +0100
+diff -r 211f48754a7f 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 5169dae4207d include/welcome.h
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h Wed Feb 04 17:58:05 2009 +0100
-@@ -0,0 +1,60 @@
+diff -r 211f48754a7f include/welcome.h
+--- /dev/null
++++ b/include/welcome.h
+@@ -0,0 +1,63 @@
+#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
+ */
+/* 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);
++ char *who, time_t timestamp, unsigned int flags, int insert);
+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 5169dae4207d ircd/Makefile.in
---- a/ircd/Makefile.in Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/Makefile.in Wed Feb 04 17:58:05 2009 +0100
-@@ -188,6 +188,7 @@
+diff -r 211f48754a7f ircd/Makefile.in
+--- a/ircd/Makefile.in
++++ b/ircd/Makefile.in
+@@ -186,6 +186,7 @@
m_wallops.c \
m_wallusers.c \
m_wallvoices.c \
whocmds.c \
whowas.c \
y.tab.c
-@@ -1180,6 +1182,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 \
-@@ -1441,6 +1448,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 5169dae4207d ircd/client.c
---- a/ircd/client.c Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/client.c Wed Feb 04 17:58:05 2009 +0100
-@@ -184,6 +184,7 @@
+diff -r 211f48754a7f 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);
- FlagClr(&privs_local, PRIV_STAFF);
- FlagClr(&privs_local, PRIV_CLAIM_NICK);
- FlagClr(&privs_local, PRIV_GLINE_LOOKUP);
-@@ -264,6 +265,7 @@
+
+ privs_defaults_set = 1;
+ }
+@@ -223,6 +224,7 @@
+ ClrPriv(client, PRIV_JUPE);
ClrPriv(client, PRIV_OPMODE);
- ClrPriv(client, PRIV_OPKICK);
ClrPriv(client, PRIV_BADCHAN);
+ ClrPriv(client, PRIV_WELCOME);
}
}
-@@ -289,6 +291,7 @@
- P(USER_PRIVACY),
- P(STAFF), P(CLAIM_NICK), P(GLINE_LOOKUP), P(HIDE_CHANS),
- P(CHECK_CHANNEL),
-+ P(WELCOME), P(LOCAL_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 5169dae4207d ircd/ircd_features.c
---- a/ircd/ircd_features.c Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/ircd_features.c Wed Feb 04 17:58:05 2009 +0100
-@@ -355,6 +355,7 @@
+diff -r 211f48754a7f 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 5169dae4207d ircd/ircd_lexer.l
---- a/ircd/ircd_lexer.l Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/ircd_lexer.l Wed Feb 04 17:58:05 2009 +0100
-@@ -173,6 +173,8 @@
- { "gline_lookup", TPRIV_GLINE_LOOKUP },
- { "hide_chans", TPRIV_HIDE_CHANS },
- { "check_channel", TPRIV_CHECK_CHANNEL },
+diff -r 211f48754a7f 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 5169dae4207d ircd/ircd_parser.y
---- a/ircd/ircd_parser.y Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/ircd_parser.y Wed Feb 04 17:58:05 2009 +0100
-@@ -192,6 +192,7 @@
- %token TPRIV_CHANNEL_PRIVACY TPRIV_USER_PRIVACY TPRIV_LIST_CHAN
- %token TPRIV_STAFF TPRIV_CLAIM_NICK TPRIV_GLINE_LOOKUP TPRIV_HIDE_CHANS
- %token TPRIV_CHECK_CHANNEL
+diff -r 211f48754a7f 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
-@@ -713,6 +714,8 @@
- TPRIV_GLINE_LOOKUP { $$ = PRIV_GLINE_LOOKUP; } |
- TPRIV_CHECK_CHANNEL { $$ = PRIV_CHECK_CHANNEL; } |
- TPRIV_HIDE_CHANS { $$ = PRIV_HIDE_CHANS; } |
+@@ -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 5169dae4207d ircd/m_welcome.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Wed Feb 04 17:58:05 2009 +0100
-@@ -0,0 +1,308 @@
+diff -r 211f48754a7f 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
+ /* 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)
-+ return welcome_list(sptr, 0);
-+
+ /* 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;
++ 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);
-+ }
+
+ /* check PRIVS */
+ /* local - need PRIV LOCAL_WELCOME or WELCOME */
+ 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, text, who, timestamp, flags, 0);
+}
+
+
+
+ /* 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, text, who, timestamp, flags, 0);
+}
-diff -r 5169dae4207d ircd/parse.c
---- a/ircd/parse.c Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/parse.c Wed Feb 04 17:58:05 2009 +0100
-@@ -674,6 +674,15 @@
- /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
- { m_unregistered, m_not_oper, ms_opkick, mo_opkick, m_ignore, mh_nohelp }
+diff -r 211f48754a7f 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 5169dae4207d ircd/s_err.c
---- a/ircd/s_err.c Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/s_err.c Wed Feb 04 17:58:05 2009 +0100
+diff -r 211f48754a7f 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 5169dae4207d ircd/s_serv.c
---- a/ircd/s_serv.c Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/s_serv.c Wed Feb 04 17:58:05 2009 +0100
+diff -r 211f48754a7f 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 5169dae4207d ircd/s_stats.c
---- a/ircd/s_stats.c Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/s_stats.c Wed Feb 04 17:58:05 2009 +0100
+diff -r 211f48754a7f 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 5169dae4207d ircd/s_user.c
---- a/ircd/s_user.c Wed Feb 04 17:28:20 2009 +0100
-+++ b/ircd/s_user.c Wed Feb 04 17:58:05 2009 +0100
+diff -r 211f48754a7f 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 */
-@@ -413,6 +414,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 5169dae4207d ircd/welcome.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c Wed Feb 04 17:58:05 2009 +0100
-@@ -0,0 +1,373 @@
+diff -r 211f48754a7f ircd/welcome.c
+--- /dev/null
++++ b/ircd/welcome.c
+@@ -0,0 +1,465 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ assert(name >= 0 && name <= 2 * WELCOME_MAX_ENTRIES - 1);
+
+ /* 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;
+
+ * @param[in] sptr Originator of the welcome.
+ * @param[in] name Name of the message.
+ * @param[in] text The welcome message.
++ * @param[in] who Who set this message.
+ * @param[in] timestamp Timestamp of when the message was set.
+ * @param[in] flags Flags to set on welcome.
++ * @param[in] insert Non-zero do not propagate change (welcome_insert)
+ * @return Zero
+ */
+int
+welcome_do(struct Client *cptr, struct Client *sptr, char *name, char *text,
-+ char *who, time_t timestamp, unsigned int flags)
++ char *who, time_t timestamp, unsigned int flags, int insert)
+{
+ 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;
++ char oldtext[WELCOMELEN + 1]; /* save old text when unsetting */
++ char msg[BUFSIZE]; /* msg for snomask, logging, etc. */
++ 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\", \"%s\" \"%s\", %Tu, 0x%04x, %d)",
++ cli_name(cptr), cli_name(sptr), name, text, who, timestamp, flags, insert));
+
+ /* check name */
+ if (nameint < 1 || nameint > WELCOME_MAX_ENTRIES) {
+ 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, WELCOME_MAX_ENTRIES);
++ else
++ protocol_violation(cptr, "WELCOME: Invalid message number %s from %C", name, sptr);
+ return 0;
+ }
+
+ 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;
+ }
+ }
+ sptr, cli_user(sptr)->server, timestamp - TStime());
+ }
+
-+ /* unsetting - do not announce, save text */
++ /* unsetting - do not announce, do not insert, save text */
+ if (EmptyString(text)) {
+ flags &= ~WELCOME_ANNOUNCE;
-+ ircd_strncpy(oldtext, WelcomeArray[namearray].text, TOPICLEN);
++ flags &= ~WELCOME_INSERT;
++ ircd_strncpy(oldtext, WelcomeArray[namearray].text, WELCOMELEN);
+ }
+
++ /* make space if needed */
++ if (flags & WELCOME_INSERT)
++ welcome_insert(cptr, sptr, name, nameint, namearray, who, timestamp, flags);
++
+ /* 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),
++ /* create msg for snomask, logging, etc. */
++ ircd_snprintf(0, msg, 0, "%s%s%s WELCOME %d \"%s\" [%Tu]",
+ EmptyString(text) ? "unsetting" : "changing",
+ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
-+ (flags & WELCOME_LOCAL) ? "local " : "",
++ (flags & WELCOME_LOCAL) ? "local" : "global",
+ nameint,
+ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
+ WelcomeArray[namearray].timestamp);
+
++ /* 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%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);
++ log_write(LS_NETWORK, L_INFO, LOG_NOSNOTICE, "%#C (%s) %s",
++ sptr, WelcomeArray[namearray].who, msg);
+
+ /* 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);
++ 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%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);
++ sendwallto_group_butone(&me, WALL_WALLOPS, 0, "%s %s", get_client_name_and_opername(sptr), msg);
+ }
+
+ /* propagate it */
-+ if (!(flags & WELCOME_LOCAL))
-+ sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%d %Tu %s :%s",
-+ (flags & WELCOME_ANNOUNCE) ? "!" : "", nameint,
++ if (!(flags & WELCOME_LOCAL) && !insert)
++ sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%s%d %Tu %s :%s",
++ (flags & WELCOME_ANNOUNCE) ? "!" : "", (flags & WELCOME_INSERT) ? "+" : "", nameint,
+ WelcomeArray[namearray].timestamp, WelcomeArray[namearray].who,
+ WelcomeArray[namearray].text);
+
+}
+
+
++/** 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] nameint Name of the message.
++ * @param[in] namearray Array entry.
++ * @param[in] who Who set this message.
++ * @param[in] timestamp Timestamp of when the message was set.
++ * @param[in] flags Flags to set on welcome.
++ * @return Zero
++ */
++int
++welcome_insert(struct Client *cptr, struct Client *sptr, char *name, int nameint,
++ int namearray, char *who, time_t timestamp, unsigned int flags)
++{
++ char *text = ""; /* empty text to clear to feed to welcome_do */
++ char *last = "10"; /* last welcome message to feed to welcome_do */
++ char msg[BUFSIZE]; /* msg for snomask, logging, etc. */
++ unsigned int newflags = flags; /* new flags to feed back to welcome_do */
++ int i; /* loop variable */
++ int empty = -1; /* first empty spot array after arrayname */
++ int end = WELCOME_MAX_ENTRIES -1; /* last element to check in array */
++
++ assert(NULL != cptr);
++ assert(NULL != sptr);
++ assert(flags & WELCOME_INSERT);
++ assert(namearray >= 0 && namearray <= 2 * WELCOME_MAX_ENTRIES - 1);
++
++ /* debug */
++ Debug((DEBUG_DEBUG, "welcome_insert(\"%s\", \"%s\", \"%s\", %d, %d, \"%s\", %Tu, 0x%04x)",
++ cli_name(cptr), cli_name(sptr), name, nameint, namearray, who, timestamp, flags));
++
++ /* not set yet, do not insert */
++ if (WelcomeArray[namearray].timestamp == 0)
++ return 0;
++
++ /* last global entry */
++ if (!(flags & WELCOME_LOCAL) && (nameint == WELCOME_MAX_ENTRIES))
++ return 0;
++
++ /* last local entry */
++ if ((flags & WELCOME_LOCAL) && (nameint == 2 * WELCOME_MAX_ENTRIES))
++ return 0;
++
++ /* correct end for local offset */
++ if (flags & WELCOME_LOCAL)
++ end += WELCOME_MAX_ENTRIES;
++
++ /* found first empty spot */
++ for (i = namearray; i <= end; i++) {
++ if (*WelcomeArray[i].text == 0) {
++ empty = i;
++ break;
++ }
++ }
++
++ /* no empty spot, need to unset last, do not insert or announce */
++ if (empty == -1) {
++ newflags &= ~WELCOME_INSERT;
++ newflags &= ~WELCOME_ANNOUNCE;
++ welcome_do(cptr, sptr, last, text, who, timestamp, newflags, 1);
++ empty = end;
++ }
++
++ /* move entries down */
++ for (i = empty; i > namearray; i--)
++ welcome_make(i, WelcomeArray[i-1].text, WelcomeArray[i-1].who, WelcomeArray[i-1].timestamp);
++
++ /* correct empty for local offset */
++ if (flags & WELCOME_LOCAL)
++ empty -= WELCOME_MAX_ENTRIES;
++
++ /* create msg for snomask, logging, etc. */
++ 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);
++
++ /* 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 set by remote user, inform oper */
++ 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;
++}
++
++
+/** Announce a welcome message to local clients.
+ * @param[in] name Welcome message to announce.
+ */
+
+ 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