ircd/ircd_parser.y
add PRIV_LOCAL_WELCOME PRIV_WELCOME
-diff -r a9b437e961ec include/client.h
+diff -r 8c7c9ff0f0ca include/client.h
--- a/include/client.h
+++ b/include/client.h
@@ -142,6 +142,8 @@
PRIV_LAST_PRIV /**< number of privileges */
};
-diff -r a9b437e961ec include/handlers.h
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec include/ircd_features.h
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec include/msg.h
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec include/numeric.h
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec include/welcome.h
+diff -r 8c7c9ff0f0ca include/welcome.h
--- /dev/null
+++ b/include/welcome.h
-@@ -0,0 +1,78 @@
+@@ -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)
++#define WelcomeIsValid(x) ((unsigned) (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 */
+extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
+
+#endif /* INCLUDED_welcome_h */
-diff -r a9b437e961ec ircd/Makefile.in
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec ircd/client.c
+diff -r 8c7c9ff0f0ca ircd/client.c
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -177,6 +177,7 @@
#undef P
{ 0, 0 }
};
-diff -r a9b437e961ec ircd/ircd_features.c
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec ircd/ircd_lexer.l
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec ircd/ircd_parser.y
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec ircd/m_welcome.c
+diff -r 8c7c9ff0f0ca ircd/m_welcome.c
--- /dev/null
+++ b/ircd/m_welcome.c
-@@ -0,0 +1,296 @@
+@@ -0,0 +1,292 @@
+/*
+ * IRC - Internet Relay Chat, ircd/m_welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+ flags |= WELCOME_LOCAL;
+ }
+
-+ /* TODO: disallow global announcement from oper?
-+ * as PRIVMSG/NOTICE to $* is not allowed either by the ircd
-+ * when PRIV for that is added, use that here? PRIV_BROADCAST or something
-+ *
-+ * change prefix to $ ?
-+ */
+ /* check for anounce prefix */
-+ if (*name == '!') {
++ if (*name == '$') {
+ name++;
-+ flags |= WELCOME_ANNOUNCE;
++ /* only allow announce by oper for local welcome */
++ if (flags & WELCOME_LOCAL)
++ flags |= WELCOME_ANNOUNCE;
+ }
+
+ /* check for insert prefix */
+ }
+
+ /* check for anounce prefix */
-+ if (*name == '!') {
++ if (*name == '$') {
+ name++;
+ flags |= WELCOME_ANNOUNCE;
+ }
+ /* and do it */
+ return welcome_do(cptr, sptr, name, timestamp, who, text, flags);
+}
-diff -r a9b437e961ec ircd/parse.c
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec ircd/s_err.c
+diff -r 8c7c9ff0f0ca ircd/s_err.c
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -486,7 +486,7 @@
/* 510 */
{ 0 },
/* 511 */
-diff -r a9b437e961ec ircd/s_serv.c
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec ircd/s_stats.c
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec ircd/s_user.c
+diff -r 8c7c9ff0f0ca 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 a9b437e961ec ircd/welcome.c
+diff -r 8c7c9ff0f0ca ircd/welcome.c
--- /dev/null
+++ b/ircd/welcome.c
-@@ -0,0 +1,594 @@
+@@ -0,0 +1,609 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+{
+ /* 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) ? "+" : "",
++ (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.
+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",
+ new ? "setting" : "changing",
+ (flags & WELCOME_ANNOUNCE) ? " and announcing " : " ",
+ (flags & WELCOME_LOCAL) ? "local" : "global",
-+ nameint, text, who, timestamp);
++ nameint, WelcomeText(namearray), WelcomeWho(namearray), timestamp);
+
+ /* log it */
+ welcome_log(sptr, msg, flags);
+ 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 namearray */
+ int end = WELCOME_MAX_ENTRIES -1; /* last element to check in array */
+ 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, WelcomeText(namearray), WELCOMELEN);
-+
-+ /* update */
-+ welcome_make(namearray, "", who, timestamp);
-+
+ /* create msg for log */
+ ircd_snprintf(0, msg, 0, "unsetting %s WELCOME %d \"%s\" %s [%Tu]",
-+ (flags & WELCOME_LOCAL) ? "local" : "global", nameint, text, who, timestamp);
++ (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);
+ 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);
+ assert(NULL != sptr);
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
+ "%C :WELCOME: Invalid message number %s - should between 1 and %d",
+ sptr, name, max);
-+ else {
-+ protocol_violation(cptr, "WELCOME: Invalid message number %s from %C - should be between 1 and %d",
++ 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;
+ }
+
+ /* 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 <= WelcomeTS(namearray))
-+ 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 and our text is 'smaller'
++ */
++ if ((timestamp < WelcomeTS(namearray)) || /* we got a newer one */
++ ((timestamp == WelcomeTS(namearray)) && /* same timestamp */
++ (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, WelcomeText(namearray)) == 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;
++ }
+ }
+ }
+
+ if ((flags & WELCOME_INSERT) && ((!WelcomeIsSet(namearray)) || (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) {
-+ sendto_opmask_butone_ratelimited(0, SNO_NETWORK, &rate,
-+ "Possible timestamp drift from %C; timestamp in WELCOME message is %is ahead of time",
-+ IsServer(sptr) ? sptr : cli_user(sptr)->server, timestamp - TStime());
-+
-+ /* warn remote oper too */
-+ if (IsUser(sptr))
-+ sendcmdto_one(&me, CMD_NOTICE, sptr,
-+ "%C :Possible timestamp drift from %C; timestamp in WELCOME message is %is ahead of time",
-+ sptr, cli_user(sptr)->server, timestamp - TStime());
-+ }
-+
+ /* unset */
+ if (EmptyString(text)) {
+ /* clear insert flag,
projects / irc / quakenet / snircd-patchqueue.git / blobdiff