+#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, int insert);
++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);
+ }
+
+ /* and do it */
-+ return welcome_do(cptr, sptr, name, text, who, timestamp, flags, 0);
++ return welcome_do(cptr, sptr, name, timestamp, who, text, flags);
+}
+
+
+ }
+
+ /* and do it */
-+ return welcome_do(cptr, sptr, name, text, who, timestamp, flags, 0);
++ return welcome_do(cptr, sptr, name, timestamp, who, text, flags);
+}
diff -r 4676d2565f9b ircd/parse.c
--- a/ircd/parse.c
diff -r 4676d2565f9b ircd/welcome.c
--- /dev/null
+++ b/ircd/welcome.c
-@@ -0,0 +1,484 @@
+@@ -0,0 +1,570 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+}
+
+
-+/** Change a welcome message.
++/** Propagate 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] 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)
++{
++ assert(!(flags & WELCOME_LOCAL));
++
++ 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;
++}
++
++
++/** 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.
++ * @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 snomask, logging, etc. */
++ 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 (*WelcomeArray[namearray].text == 0)
++ new = 1;
++
++ /* update */
++ welcome_make(namearray, text, who, timestamp);
++
++ /* create msg for snomask, logging, etc. */
++ 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);
++
++ /* log it */
++ welcome_log(sptr, msg, who, 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 snomask, logging, etc. */
++ char text[WELCOMELEN + 1]; /* save old text */
++
++ /* 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 snomask, logging, etc. */
++ ircd_snprintf(0, msg, 0, "unsetting %s WELCOME %d \"%s\" [%Tu]",
++ (flags & WELCOME_LOCAL) ? "local" : "global", nameint, text, timestamp);
++
++ /* log it */
++ 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);
++
++ 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 snomask, logging, etc. */
++ 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 */
++ 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));
++
++ /* 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 */
++ 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, WelcomeArray[i-1].text, WelcomeArray[i-1].who, 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);
++
++ /* log it */
++ welcome_log(sptr, msg, who, 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] 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.
-+ * @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, int insert)
++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[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 != who);
+
+ /* debug */
-+ 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));
++ Debug((DEBUG_DEBUG, "welcome_do(\"%s\", \"%s\", \"%s\", %Tu, \"%s\", \"%s\", 0x%04x)",
++ cli_name(cptr), cli_name(sptr), name, timestamp, who, text, flags));
+
+ /* name empty after taking off the prefixes? */
+ if (EmptyString(name)) {
+ * propagate it manually
+ * TODO: cant do announce here?
+ */
-+ if (nameint > WELCOME_MAX_ENTRIES && !(flags & WELCOME_LOCAL) && !insert)
-+ sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%s%d %Tu %s :%s",
-+ (flags & WELCOME_ANNOUNCE) ? "!" : "", (flags & WELCOME_INSERT) ? "+" : "",
-+ nameint, timestamp, who, text);
++ if (nameint > WELCOME_MAX_ENTRIES && !(flags & WELCOME_LOCAL))
++ welcome_propagate(cptr, sptr, nameint, timestamp, who, text, flags);
+ }
+ return 0;
+ }
+ if (flags & WELCOME_LOCAL)
+ namearray += WELCOME_MAX_ENTRIES;
+
++ /* must be true by now */
++ assert(namearray >= 0 && namearray <= 2 * WELCOME_MAX_ENTRIES - 1);
++
+ /* cannot unset welcome that is not set */
+ if (WelcomeArray[namearray].timestamp == 0 && EmptyString(text)) {
+
+ sptr, cli_user(sptr)->server, timestamp - TStime());
+ }
+
-+ /* unsetting - do not announce, do not insert, save text */
++ /* unset */
+ if (EmptyString(text)) {
-+ flags &= ~WELCOME_ANNOUNCE;
+ flags &= ~WELCOME_INSERT;
-+ ircd_strncpy(oldtext, WelcomeArray[namearray].text, WELCOMELEN);
++ return welcome_unset(cptr, sptr, nameint, namearray, timestamp, who, flags);
+ }
+
-+ /* make space if needed */
++ /* insert */
+ if (flags & WELCOME_INSERT)
-+ welcome_insert(cptr, sptr, name, nameint, namearray, who, timestamp, flags);
++ return welcome_insert(cptr, sptr, nameint, namearray, timestamp, who, text, flags);
+
-+ /* update */
-+ welcome_make(namearray, text, who, timestamp);
-+
-+ /* 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" : "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",
-+ 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",
-+ 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);
-+ }
-+
-+ /* propagate it */
-+ 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);
-+
-+ /* announce it */
-+ if (flags & WELCOME_ANNOUNCE)
-+ welcome_announce(namearray);
-+
-+ 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] 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;
++ /* new or change */
++ return welcome_set(cptr, sptr, nameint, namearray, timestamp, who, text, flags);
+}
+
+
projects / irc / quakenet / snircd-patchqueue.git / blobdiff