diff -r a9b437e961ec include/welcome.h
--- /dev/null
+++ b/include/welcome.h
-@@ -0,0 +1,66 @@
+@@ -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 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 {
diff -r a9b437e961ec ircd/welcome.c
--- /dev/null
+++ b/ircd/welcome.c
-@@ -0,0 +1,581 @@
+@@ -0,0 +1,611 @@
+/*
+ * 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) ? "+" : "",
+}
+
+
++/** 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",
+ cli_name(cptr), cli_name(sptr), nameint, namearray, timestamp, who, text, flags));
+
+ /* not set */
-+ if (*WelcomeArray[namearray].text == 0)
++ if (WelcomeIsEmpty(namearray))
+ new = 1;
+
+ /* update */
+ 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 arrayname */
++ 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));
+
-+ /* 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\" %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);
+
+ /* move entries up, update timestamp */
+ for (i = namearray; i < end; i++)
-+ welcome_make(i, WelcomeArray[i+1].text, WelcomeArray[i+1].who, timestamp);
++ welcome_make(i, WelcomeText(i+1), WelcomeWho(i+1), timestamp);
+
+ /* clear last entry, update timestamp */
+ welcome_make(end, "", who, timestamp);
+{
+ char msg[BUFSIZE]; /* msg for logging */
+ int i; /* loop variable */
-+ int empty = -1; /* first empty spot in array after arrayname */
++ 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 */
+
+
+ /* find first empty spot */
+ for (i = namearray; i <= end; i++) {
-+ if (*WelcomeArray[i].text == 0) {
++ if (WelcomeIsEmpty(i)) {
+ empty = i;
+ break;
+ }
+
+ /* move entries down, update timestamp */
+ for (i = empty; i > namearray; i--)
-+ welcome_make(i, WelcomeArray[i-1].text, WelcomeArray[i-1].who, timestamp);
++ welcome_make(i, WelcomeText(i-1), WelcomeWho(i-1), timestamp);
+
+ /* correct empty for local offset */
+ if (flags & WELCOME_LOCAL)
+ 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);
+ 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: 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;
++ }
++
++ /* 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;
+ }
+
+ 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;
++ }
+ }
+ }
+
+ /* do not insert for last global/local entry and when not set yet */
-+ if ((flags & WELCOME_INSERT) && ((WelcomeArray[namearray].timestamp == 0) || (nameint == max)))
++ 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,
-+ * when this flag is set, welcome_set() assumes it is being called from welcome_insert()
++ * when this flag is set, welcome_unset() assumes it is being called from welcome_insert()
+ * and wont propagate the change
+ */
+ flags &= ~WELCOME_INSERT;
+ struct MsgBuf *msgbuf;
+ int i;
+
-+ /* valid range */
-+ assert(WelcomeIsValid(name));
++ /* 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