the ! prefix makes the server annouce the welcome message to its clients when setting
server:
-<source> WE <target> [[!]<name> <timestamp> <who> :<text>]
+:<source> WE <target> [[!]<name> <timestamp> <who> :<text>]
who is who set the message, the server puts in the opername when a client sets it.
-<name> is a number 1 to WELCOME_MAX_ENTRIES - currently set at 10 (should be more than we ever need)
+:<name> is a number 1 to WELCOME_MAX_ENTRIES - currently set at 10 (should be more than we ever need)
that means there is room for 10 local and 10 global entries
-local entries are cleared from memory when unset, global entries are kept with no text for conflict resolving.
-
-
-/STATS W/welcome (/STATS w/userload made case sensitive)
+STATS W/welcome (/STATS w/userload made case sensitive)
:server 230 nick W Name Target Who Timestamp :Message
:server 227 nick W 1 * opername 1233072583 :Latest news: testing this welcome patch :)
:server 227 nick W 2 * opername 1233072583 :
ircd/Makefile.in
add welcome.c and m_welcome.c files
-ircd/s_debug.c
-add welcome count and memory usage to /STATS z
-
ircd/s_serv.c
add burst welcome message
ircd/s_user.c
add showing of welcome messages on connect
-diff -r 4fae9d979552 include/handlers.h
---- a/include/handlers.h Tue Jan 27 13:19:27 2009 +0100
-+++ b/include/handlers.h Tue Jan 27 17:31:03 2009 +0100
-@@ -151,6 +151,7 @@
+include/client.h
+ircd/client.c
+ircd/ircd_lexer.l
+ircd/ircd_parser.y
+add PRIV_LOCAL_WELCOME PRIV_WELCOME
+
+diff -r 4676d2565f9b include/client.h
+--- a/include/client.h
++++ b/include/client.h
+@@ -142,6 +142,8 @@
+ PRIV_USER_PRIVACY, /* oper can bypass user privacy +x etc gives i.e. see real ip's */
+ PRIV_CHANNEL_PRIVACY, /* oper can bypass channel privacy i.e. can see modes on channels they are not on and channel keys */
+ PRIV_SERVERINFO, /* oper can use /get, /stats, /hash, retrieve remote information */
++ PRIV_WELCOME, /* oper can WELCOME */
++ PRIV_LOCAL_WELCOME, /* oper can local WELCOME */
+ PRIV_LAST_PRIV /**< number of privileges */
+ };
+
+diff -r 4676d2565f9b include/handlers.h
+--- a/include/handlers.h
++++ b/include/handlers.h
+@@ -138,6 +138,7 @@
extern int m_version(struct Client*, struct Client*, int, char*[]);
extern int m_wallchops(struct Client*, struct Client*, int, char*[]);
extern int m_wallvoices(struct Client*, struct Client*, int, char*[]);
extern int m_who(struct Client*, struct Client*, int, char*[]);
extern int m_whois(struct Client*, struct Client*, int, char*[]);
extern int m_whowas(struct Client*, struct Client*, int, char*[]);
-@@ -185,6 +186,7 @@
+@@ -172,6 +173,7 @@
extern int mo_version(struct Client*, struct Client*, int, char*[]);
extern int mo_wallops(struct Client*, struct Client*, int, char*[]);
extern int mo_wallusers(struct Client*, struct Client*, int, char*[]);
+extern int mo_welcome(struct Client*, struct Client*, int, char*[]);
+ extern int mo_xquery(struct Client*, struct Client*, int, char*[]);
extern int mr_error(struct Client*, struct Client*, int, char*[]);
extern int mr_error(struct Client*, struct Client*, int, char*[]);
- extern int mr_pong(struct Client*, struct Client*, int, char*[]);
-@@ -242,6 +244,7 @@
+@@ -230,6 +232,7 @@
extern int ms_wallops(struct Client*, struct Client*, int, char*[]);
extern int ms_wallusers(struct Client*, struct Client*, int, char*[]);
extern int ms_wallvoices(struct Client*, struct Client*, int, char*[]);
+extern int ms_welcome(struct Client*, struct Client*, int, char*[]);
extern int ms_whois(struct Client*, struct Client*, int, char*[]);
-
- extern int mh_nohelp(struct Client*, struct Client*, int, char*[]);
-@@ -308,6 +311,7 @@
- extern int mh_wallops(struct Client*, struct Client*, int, char*[]);
- extern int mh_wallusers(struct Client*, struct Client*, int, char*[]);
- extern int mh_wallvoices(struct Client*, struct Client*, int, char*[]);
-+extern int mh_welcome(struct Client*, struct Client*, int, char*[]);
- extern int mh_who(struct Client*, struct Client*, int, char*[]);
- extern int mh_whois(struct Client*, struct Client*, int, char*[]);
- extern int mh_whowas(struct Client*, struct Client*, int, char*[]);
-diff -r 4fae9d979552 include/ircd_features.h
---- a/include/ircd_features.h Tue Jan 27 13:19:27 2009 +0100
-+++ b/include/ircd_features.h Tue Jan 27 17:31:03 2009 +0100
+ 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
+--- a/include/ircd_features.h
++++ b/include/ircd_features.h
@@ -101,6 +101,7 @@
FEAT_IRCD_RES_TIMEOUT,
FEAT_AUTH_TIMEOUT,
/* features that affect all operators */
FEAT_EXTENDED_CHECKCMD,
-@@ -143,6 +144,7 @@
+@@ -142,6 +143,7 @@
FEAT_HIS_STATS_u,
FEAT_HIS_STATS_U,
FEAT_HIS_STATS_v,
FEAT_HIS_STATS_w,
FEAT_HIS_STATS_x,
FEAT_HIS_STATS_y,
-diff -r 4fae9d979552 include/msg.h
---- a/include/msg.h Tue Jan 27 13:19:27 2009 +0100
-+++ b/include/msg.h Tue Jan 27 17:31:03 2009 +0100
-@@ -195,6 +195,10 @@
- #define MSG_NOTICE "NOTICE" /* NOTI */
+diff -r 4676d2565f9b include/msg.h
+--- a/include/msg.h
++++ b/include/msg.h
+@@ -196,6 +196,10 @@
#define TOK_NOTICE "O"
#define CMD_NOTICE MSG_NOTICE, TOK_NOTICE
-+
+
+#define MSG_WELCOME "WELCOME" /* WELC */
+#define TOK_WELCOME "WE"
+#define CMD_WELCOME MSG_WELCOME, TOK_WELCOME
-
++
#define MSG_WALLCHOPS "WALLCHOPS" /* WC */
#define TOK_WALLCHOPS "WC"
-diff -r 4fae9d979552 include/numeric.h
---- a/include/numeric.h Tue Jan 27 13:19:27 2009 +0100
-+++ b/include/numeric.h Tue Jan 27 17:31:03 2009 +0100
+ #define CMD_WALLCHOPS MSG_WALLCHOPS, TOK_WALLCHOPS
+diff -r 4676d2565f9b include/numeric.h
+--- a/include/numeric.h
++++ b/include/numeric.h
@@ -116,6 +116,7 @@
RPL_STATSGLINE 227 Dalnet
RPL_STATSVLINE 227 unreal */
#define RPL_STATSALINE 226 /* Hybrid, Undernet */
+#define RPL_STATSWELCOME 227 /* QuakeNet extension */
#define RPL_STATSQLINE 228 /* Undernet extension */
- #define RPL_STATSHEADER 230 /* QuakeNet extension */
-@@ -441,6 +442,8 @@
+ /* RPL_SERVICEINFO 231 unused */
+@@ -440,6 +441,8 @@
/* ERR_GHOSTEDCLIENT 503 efnet */
/* ERR_VWORLDWARN 503 austnet */
#define ERR_SILELISTFULL 511 /* Undernet extension */
/* ERR_NOTIFYFULL 512 aircd */
/* ERR_TOOMANYWATCH 512 Numeric List: Dalnet */
-diff -r 4fae9d979552 include/welcome.h
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h Tue Jan 27 17:31:03 2009 +0100
-@@ -0,0 +1,74 @@
+diff -r 4676d2565f9b include/welcome.h
+--- /dev/null
++++ b/include/welcome.h
+@@ -0,0 +1,63 @@
+#ifndef INCLUDED_welcome_h
+#define INCLUDED_welcome_h
+/*
+struct Client;
+struct StatDesc;
+
-+/* TODO: no limit on local messages? */
-+/* TODO: make feature? */
-+#define WELCOME_MAX_ENTRIES 10 /* Maximum number of welcome entries
-+ * (per type; 5 global, 5 local)
-+ */
-+/* TODO: use TOPICLEN? */
-+#define WELCOMELEN 300 /* Maximum length of a welcome message */
++/* Maximum number of welcome entries (per type; X global, X local) */
++#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
+
+/* Describes a Welcome message entry. */
+struct Welcome {
-+ struct Welcome* we_next; /**< Pointer to next Welcome. */
-+ struct Welcome** we_prev_p; /**< Pointer to previous next pointer. */
-+ int we_name; /**< Name of message. */
-+ char* we_text; /**< Message */
-+ char* we_who; /**< Who set it */
-+ time_t we_timestamp; /**< Timestamp of the welcome */
-+ unsigned int we_flags; /**< Status flags. */
++ time_t timestamp; /**< Timestamp of the welcome */
++ char text[WELCOMELEN + 1]; /**< Message */
++ char who[ACCOUNTLEN + 1]; /**< Who set it */
+};
+
-+/** Welcome state flags */
++/** Welcome type flags */
+#define WELCOME_LOCAL 0x01 /**< welcome is local */
+/** Welcome action flags */
+#define WELCOME_ANNOUNCE 0x02 /**< announce change to users */
-+
-+/* test whether a Welcome is local */
-+#define WelcomeIsLocal(x) ((x)->we_flags & WELCOME_LOCAL)
-+/* test whether a Welcome has a none-empty message */
-+#define WelcomeIsSet(x) ((x)->we_text[0] != '\0')
-+
++#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 void welcome_announce(struct Welcome* welcome);
-+extern struct Welcome *welcome_find(int name, int local);
-+extern void welcome_free(struct Welcome* welcome);
++ char *who, time_t timestamp, unsigned int flags, int insert);
++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);
-+extern int welcome_memory_count(size_t *we_size);
+
+#endif /* INCLUDED_welcome_h */
-\ No newline at end of file
-diff -r 4fae9d979552 ircd/Makefile.in
---- a/ircd/Makefile.in Tue Jan 27 13:19:27 2009 +0100
-+++ b/ircd/Makefile.in Tue Jan 27 17:31:03 2009 +0100
-@@ -187,6 +187,7 @@
+diff -r 4676d2565f9b ircd/Makefile.in
+--- a/ircd/Makefile.in
++++ b/ircd/Makefile.in
+@@ -186,6 +186,7 @@
m_wallops.c \
m_wallusers.c \
m_wallvoices.c \
m_who.c \
m_whois.c \
m_whowas.c \
-@@ -214,6 +215,7 @@
+@@ -215,6 +216,7 @@
send.c \
uping.c \
userload.c \
whocmds.c \
whowas.c \
y.tab.c
-@@ -1168,6 +1170,11 @@
+@@ -1161,6 +1163,11 @@
../include/ircd_reply.h ../include/ircd_string.h \
../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
../include/numnicks.h ../include/s_user.h ../include/send.h
m_who.o: m_who.c ../config.h ../include/channel.h ../include/ircd_defs.h \
../include/res.h ../config.h ../include/client.h ../include/dbuf.h \
../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
-@@ -1429,6 +1436,13 @@
+@@ -1422,6 +1429,13 @@
../include/numnicks.h ../include/querycmds.h ../include/ircd_features.h \
../include/s_misc.h ../include/s_stats.h ../include/send.h \
../include/struct.h ../include/sys.h
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 4fae9d979552 ircd/ircd_features.c
---- a/ircd/ircd_features.c Tue Jan 27 13:19:27 2009 +0100
-+++ b/ircd/ircd_features.c Tue Jan 27 17:31:03 2009 +0100
-@@ -355,6 +355,7 @@
+diff -r 4676d2565f9b ircd/client.c
+--- a/ircd/client.c
++++ b/ircd/client.c
+@@ -177,6 +177,7 @@
+ FlagSet(&privs_local, PRIV_WHOX);
+ FlagSet(&privs_local, PRIV_DISPLAY);
+ FlagSet(&privs_local, PRIV_FORCE_LOCAL_OPMODE);
++ FlagSet(&privs_local, PRIV_LOCAL_WELCOME);
+
+ privs_defaults_set = 1;
+ }
+@@ -223,6 +224,7 @@
+ ClrPriv(client, PRIV_JUPE);
+ ClrPriv(client, PRIV_OPMODE);
+ ClrPriv(client, PRIV_BADCHAN);
++ ClrPriv(client, PRIV_WELCOME);
+ }
+ }
+
+@@ -244,7 +246,7 @@
+ P(CHANSERV), P(XTRA_OPER), P(NOIDLE), P(FREEFORM),
+ P(PARANOID), P(CHECK), P(WALL), P(CLOSE),
+ P(ROUTE), P(ROUTEINFO), P(SERVERINFO), P(CHANNEL_PRIVACY),
+- P(USER_PRIVACY),
++ P(USER_PRIVACY), P(WELCOME), P(LOCAL_WELCOME),
+ #undef P
+ { 0, 0 }
+ };
+diff -r 4676d2565f9b ircd/ircd_features.c
+--- a/ircd/ircd_features.c
++++ b/ircd/ircd_features.c
+@@ -366,6 +366,7 @@
F_I(IRCD_RES_TIMEOUT, 0, 4, 0),
F_I(AUTH_TIMEOUT, 0, 9, 0),
F_B(ANNOUNCE_INVITES, 0, 0, 0),
/* features that affect all operators */
F_B(EXTENDED_CHECKCMD, 0, 0, 0),
-@@ -397,6 +398,7 @@
+@@ -407,6 +408,7 @@
F_B(HIS_STATS_u, 0, 1, 0),
F_B(HIS_STATS_U, 0, 1, 0),
F_B(HIS_STATS_v, 0, 1, 0),
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 4fae9d979552 ircd/m_welcome.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Tue Jan 27 17:31:03 2009 +0100
-@@ -0,0 +1,271 @@
+diff -r 4676d2565f9b ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l
++++ b/ircd/ircd_lexer.l
+@@ -166,6 +166,8 @@
+ { "serverinfo", TPRIV_SERVERINFO },
+ { "user_privacy", TPRIV_USER_PRIVACY },
+ { "channel_privacy", TPRIV_CHANNEL_PRIVACY },
++ { "local_welcome", TPRIV_LOCAL_WELCOME },
++ { "welcome", TPRIV_WELCOME },
+ { NULL, 0 }
+ };
+ static int ntokens;
+diff -r 4676d2565f9b ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y
++++ b/ircd/ircd_parser.y
+@@ -189,6 +189,7 @@
+ %token TPRIV_CHANSERV TPRIV_XTRA_OPER TPRIV_NOIDLE TPRIV_FREEFORM TPRIV_PARANOID
+ %token TPRIV_CHECK TPRIV_WALL TPRIV_CLOSE TPRIV_ROUTE TPRIV_ROUTEINFO TPRIV_SERVERINFO
+ %token TPRIV_CHANNEL_PRIVACY TPRIV_USER_PRIVACY TPRIV_LIST_CHAN
++%token TPRIV_LOCAL_WELCOME TPRIV_WELCOME
+ /* and some types... */
+ %type <num> sizespec
+ %type <num> timespec timefactor factoredtimes factoredtime
+@@ -703,6 +704,8 @@
+ TPRIV_SERVERINFO { $$ = PRIV_SERVERINFO ; } |
+ TPRIV_CHANNEL_PRIVACY { $$ = PRIV_CHANNEL_PRIVACY ; } |
+ TPRIV_USER_PRIVACY { $$ = PRIV_USER_PRIVACY ; } |
++ TPRIV_LOCAL_WELCOME { $$ = PRIV_LOCAL_WELCOME; } |
++ TPRIV_WELCOME { $$ = PRIV_WELCOME; } |
+ TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
+ yesorno: YES { $$ = 1; } | NO { $$ = 0; };
+
+diff -r 4676d2565f9b ircd/m_welcome.c
+--- /dev/null
++++ b/ircd/m_welcome.c
+@@ -0,0 +1,296 @@
+/*
+ * IRC - Internet Relay Chat, ircd/m_welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+#include "ircd_features.h"
+#include "ircd_log.h"
+#include "ircd_reply.h"
++#include "ircd_snprintf.h"
+#include "ircd_string.h"
+#include "msg.h"
+#include "numeric.h"
+ * m_welcome - local generic message handler
+ *
+ * parv[0] = Send prefix
++ * parv[1] = [remote server to query]
+ */
+int m_welcome(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+{
+ /* feature disabled */
+ if (!feature_bool(FEAT_WELCOME))
+ return send_reply(sptr, ERR_DISABLED, "WELCOME");
++
++ /* only opers can set the welcome messages */
++ if (parc > 2)
++ return send_reply(sptr, ERR_NOPRIVILEGES);
++
++ /* remote listing request, see if it is for me or a remote server
++ * check FEAT_HIS_REMOTE to decide if an ordinary user can do this
++ */
++ if ((parc > 1) && (hunt_server_cmd(sptr, CMD_WELCOME, cptr, feature_int(FEAT_HIS_REMOTE),
++ "%C", 1, parc, parv) != HUNTED_ISME))
++ return 0;
++
++ /* local listing */
+ return welcome_list(sptr, 0);
+}
+
+ *
+ * set global or on remote server:
+ * parv[0] = Send prefix
-+ * parv[1] = Target: server or * for global
++ * parv[1] = Target: server or * for global (or left out for this server)
+ * parv[2] = Name
+ * parv[3] = Text
+ */
+int mo_welcome(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+{
-+ char *target;
-+ char *name;
-+ char *who;
-+ char *text;
++ char *target, *name, *who, *text, pattern[BUFSIZE];
+ time_t timestamp;
+ unsigned int flags = 0;
-+ int local = 0; /* 1 when it is for me */
-+ char pattern[BUFSIZE]; /* pattern for hunt_server_cmd */
++ int local = 0;
+
+ /* feature disabled */
+ if (!feature_bool(FEAT_WELCOME))
+ return send_reply(sptr, ERR_DISABLED, "WELCOME");
+
-+ /* listing */
-+ if (parc < 2)
++ /* TODO: move feature check here? */
++ /* remote listing request, see if it is for me or a remote server */
++ if ((parc == 2) && (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME))
++ return 0;
++
++ /* local listing */
++ if (parc <= 2)
+ return welcome_list(sptr, 0);
+
+ /* check PRIVS */
-+ if (!HasPriv(sptr,PRIV_SERVERINFO))
++ /* local - need PRIV LOCAL_WELCOME or WELCOME */
++ if (parc == 3 && !HasPriv(sptr,PRIV_LOCAL_WELCOME) && !HasPriv(sptr,PRIV_WELCOME))
++ return send_reply(sptr, ERR_NOPRIVILEGES);
++
++ /* global or remote - need PRIV WELCOME */
++ if (parc >= 4 && !HasPriv(sptr,PRIV_WELCOME))
+ return send_reply(sptr, ERR_NOPRIVILEGES);
+
-+ /* remote listing request, see if it is for me or a remote server */
-+ if (parc == 2) {
-+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME)
-+ return 0;
-+ return welcome_list(sptr, 0);
-+ }
-+
+ /* set the parameters */
-+ /* less than 4 parameters, assume target was left out, making it local for me */
++
++ /* target not given, only name - setting local welcome */
+ if (parc < 4) {
+ local++;
+ target = cli_name(&me);
+ name = parv[1];
+ flags |= WELCOME_LOCAL;
-+ } else { /* otherwise set as it should */
++
++ /* target and name given */
++ } else {
+ target = parv[1];
+ name = parv[2];
+ }
+
+ /* target is not global */
+ if (!(target[0] == '*' && target[1] == '\0') && !local) {
++
+ /* build a pattern for hunt_server_cmd since we do not have all we need in parv */
+ ircd_snprintf(0, pattern, sizeof(pattern), "%s %s %Tu %s :%s", "%C", name, timestamp, who, text);
+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, pattern, 1, 2, parv) != HUNTED_ISME)
+ return 0;
-+ flags |= WELCOME_LOCAL; /* local welcome, for me */
++
++ /* else it is a local welcome, for me */
++ 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 == '!') {
+ 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, text, who, timestamp, flags, 0);
+}
+
+
+ */
+int ms_welcome(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+{
-+ char *target;
-+ char *name;
-+ char *who;
-+ char *text;
++ char *target, *name, *who, *text;
+ time_t timestamp;
+ unsigned int flags = 0;
+
-+ /* not enough */
-+ if (parc < 2)
++ /* not enough - complain */
++ if (parc < 2) {
++ protocol_violation(sptr, "Too few parameters for WELCOME (got %d - need 2)", parc);
+ return need_more_params(sptr, "WELCOME");
++ }
+
+ /* remote listing request, see if it is for me or a remote server */
+ if (parc == 2) {
-+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) == HUNTED_ISME)
-+ return welcome_list(sptr, 0);
++ if (IsServer(sptr))
++ return protocol_violation(cptr, "WELCOME listing request from server %C", sptr);
++ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C", 1, parc, parv) != HUNTED_ISME)
++ return 0;
++ return welcome_list(sptr, 0);
+ }
+
-+ /* we need at least 6 parameters to continue */
-+ if (parc < 6)
++ /* we need at least 6 parameters to continue - complain */
++ if (parc < 6) {
++ protocol_violation(sptr, "Too few parameters for WELCOME (got %d - need 6)", parc);
+ return need_more_params(sptr, "WELCOME");
++ }
+
+ /* set the parameters */
+ target = parv[1];
+ name = parv[2];
+ timestamp = atoi(parv[3]);
+ who = parv[4];
-+ text = parv[parc - 1];
++ text = parv[parc - 1]; /* parse reason as last parameter */
+
+ /* target is not global */
+ if (!(target[0] == '*' && target[1] == '\0')) {
++
+ /* not for me, and forward it */
+ if (hunt_server_cmd(sptr, CMD_WELCOME, cptr, 0, "%C %s %s %s :%s", 1, parc, parv) != HUNTED_ISME)
+ return 0;
-+ flags |= WELCOME_LOCAL; /* local welcome, for me */
++
++ /* local welcome for me */
++ flags |= WELCOME_LOCAL;
+ }
+
+ /* check for anounce prefix */
+ flags |= WELCOME_ANNOUNCE;
+ }
+
-+ /* and do it */
-+ return welcome_do(cptr, sptr, name, text, who, timestamp, flags);
-+}
-+
-+
-+/*
-+ * mh_welcome - help message handler
-+ */
-+int mh_welcome(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
-+{
-+ if (!IsAnOper(sptr)) {
-+ send_reply(sptr, SND_EXPLICIT | RPL_HELP,
-+ "WELCOME :WELCOME");
-+ send_reply(sptr, SND_EXPLICIT | RPL_HELP,
-+ "WELCOME :Shows welcome messages set on the server.");
-+ } else {
-+ send_reply(sptr, SND_EXPLICIT | RPL_HELP,
-+ "WELCOME :WELCOME [<target>] [[!]<name> :<message>]");
-+ send_reply(sptr, SND_EXPLICIT | RPL_HELP,
-+ "WELCOME :Shows or sets welcome messages on a server.");
++ /* check for insert prefix */
++ if (*name == '+') {
++ name++;
++ flags |= WELCOME_INSERT;
+ }
-+ return 0;
++
++ /* and do it */
++ return welcome_do(cptr, sptr, name, text, who, timestamp, flags, 0);
+}
-diff -r 4fae9d979552 ircd/parse.c
---- a/ircd/parse.c Tue Jan 27 13:19:27 2009 +0100
-+++ b/ircd/parse.c Tue Jan 27 17:31:03 2009 +0100
-@@ -667,6 +667,15 @@
- /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
- { m_unregistered, m_not_oper, ms_opkick, mo_opkick, m_ignore, mh_nohelp }
+diff -r 4676d2565f9b ircd/parse.c
+--- a/ircd/parse.c
++++ b/ircd/parse.c
+@@ -661,6 +661,15 @@
+ /* UNREG, CLIENT, SERVER, OPER, SERVICE */
+ { m_unregistered, m_not_oper, ms_check, mo_check, m_ignore }
},
+
+ /* add command for WELCOME */
+ TOK_WELCOME,
+ 0, MAXPARA, MFLG_SLOW, 0, NULL,
+ /* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
-+ { m_unregistered, m_welcome, ms_welcome, mo_welcome, m_ignore, mh_welcome }
++ { m_unregistered, m_welcome, ms_welcome, mo_welcome, m_ignore }
+ },
/* 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 4fae9d979552 ircd/s_debug.c
---- a/ircd/s_debug.c Tue Jan 27 13:19:27 2009 +0100
-+++ b/ircd/s_debug.c Tue Jan 27 17:31:03 2009 +0100
-@@ -50,6 +50,7 @@
- #include "send.h"
- #include "struct.h"
- #include "sys.h"
-+#include "welcome.h"
- #include "whowas.h"
-
- /* #include <assert.h> -- Now using assert in ircd_log.h */
-@@ -231,7 +232,8 @@
- aw = 0, /* aways set */
- wwa = 0, /* whowas aways */
- gl = 0, /* glines */
-- ju = 0; /* jupes */
-+ ju = 0, /* jupes */
-+ we = 0; /* welcome messages */
-
- size_t chm = 0, /* memory used by channels */
- chbm = 0, /* memory used by channel bans */
-@@ -244,6 +246,7 @@
- wwm = 0, /* whowas array memory used */
- glm = 0, /* memory used by glines */
- jum = 0, /* memory used by jupes */
-+ wem = 0, /* memory used by welcome messages */
- com = 0, /* memory used by conf lines */
- dbufs_allocated = 0, /* memory used by dbufs */
- dbufs_used = 0, /* memory used by dbufs */
-@@ -348,8 +351,10 @@
-
- gl = gline_memory_count(&glm);
- ju = jupe_memory_count(&jum);
-+ we = welcome_memory_count(&wem);
- send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
-- ":Glines %d(%zu) Jupes %d(%zu)", gl, glm, ju, jum);
-+ ":Glines %d(%zu) Jupes %d(%zu) WelcomeMessages %d(%zu)",
-+ gl, glm, ju, jum, we, wem);
-
- send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG,
- ":Hash: client %d(%zu), chan is the same", HASHSIZE,
-diff -r 4fae9d979552 ircd/s_err.c
---- a/ircd/s_err.c Tue Jan 27 13:19:27 2009 +0100
-+++ b/ircd/s_err.c Tue Jan 27 17:31:03 2009 +0100
+diff -r 4676d2565f9b ircd/s_err.c
+--- a/ircd/s_err.c
++++ b/ircd/s_err.c
@@ -486,7 +486,7 @@
/* 226 */
{ RPL_STATSALINE, "%s", "226" },
/* 510 */
{ 0 },
/* 511 */
-diff -r 4fae9d979552 ircd/s_serv.c
---- a/ircd/s_serv.c Tue Jan 27 13:19:27 2009 +0100
-+++ b/ircd/s_serv.c Tue Jan 27 17:31:03 2009 +0100
+diff -r 4676d2565f9b ircd/s_serv.c
+--- a/ircd/s_serv.c
++++ b/ircd/s_serv.c
@@ -57,6 +57,7 @@
#include "struct.h"
#include "sys.h"
/*
* Pass on my client information to the new server
-diff -r 4fae9d979552 ircd/s_stats.c
---- a/ircd/s_stats.c Tue Jan 27 13:19:27 2009 +0100
-+++ b/ircd/s_stats.c Tue Jan 27 17:31:03 2009 +0100
+diff -r 4676d2565f9b ircd/s_stats.c
+--- a/ircd/s_stats.c
++++ b/ircd/s_stats.c
@@ -54,6 +54,7 @@
#include "send.h"
#include "struct.h"
#include <stdio.h>
#include <stdlib.h>
-@@ -689,9 +690,12 @@
+@@ -654,9 +655,12 @@
{ 'V', "vserversmach", (STAT_FLAG_OPERFEAT | STAT_FLAG_VARPARAM | STAT_FLAG_CASESENS), FEAT_HIS_STATS_v,
stats_servers_verbose, 0,
"Verbose server information." },
{ 'x', "memusage", STAT_FLAG_OPERFEAT, FEAT_HIS_STATS_x,
stats_meminfo, 0,
"List usage information." },
-diff -r 4fae9d979552 ircd/s_user.c
---- a/ircd/s_user.c Tue Jan 27 13:19:27 2009 +0100
-+++ b/ircd/s_user.c Tue Jan 27 17:31:03 2009 +0100
+diff -r 4676d2565f9b ircd/s_user.c
+--- a/ircd/s_user.c
++++ b/ircd/s_user.c
@@ -63,6 +63,7 @@
#include "userload.h"
#include "version.h"
#include "handlers.h" /* m_motd and m_lusers */
-@@ -411,6 +412,9 @@
+@@ -410,6 +411,9 @@
cli_info(sptr), NumNick(cptr) /* two %s's */);
IPcheck_connect_succeeded(sptr);
}
else {
struct Client *acptr = user->server;
-diff -r 4fae9d979552 ircd/welcome.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c Tue Jan 27 17:31:03 2009 +0100
-@@ -0,0 +1,435 @@
+diff -r 4676d2565f9b ircd/welcome.c
+--- /dev/null
++++ b/ircd/welcome.c
+@@ -0,0 +1,480 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
+ * Copyright (C) 1990 Jarkko Oikarinen and
+#include <string.h>
+
+
-+/** List of welcome messages. */
-+static struct Welcome *GlobalWelcomeList = 0;
++/** List of welcome messages - first MAX for global, second MAX for local */
++static struct Welcome WelcomeArray[WELCOME_MAX_ENTRIES * 2] = { { 0 } };
+
+
+/** Allocate a new welcome with the given parameters.
+ * @param[in] text The welcome message.
+ * @param[in] who Who set it.
+ * @param[in] timestamp When it was set.
-+ * @return
++ * @return name Array number of the welcome set.
+ */
-+static struct Welcome *
-+welcome_make(int name, char *text, char *who, time_t timestamp, unsigned int flags)
++static int
++welcome_make(int name, char *text, char *who, time_t timestamp)
+{
-+ struct Welcome *awelcome;
-+
-+ awelcome = (struct Welcome*) MyMalloc(sizeof(struct Welcome)); /* alloc memory */
-+ assert(0 != awelcome);
-+
-+ memset(awelcome, 0, sizeof(*awelcome));
-+ awelcome->we_name = name;
-+ DupString(awelcome->we_text, text);
-+ ircd_strncpy(who, who, HOSTLEN);
-+ DupString(awelcome->we_who, who);
-+ awelcome->we_timestamp = timestamp;
-+ awelcome->we_flags = flags & WELCOME_LOCAL;
-+
-+ awelcome->we_next = GlobalWelcomeList; /* link it into the list */
-+ awelcome->we_prev_p = &GlobalWelcomeList;
-+ if (GlobalWelcomeList)
-+ GlobalWelcomeList->we_prev_p = &awelcome->we_next;
-+ GlobalWelcomeList = awelcome;
-+
-+ return awelcome;
++ /* range 0 to 2 * max - 1 */
++ assert(name >= 0 && name <= 2 * WELCOME_MAX_ENTRIES - 1);
++
++ /* store it */
++ ircd_strncpy(WelcomeArray[name].text, text, WELCOMELEN);
++ ircd_strncpy(WelcomeArray[name].who, who, ACCOUNTLEN);
++ WelcomeArray[name].timestamp = timestamp;
++
++ return name;
+}
+
+
+ * @param[in] sptr Originator of the welcome.
+ * @param[in] name Name of the message.
+ * @param[in] text The welcome message.
++ * @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.
++ * @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)
++ char *who, time_t timestamp, unsigned int flags, int insert)
+{
-+ struct Welcome *welcome;
-+ int namenr = atoi(name);
-+ char *action;
-+ int notext = (text[0] == '\0') ? 1 : 0;
-+
-+ assert(0 != cptr);
-+ assert(0 != sptr);
-+ assert(0 != name);
-+
-+ Debug((DEBUG_DEBUG, "welcome_do(\"%s\", \"%s\", \"%s\", \"%s\" \"%s\", %Tu, 0x%04x)",
-+ cli_name(cptr), cli_name(sptr), name, text, who, timestamp, 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 != sptr);
++ assert(NULL != name);
++ assert(NULL != text);
++ 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));
++
++ /* 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 (namenr < 1 || namenr > WELCOME_MAX_ENTRIES) {
++ if (nameint < 1 || nameint > WELCOME_MAX_ENTRIES) {
+ 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, WELCOME_MAX_ENTRIES);
++ 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?
++ * 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);
++ }
+ return 0;
+ }
+
-+ /* find the entry */
-+ welcome = welcome_find(namenr, (flags & WELCOME_LOCAL) ? 1 : 0);
++ /* correct namearray for local offset */
++ if (flags & WELCOME_LOCAL)
++ namearray += WELCOME_MAX_ENTRIES;
+
+ /* cannot unset welcome that is not set */
-+ if (!welcome && notext) {
++ if (WelcomeArray[namearray].timestamp == 0 && EmptyString(text)) {
++
+ /* from user, throw error */
+ if (IsUser(sptr))
+ return send_reply(sptr, ERR_NOSUCHWELCOME, name);
-+ /* new local welcome from server, but empty - ignore */
++
++ /* new local welcome from server, but empty - ignore
++ * we do accept a new global welcome message that is empty
++ */
+ if (flags & WELCOME_LOCAL)
+ return 0;
-+ /* new global welcome message, but empty, accept from server
-+ * otherwise we do not have the same state as them
-+ */
+ }
+
-+ /* truncate the message - do this here so what we see is what we get */
-+ if (!notext)
-+ ircd_strncpy(text, text, WELCOMELEN);
-+
+ /* check if there is something to change */
-+ if (welcome) {
-+ if (!WelcomeIsLocal(welcome)) {
-+ if (timestamp == welcome->we_timestamp) /* we got this version already */
++ /* we got a record for it */
++ if (WelcomeArray[namearray].timestamp != 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
++ */
++ if (IsBurstOrBurstAck(cptr) && timestamp <= WelcomeArray[namearray].timestamp)
+ return 0;
-+ if (timestamp < welcome->we_timestamp) { /* we got a later version */
-+ if (IsBurstOrBurstAck(cptr)) /* middle of a burst, it will resync on its own */
-+ return 0;
-+ return welcome_resend(cptr, welcome); /* resync the server */
-+ }
-+ } else /* local welcome, set timestamp to nettime, accept any change */
++
++ /* local welcome - we use our idea of the time */
++ } else
+ timestamp = TStime();
++
+ /* compare new message with old message */
-+ if (ircd_strcmp(text, welcome->we_text) == 0) {
++ if (ircd_strcmp(text, WelcomeArray[namearray].text) == 0) {
+ if (IsUser(sptr))
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
-+ "%C :WELCOME: Cannot change message for %s - nothing to change.", sptr, name);
++ "%C :WELCOME: Cannot change %s message for %s - nothing to change.",
++ sptr, (flags & WELCOME_LOCAL) ? "local" : "global", name);
+ return 0;
+ }
+ }
+
-+ /* set action */
-+ if (flags & WELCOME_LOCAL)
-+ action = notext ? "removing local" : "changing local";
-+ else
-+ action = notext ? "unsetting" : "changing";
++ /* 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());
+
-+ /* TODO: WALLOPS for local welcome messages, so that all operators know about it? */
-+ /* Inform ops */
-+ sendto_opmask_butone(0, SNO_OLDSNO, "%s %s WELCOME for %s%s%s",
++ /* 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, do not insert, save text */
++ if (EmptyString(text)) {
++ flags &= ~WELCOME_ANNOUNCE;
++ flags &= ~WELCOME_INSERT;
++ ircd_strncpy(oldtext, WelcomeArray[namearray].text, WELCOMELEN);
++ }
++
++ /* make space if needed */
++ if (flags & WELCOME_INSERT)
++ welcome_insert(cptr, sptr, name, nameint, namearray, who, timestamp, 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 : 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),
-+ action, name, notext ? "" : " to :", notext ? "" : text);
++ 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 WELCOME for %s%s%s [%Tu]",
-+ sptr, who, action, name, notext ? "" : " to :", notext ? "" : text, timestamp);
++ 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 WELCOME for %s%s%s",
-+ sptr, get_client_name_and_opername(sptr), action, name,
-+ notext ? "" : " to :", notext ? "" : text);
-+
-+ /* free old */
-+ if (welcome)
-+ welcome_free(welcome);
-+
-+ /* local and empty */
-+ if ((flags & WELCOME_LOCAL) && notext)
-+ return 0;
++ 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);
+
-+ /* make it */
-+ welcome = welcome_make(namenr, text, who, timestamp, flags);
-+
-+ /* got to have it by now */
-+ assert(0 != welcome);
++ /* 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 */
-+ if (!(flags & WELCOME_LOCAL))
-+ sendcmdto_serv_butone(sptr, CMD_WELCOME, cptr, "* %s%d %Tu %s :%s",
-+ (flags & WELCOME_ANNOUNCE) ? "!" : "", welcome->we_name, welcome->we_timestamp,
-+ welcome->we_who, welcome->we_text);
++ /* 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, timestamp, who, text);
+
+ /* announce it */
-+ if ((flags & WELCOME_ANNOUNCE) && !notext)
-+ welcome_announce(welcome);
++ if (flags & WELCOME_ANNOUNCE)
++ welcome_announce(namearray);
+
+ return 0;
+}
+
+
-+/** Announce a welcome message to local clients.
-+ * @param[in] welcome Welcome message to announce.
++/** 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
+ */
-+void
-+welcome_announce(struct Welcome* welcome)
++int
++welcome_insert(struct Client *cptr, struct Client *sptr, char *name, int nameint,
++ int namearray, char *who, time_t timestamp, unsigned int flags)
+{
-+ struct Client *acptr;
-+ struct MsgBuf *msgbuf;
++ 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;
+
-+ assert(0 != welcome);
++ /* last global entry */
++ if (!(flags & WELCOME_LOCAL) && (nameint == WELCOME_MAX_ENTRIES))
++ return 0;
+
-+ /* build msgbuf */
-+ msgbuf = msgq_make(0, ":%C %s $* :[%s] %s", &me, MSG_NOTICE,
-+ WelcomeIsLocal(welcome) ? cli_name(&me) : feature_str(FEAT_NETWORK),
-+ welcome->we_text);
++ /* last local entry */
++ if ((flags & WELCOME_LOCAL) && (nameint == 2 * WELCOME_MAX_ENTRIES))
++ return 0;
+
-+ /* go over clients */
-+ for (acptr = GlobalClientList; acptr; acptr = cli_next(acptr)) {
-+ /* skip remote users
-+ * skip unregistered clients - they see the message upon login
-+ */
-+ if (!MyUser(acptr) || !IsRegistered(acptr))
-+ continue;
-+ /* send it away */
-+ send_buffer(acptr, msgbuf, 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;
++ }
+
-+/** Find a welcome by name.
-+ * @param[in] name Welcome name to search for.
-+ * @param[in] local Consider local entries.
-+ * @return Matching welcome (or NULL if none match).
-+ */
-+struct Welcome *
-+welcome_find(int name, int local)
-+{
-+ struct Welcome* welcome;
-+ struct Welcome* swelcome;
++ /* move entries down */
++ for (i = empty; i > namearray; i--)
++ welcome_make(i, WelcomeArray[i-1].text, WelcomeArray[i-1].who, WelcomeArray[i-1].timestamp);
+
-+ for (welcome = GlobalWelcomeList; welcome; welcome = swelcome) { /* go through welcomes */
-+ swelcome = welcome->we_next;
-+ if (local != !!(welcome->we_flags & WELCOME_LOCAL))
-+ continue;
-+ if (name != welcome->we_name) /* found it yet? */
-+ continue;
-+ return welcome;
++ /* 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;
+}
+
+
-+/** Sort welcomes by name and type into an array.
-+ * @return Array of pointers.
++/** Announce a welcome message to local clients.
++ * @param[in] name Welcome message to announce.
+ */
-+/*
-+struct Welcome *
-+welcome_sort()
++void
++welcome_announce(int name)
+{
-+ struct Welcome* welcome;
-+ struct Welcome* swelcome;
-+ char *awelcome[2 * WELCOME_MAX_ENTRIES + 1];
++ struct Client *acptr;
++ struct MsgBuf *msgbuf;
+ int i;
+
-+ for (welcome = GlobalWelcomeList; welcome; welcome = swelcome) {
-+ swelcome = welcome->we_next;
-+ i = welcome->we_name;
-+ if (WelcomeIsLocal(welcome))
-+ i =+ WELCOME_MAX_ENTRIES;
-+ awelcome[i] = welcome;
-+ }
-+ return awelcome;
-+}
-+*/
++ /* range 0 to 2 * max - 1 */
++ assert(name >= 0 && name <= 2 * WELCOME_MAX_ENTRIES - 1);
+
++ /* TODO: target is $* as if it were a global broadcast
++ * could make it $servername for local message announcement
++ * but the type is shown between [ ] already
++ * either [Network] or [servername] - using $* is just shorter.
++ */
++ /* 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);
+
-+/** Unlink and free an unused welcome entry.
-+ * @param[in] name Welcome message entry to free.
-+ */
-+void
-+welcome_free(struct Welcome* welcome)
-+{
-+ /* TODO: use 0 or NULL ? */
-+ assert(0 != welcome);
++ /* go over local clients */
++ for (i = HighestFd; i > 0; --i) {
+
-+ *welcome->we_prev_p = welcome->we_next; /* squeeze this welcome entry out */
-+ if (welcome->we_next)
-+ welcome->we_next->we_prev_p = welcome->we_prev_p;
++ /* skip unregistered clients - they see the message during login
++ * skip servers
++ */
++ if (!(acptr = LocalClientArray[i]) || !IsRegistered(acptr) || IsServer(acptr))
++ continue;
+
-+ MyFree(welcome->we_text); /* and free up the memory */
-+ MyFree(welcome->we_who);
-+ MyFree(welcome);
++ /* send it away */
++ send_buffer(acptr, msgbuf, 0);
++ }
+}
+
+
+void
+welcome_burst(struct Client *cptr)
+{
-+ struct Welcome *welcome;
-+ struct Welcome *swelcome;
++ int name;
++
++ assert(NULL != cptr);
+
-+ for (welcome = GlobalWelcomeList; welcome; welcome = swelcome) {
-+ swelcome = welcome->we_next;
-+ if (!WelcomeIsLocal(welcome))
++ /* loop over global entries - 0 to max - 1*/
++ for (name = 0; name <= WELCOME_MAX_ENTRIES - 1; name++) {
++ if (WelcomeArray[name].timestamp != 0)
+ sendcmdto_one(&me, CMD_WELCOME, cptr, "* %d %Tu %s :%s",
-+ welcome->we_name, welcome->we_timestamp, welcome->we_who, welcome->we_text);
++ name + 1, WelcomeArray[name].timestamp, WelcomeArray[name].who,
++ WelcomeArray[name].text);
+ }
+}
+
+
-+/** Forward a welcome to another server.
-+ * @param[in] cptr %Server to send welcome to.
-+ * @param[in] welcome Welcome to forward.
-+ */
-+int
-+welcome_resend(struct Client *cptr, struct Welcome *welcome)
-+{
-+ sendcmdto_one(&me, CMD_WELCOME, cptr, "* %d %Tu %s :%s",
-+ welcome->we_name, welcome->we_timestamp, welcome->we_who, welcome->we_text);
-+ return 0;
-+}
-+
-+
+/** List welcome messages.
+ * @param[in] sptr Client requesting the listing.
+ * @param[in] connect When non zero do not report no welcome is set
+int
+welcome_list(struct Client *sptr, int connect)
+{
-+ struct Welcome *welcome;
-+ int found = 0, name = 1, local = 0;
-+
-+ while (name <= WELCOME_MAX_ENTRIES) {
-+ welcome = welcome_find(name, local);
-+ if (welcome && WelcomeIsSet(welcome)) {
-+ found++;
-+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :[%s] %s",
-+ sptr, local ? cli_name(&me) : feature_str(FEAT_NETWORK), welcome->we_text);
-+ }
-+ if (name == WELCOME_MAX_ENTRIES && !local) {
-+ name = 0;
-+ local = 1;
-+ }
-+ name++;
-+ }
++ int found = 0, local = 0, name;
++
++ assert(NULL != sptr);
+
-+ /*
-+ char *awelcome[2 * WELCOME_MAX_ENTRIES + 1];
++ /* loop over all entries - range 0 to 2 * max - 1 */
++ for (name = 0; name <= 2 * WELCOME_MAX_ENTRIES - 1; name++) {
+
-+ awelcome = welcome_sort();
++ /* local entries now */
++ if (name == WELCOME_MAX_ENTRIES)
++ local = 1;
+
-+ while (i <= 2 * WELCOME_MAX_ENTRIES) {
-+ i++;
-+ welcome = awelcome[i];
-+ if (!welcome)
++ /* not set or empty - skip */
++ /* TODO: EmptyString? */
++ if (WelcomeArray[name].timestamp == 0 || *WelcomeArray[name].text == 0)
+ continue;
++
++ /* got one */
+ found++;
-+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :W %d %s %s %Tu :%s",
-+ sptr, welcome->we_name, WelcomeIsLocal(welcome) ? cli_name(&me) : "*",
-+ welcome->we_who, welcome->we_timestamp, welcome->we_text);
++ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :[%s] %s",
++ sptr, local ? cli_name(&me) : feature_str(FEAT_NETWORK), WelcomeArray[name].text);
+ }
-+ */
++
++ /* nothing set */
+ if (!found && !connect)
-+ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :No welcome message set.", sptr);
++ sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :No welcome message set.", sptr);
++
+ return 0;
+}
+
+void
+welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param)
+{
-+ struct Welcome *welcome;
-+ int found = 0, name = 1, local = 0;
-+
-+ /* send header so the client knows what we are showing */
-+ send_reply(sptr, SND_EXPLICIT | RPL_STATSHEADER,
-+ "W Name Target Who Timestamp :Message");
-+
-+ while (name <= WELCOME_MAX_ENTRIES) {
-+ welcome = welcome_find(name, local);
-+ if (welcome) {
-+ found++;
-+ send_reply(sptr, RPL_STATSWELCOME, welcome->we_name, local ? cli_name(&me) : "*",
-+ welcome->we_who, welcome->we_timestamp, welcome->we_text);
-+ }
-+ if (name == WELCOME_MAX_ENTRIES && !local) {
-+ name = 0;
-+ local = 1;
-+ }
-+ name++;
-+ }
-+}
++ int name, local = 0;
+
++ assert(NULL != sptr);
+
-+/** Count welcomes and memory used by it.
-+ * @param[out] we_size Receives total number of bytes allocated for welcome.
-+ * @return Number of welcomes currently allocated.
-+ */
-+int
-+welcome_memory_count(size_t *we_size)
-+{
-+ struct Welcome *welcome;
-+ unsigned int we = 0;
++ /* loop over all entries - range 0 to 2 * max - 1*/
++ for (name = 0; name <= 2 * WELCOME_MAX_ENTRIES - 1; name++) {
+
-+ for (welcome = GlobalWelcomeList; welcome; welcome = welcome->we_next)
-+ {
-+ we++;
-+ *we_size += sizeof(struct Welcome);
-+ *we_size += welcome->we_text ? (strlen(welcome->we_text) + 1) : 0;
-+ *we_size += welcome->we_who ? (strlen(welcome->we_who) + 1) : 0;
++ /* local entries now */
++ if (name == WELCOME_MAX_ENTRIES)
++ local = 1;
++
++ /* not set */
++ if (WelcomeArray[name].timestamp == 0)
++ 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);
+ }
-+ return we;
+}
-\ No newline at end of file
projects / irc / quakenet / snircd-patchqueue.git / blobdiff