ircd/ircd_parser.y
add PRIV_LOCAL_WELCOME PRIV_WELCOME
-diff -r 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f include/welcome.h
+diff -r a9b437e961ec include/welcome.h
--- /dev/null
+++ b/include/welcome.h
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,75 @@
+#ifndef INCLUDED_welcome_h
+#define INCLUDED_welcome_h
+/*
+#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)
++/* Test if a welcome entry is set */
++#define WelcomeIsSet(x) (WelcomeArray[(x)].timestamp > 0)
++/* Test if a welcome entry is empty */
++#define WelcomeIsEmpty(x) (*WelcomeArray[(x)].text == 0)
++
++/* Get welcome timestamp */
++#define WelcomeTS(x) (WelcomeArray[(x)].timestamp)
++/* Get welcome text */
++#define WelcomeText(x) (WelcomeArray[(x)].text)
++/* Get welcome who info */
++#define WelcomeWho(x) (WelcomeArray[(x)].who)
++
+
+/* Describes a Welcome message entry. */
+struct Welcome {
+#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 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f ircd/m_welcome.c
+diff -r a9b437e961ec ircd/m_welcome.c
--- /dev/null
+++ b/ircd/m_welcome.c
-@@ -0,0 +1,284 @@
+@@ -0,0 +1,296 @@
+/*
+ * IRC - Internet Relay Chat, ircd/m_welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ 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);
+}
+
+
+ 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);
+}
-diff -r 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f 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 211f48754a7f ircd/welcome.c
+diff -r a9b437e961ec ircd/welcome.c
--- /dev/null
+++ b/ircd/welcome.c
-@@ -0,0 +1,371 @@
+@@ -0,0 +1,611 @@
+/*
+ * 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));
++ assert(NULL != sptr);
++ assert(NULL != cptr);
++
++ 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;
++}
++
++
++/** Resend a welcome message.
++ * @param[in] cptr Local client that sent us the welcome.
++ * @param[in] nameint Name of the message.
++ * @param[in] namearray Name of the array item.
++ * @return Zero
++ */
++int
++welcome_resend(struct Client *cptr, int nameint, int namearray)
++{
++ /* must be valid */
++ assert(WelcomeIsValid(namearray));
++ assert(NULL != cptr);
++ assert(IsServer(cptr));
++
++ sendcmdto_one(&me, CMD_WELCOME, cptr, "* %d %Tu %s :%s",
++ nameint, WelcomeTS(namearray), WelcomeWho(namearray), WelcomeText(namearray));
++
++ return 0;
++}
++
++
++/** Log a welcome message.
++ * @param[in] sptr Originator of the welcome.
++ * @param[in] msg The message to show.
++ * @param[in] flags Flags to set on welcome.
++ * @return Zero
++ */
++int
++welcome_log(struct Client *sptr, char *msg, unsigned int flags)
++{
++ assert(NULL != sptr);
++ assert(NULL != msg);
++
++ /* 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, "%s %s", get_client_name_and_opername(sptr), 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 (WelcomeIsEmpty(namearray))
++ new = 1;
++
++ /* update */
++ welcome_make(namearray, text, who, timestamp);
++
++ /* create msg for log */
++ ircd_snprintf(0, msg, 0, "%s%s%s WELCOME %d \"%s\" %s [%Tu]",
++ new ? "setting" : "changing",
++ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
++ (flags & WELCOME_LOCAL) ? "local" : "global",
++ nameint, WelcomeText(namearray), WelcomeWho(namearray), timestamp);
++
++ /* log it */
++ welcome_log(sptr, msg, 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 */
++ int i; /* loop variable */
++ int empty = namearray; /* first empty spot in array after namearray */
++ 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));
++
++ /* create msg for log */
++ ircd_snprintf(0, msg, 0, "unsetting %s WELCOME %d \"%s\" %s [%Tu]",
++ (flags & WELCOME_LOCAL) ? "local" : "global",
++ nameint, WelcomeText(namearray), WelcomeWho(namearray), timestamp);
++
++ /* log it */
++ welcome_log(sptr, msg, flags);
++
++ /* update */
++ welcome_make(namearray, "", who, timestamp);
++
++ /* 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, WelcomeText(i+1), WelcomeWho(i+1), 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 namearray */
++ 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 (WelcomeIsEmpty(i)) {
++ 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, WelcomeText(i-1), WelcomeWho(i-1), 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, 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 */
+
+ 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));
++
++ /* if for some reason timestamp is 0, increase it */
++ if (timestamp == 0)
++ timestamp++;
++
++ /* 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);
-+ else
-+ protocol_violation(cptr, "WELCOME: Invalid message number %s from %C", name, sptr);
++ sptr, name, max);
++ else
++ protocol_violation(cptr,
++ "WELCOME: Invalid message number %s from %C - should be between 1 and %d",
++ name, sptr, max);
++ return 0;
++ }
++
++ /* source is user, and is myuser or welcome is local, check length of the message */
++ if ((IsUser(sptr)) && ((MyUser(sptr)) || (flags & WELCOME_LOCAL)) && (strlen(text) > WELCOMELEN)) {
++ sendcmdto_one(&me, CMD_NOTICE, sptr,
++ "%C :WELCOME: The message is too long with %d chars - max is %d chars",
++ sptr, strlen(text), WELCOMELEN);
++ ircd_strncpy(text, text, WELCOMELEN);
++ sendcmdto_one(&me, CMD_NOTICE, sptr,
++ "%C :WELCOME: Change or truncate the message to: \"%s\"", sptr, text);
+ 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 (!WelcomeIsSet(namearray) && EmptyString(text)) {
+
+ /* from user, throw error */
+ if (IsUser(sptr))
+
+ /* check if there is something to change */
+ /* we got a record for it */
-+ if (WelcomeArray[namearray].timestamp != 0) {
++ if (WelcomeIsSet(namearray)) {
+
+ /* global */
+ if (!(flags & WELCOME_LOCAL)) {
+
-+ /* 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
++ /* myuser changes it,
++ * welcomeTS greater than or equal to timestamp, take welcomeTS+1 as timestamp
++ * else the change is not accepted upstream because of the older TS
+ */
-+ if (IsBurstOrBurstAck(cptr) && timestamp <= WelcomeArray[namearray].timestamp)
-+ return 0;
++ if (MyUser(sptr) && WelcomeTS(namearray) >= timestamp)
++ timestamp = WelcomeTS(namearray) +1;
++
++ /* compare timestamps, ignore welcome when:
++ * we got a newer one
++ * or when timestamps are the same
++ * our text is shorter or our text is 'smaller'
++ */
++ if ((timestamp < WelcomeTS(namearray)) || /* we got a newer one */
++ ((timestamp == WelcomeTS(namearray)) && /* same timestamp */
++ ((strlen(WelcomeText(namearray)) < strlen(text)) || /* our text is shorter */
++ (ircd_strcmp(WelcomeText(namearray), text) < 0)))) { /* our text is 'smaller' */
++ /* burst or burst ack, cptr gets our version from the burst */
++ if (IsBurstOrBurstAck(cptr))
++ return 0;
++ /* sync server */
++ return welcome_resend(cptr, nameint, namearray);
++ }
+
+ /* local welcome - we use our idea of the time */
+ } else
+ timestamp = TStime();
+
-+ /* compare new message with old message */
-+ if (ircd_strcmp(text, WelcomeArray[namearray].text) == 0) {
-+ if (IsUser(sptr))
++ /* new global welcome from my user or local welcome
++ * compare new message with old message
++ */
++ if (IsUser(sptr) && (MyUser(sptr) || (flags & WELCOME_LOCAL))) {
++ if (ircd_strcmp(text, WelcomeText(namearray)) == 0) {
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
-+ "%C :WELCOME: Cannot change %s message for %s - nothing to change.",
++ "%C :WELCOME: Cannot change %s message for %s - nothing to change",
+ sptr, (flags & WELCOME_LOCAL) ? "local" : "global", name);
-+ return 0;
++ return 0;
++ }
+ }
+ }
+
-+ /* 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());
++ /* do not insert for last global/local entry and when not set yet */
++ if ((flags & WELCOME_INSERT) && ((!WelcomeIsSet(namearray)) || (nameint == max)))
++ flags &= ~WELCOME_INSERT;
+
-+ /* 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 */
++ /* 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%s WELCOME %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" : "global",
-+ nameint,
-+ EmptyString(text) ? oldtext : WelcomeArray[namearray].text,
-+ WelcomeArray[namearray].timestamp);
-+
-+ /* log it */
-+ log_write(LS_NETWORK, L_INFO, LOG_NOSNOTICE, "%#C (%s) %s%s%s WELCOME %d \"%s\" [%Tu]",
-+ sptr, WelcomeArray[namearray].who,
-+ EmptyString(text) ? "unsetting" : "changing",
-+ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
-+ (flags & WELCOME_LOCAL) ? "local" : "global",
-+ 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_unset() 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, set and not empty */
++ assert(WelcomeIsValid(name));
++ assert(WelcomeIsSet(name));
++ assert(!WelcomeIsEmpty(name));
+
+ /* TODO: target is $* as if it were a global broadcast
+ * could make it $servername for local message announcement
+ /* build msgbuf */
+ msgbuf = msgq_make(0, ":%C %s $* :[%s] %s", &me, MSG_NOTICE,
+ name >= WELCOME_MAX_ENTRIES ? cli_name(&me) : feature_str(FEAT_NETWORK),
-+ WelcomeArray[name].text);
++ WelcomeText(name));
+
+ /* go over local clients */
+ for (i = HighestFd; i > 0; --i) {
+
-+ /* skip unregistered clients - they see the message during login
-+ * skip servers
-+ */
++ /* skip unregistered clients, skip servers */
+ if (!(acptr = LocalClientArray[i]) || !IsRegistered(acptr) || IsServer(acptr))
+ continue;
+
+
+ /* loop over global entries - 0 to max - 1*/
+ for (name = 0; name <= WELCOME_MAX_ENTRIES - 1; name++) {
-+ if (WelcomeArray[name].timestamp != 0)
++ if (WelcomeIsSet(name))
+ sendcmdto_one(&me, CMD_WELCOME, cptr, "* %d %Tu %s :%s",
-+ name + 1, WelcomeArray[name].timestamp, WelcomeArray[name].who,
-+ WelcomeArray[name].text);
++ name + 1, WelcomeTS(name), WelcomeWho(name), WelcomeText(name));
+ }
+}
+
+ local = 1;
+
+ /* not set or empty - skip */
-+ /* TODO: EmptyString? */
-+ if (WelcomeArray[name].timestamp == 0 || *WelcomeArray[name].text == 0)
++ if (!WelcomeIsSet(name) || WelcomeIsEmpty(name))
+ continue;
+
+ /* got one */
+ found++;
+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :[%s] %s",
-+ sptr, local ? cli_name(&me) : feature_str(FEAT_NETWORK), WelcomeArray[name].text);
++ sptr, local ? cli_name(&me) : feature_str(FEAT_NETWORK), WelcomeText(name));
+ }
+
+ /* nothing set */
+ local = 1;
+
+ /* not set */
-+ if (WelcomeArray[name].timestamp == 0)
++ if (!WelcomeIsSet(name))
+ continue;
+
+ /* send it */
+ send_reply(sptr, RPL_STATSWELCOME,
+ local ? name + 1 - WELCOME_MAX_ENTRIES : name + 1,
+ local ? cli_name(&me) : "*",
-+ WelcomeArray[name].who, WelcomeArray[name].timestamp,
-+ EmptyString(WelcomeArray[name].text) ? "<Empty>" : WelcomeArray[name].text);
++ WelcomeWho(name), WelcomeTS(name),
++ WelcomeIsEmpty(name) ? "<Empty>" : WelcomeText(name));
+ }
+}
projects / irc / quakenet / snircd-patchqueue.git / blobdiff