ircd/ircd_parser.y
add PRIV_LOCAL_WELCOME PRIV_WELCOME
-diff -r 4676d2565f9b include/client.h
+diff -r a9b437e961ec include/client.h
--- a/include/client.h
+++ b/include/client.h
@@ -142,6 +142,8 @@
PRIV_LAST_PRIV /**< number of privileges */
};
-diff -r 4676d2565f9b include/handlers.h
+diff -r a9b437e961ec include/handlers.h
--- a/include/handlers.h
+++ b/include/handlers.h
@@ -138,6 +138,7 @@
extern int ms_whois(struct Client*, struct Client*, int, char*[]);
extern int ms_xquery(struct Client*, struct Client*, int, char*[]);
extern int ms_xreply(struct Client*, struct Client*, int, char*[]);
-diff -r 4676d2565f9b include/ircd_features.h
+diff -r a9b437e961ec include/ircd_features.h
--- a/include/ircd_features.h
+++ b/include/ircd_features.h
@@ -101,6 +101,7 @@
FEAT_HIS_STATS_w,
FEAT_HIS_STATS_x,
FEAT_HIS_STATS_y,
-diff -r 4676d2565f9b include/msg.h
+diff -r a9b437e961ec include/msg.h
--- a/include/msg.h
+++ b/include/msg.h
@@ -196,6 +196,10 @@
#define MSG_WALLCHOPS "WALLCHOPS" /* WC */
#define TOK_WALLCHOPS "WC"
#define CMD_WALLCHOPS MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r 4676d2565f9b include/numeric.h
+diff -r a9b437e961ec include/numeric.h
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -116,6 +116,7 @@
#define ERR_SILELISTFULL 511 /* Undernet extension */
/* ERR_NOTIFYFULL 512 aircd */
/* ERR_TOOMANYWATCH 512 Numeric List: Dalnet */
-diff -r 4676d2565f9b include/welcome.h
+diff -r a9b437e961ec include/welcome.h
--- /dev/null
+++ b/include/welcome.h
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,66 @@
+#ifndef INCLUDED_welcome_h
+#define INCLUDED_welcome_h
+/*
+ */
+#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 */
+extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
+
+#endif /* INCLUDED_welcome_h */
-diff -r 4676d2565f9b ircd/Makefile.in
+diff -r a9b437e961ec ircd/Makefile.in
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -186,6 +186,7 @@
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 4676d2565f9b ircd/client.c
+diff -r a9b437e961ec ircd/client.c
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -177,6 +177,7 @@
#undef P
{ 0, 0 }
};
-diff -r 4676d2565f9b ircd/ircd_features.c
+diff -r a9b437e961ec ircd/ircd_features.c
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -366,6 +366,7 @@
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 4676d2565f9b ircd/ircd_lexer.l
+diff -r a9b437e961ec ircd/ircd_lexer.l
--- a/ircd/ircd_lexer.l
+++ b/ircd/ircd_lexer.l
@@ -166,6 +166,8 @@
{ NULL, 0 }
};
static int ntokens;
-diff -r 4676d2565f9b ircd/ircd_parser.y
+diff -r a9b437e961ec ircd/ircd_parser.y
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -189,6 +189,7 @@
TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
yesorno: YES { $$ = 1; } | NO { $$ = 0; };
-diff -r 4676d2565f9b ircd/m_welcome.c
+diff -r a9b437e961ec ircd/m_welcome.c
--- /dev/null
+++ b/ircd/m_welcome.c
@@ -0,0 +1,296 @@
+ /* and do it */
+ return welcome_do(cptr, sptr, name, timestamp, who, text, flags);
+}
-diff -r 4676d2565f9b ircd/parse.c
+diff -r a9b437e961ec ircd/parse.c
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -661,6 +661,15 @@
/* 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 4676d2565f9b ircd/s_err.c
+diff -r a9b437e961ec ircd/s_err.c
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -486,7 +486,7 @@
/* 510 */
{ 0 },
/* 511 */
-diff -r 4676d2565f9b ircd/s_serv.c
+diff -r a9b437e961ec ircd/s_serv.c
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -57,6 +57,7 @@
/*
* Pass on my client information to the new server
-diff -r 4676d2565f9b ircd/s_stats.c
+diff -r a9b437e961ec ircd/s_stats.c
--- a/ircd/s_stats.c
+++ b/ircd/s_stats.c
@@ -54,6 +54,7 @@
{ 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
stats_meminfo, 0,
"List usage information." },
-diff -r 4676d2565f9b ircd/s_user.c
+diff -r a9b437e961ec ircd/s_user.c
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -63,6 +63,7 @@
}
else {
struct Client *acptr = user->server;
-diff -r 4676d2565f9b ircd/welcome.c
+diff -r a9b437e961ec ircd/welcome.c
--- /dev/null
+++ b/ircd/welcome.c
@@ -0,0 +1,582 @@
+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, WELCOMELEN);
+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",
+}
+
+
++/** 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.
+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 snomask, logging, etc. */
++ char msg[BUFSIZE]; /* msg for logging */
+ int new = 0;
+
+ /* debug */
+ /* update */
+ welcome_make(namearray, text, who, timestamp);
+
-+ /* create msg for snomask, logging, etc. */
++ /* 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);
+
-+ /* 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 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);
-+ }
++ welcome_log(sptr, msg, who, flags);
+
+ /* propagate it */
+ if (!(flags & WELCOME_LOCAL))
+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 snomask, logging, etc. */
-+ char text[WELCOMELEN + 1]; /* save old text */
++ 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)",
+ /* update */
+ welcome_make(namearray, "", who, timestamp);
+
-+ /* create msg for snomask, logging, etc. */
++ /* create msg for log */
+ ircd_snprintf(0, msg, 0, "unsetting %s WELCOME %d \"%s\" [%Tu]",
+ (flags & WELCOME_LOCAL) ? "local" : "global", nameint, text, 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", sptr, 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",
-+ 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);
-+ }
++ 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;
+}
+
+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 snomask, logging, etc. */
++ 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 */
+ 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));
+
-+ /* 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 */
++ /* find first empty spot */
+ for (i = namearray; i <= end; i++) {
+ if (*WelcomeArray[i].text == 0) {
+ empty = i;
+ if (flags & WELCOME_LOCAL)
+ empty -= WELCOME_MAX_ENTRIES;
+
-+ /* create msg for snomask, logging, etc. */
++ /* 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);
+ 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);
-+ }
++ welcome_log(sptr, msg, who, flags);
+
+ /* set it */
+ welcome_set(cptr, sptr, nameint, namearray, timestamp, who, text, flags);
+{
+ int nameint = atoi(name); /* transform to int */
+ int namearray = nameint - 1; /* used to test the array element */
++ int max = WELCOME_MAX_ENTRIES; /* max number of entries */
+ static time_t rate; /* rate limit snomask message */
+
+ assert(NULL != cptr);
+ }
+
+ /* 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, WELCOME_MAX_ENTRIES);
-+ /* nameint greater than MAX, perhaps we are upgrading, but used extra slots too soon?
++ 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 > WELCOME_MAX_ENTRIES && !(flags & WELCOME_LOCAL))
++ if (nameint > max && !(flags & WELCOME_LOCAL))
+ welcome_propagate(cptr, sptr, nameint, timestamp, who, text, flags);
+ }
+ return 0;
+ namearray += WELCOME_MAX_ENTRIES;
+
+ /* must be true by now */
-+ assert(namearray >= 0 && namearray <= 2 * WELCOME_MAX_ENTRIES - 1);
++ assert(WelcomeIsValid(namearray));
+
+ /* cannot unset welcome that is not set */
+ if (WelcomeArray[namearray].timestamp == 0 && EmptyString(text)) {
+ }
+ }
+
++ /* 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) {
+
+ /* unset */
+ if (EmptyString(text)) {
++ /* 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);
+ }
+ 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
projects / irc / quakenet / snircd-patchqueue.git / blobdiff