ircd/ircd_parser.y
add PRIV_LOCAL_WELCOME PRIV_WELCOME
-diff -r a9b437e961ec include/client.h
+diff -r 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 include/welcome.h
--- /dev/null
+++ b/include/welcome.h
@@ -0,0 +1,75 @@
+
+
+/* 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 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 93eb31739cc6 ircd/welcome.c
--- /dev/null
+++ b/ircd/welcome.c
-@@ -0,0 +1,609 @@
+@@ -0,0 +1,628 @@
+/*
+ * 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)
+{
-+ /* valid range */
+ assert(WelcomeIsValid(name));
++ assert(NULL != text);
++ assert(NULL != who);
+
+ /* store it */
+ ircd_strncpy(WelcomeArray[name].text, text, WELCOMELEN);
+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);
++ assert(nameint > 0 && nameint <= WELCOME_MAX_ENTRIES);
++ assert(!(flags & WELCOME_LOCAL));
+
+ 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;
+int
+welcome_resend(struct Client *cptr, int nameint, int namearray)
+{
-+ /* must be valid */
-+ assert(WelcomeIsValid(namearray));
+ assert(NULL != cptr);
+ assert(IsServer(cptr));
++ assert(nameint > 0 && nameint <= WELCOME_MAX_ENTRIES);
++ assert(WelcomeIsValid(namearray));
+
+ sendcmdto_one(&me, CMD_WELCOME, cptr, "* %d %Tu %s :%s",
+ nameint, WelcomeTS(namearray), WelcomeWho(namearray), WelcomeText(namearray));
+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",
+ char msg[BUFSIZE]; /* msg for logging */
+ int new = 0;
+
++ assert(NULL != cptr);
++ assert(NULL != sptr);
++ assert(nameint > 0 && nameint <= WELCOME_MAX_ENTRIES);
++ assert(WelcomeIsValid(namearray));
++
+ /* 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));
+ int empty = namearray; /* first empty spot in array after namearray */
+ int end = WELCOME_MAX_ENTRIES -1; /* last element to check in array */
+
++ assert(NULL != cptr);
++ assert(NULL != sptr);
++ assert(nameint > 0 && nameint <= WELCOME_MAX_ENTRIES);
++ assert(WelcomeIsValid(namearray));
++
+ /* 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));
+ int end = WELCOME_MAX_ENTRIES -1; /* last element to check in array */
+ int last = end; /* last welcome message to feed to welcome_unset */
+
++ assert(NULL != cptr);
++ assert(NULL != sptr);
++ assert(nameint > 0 && nameint <= WELCOME_MAX_ENTRIES);
++ assert(WelcomeIsValid(namearray));
++
+ /* 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));
+{
+ 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 */
+
+ assert(NULL != cptr);
+ assert(NULL != sptr);
+ if (IsUser(sptr))
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
+ "%C :WELCOME: Invalid message number %s - should between 1 and %d",
-+ sptr, name, max);
++ sptr, name, WELCOME_MAX_ENTRIES);
+ else
+ protocol_violation(cptr,
+ "WELCOME: Invalid message number %s from %C - should be between 1 and %d",
-+ name, sptr, max);
++ name, sptr, WELCOME_MAX_ENTRIES);
+ return 0;
+ }
+
+
+ /* must be true by now */
+ assert(WelcomeIsValid(namearray));
++ assert(nameint > 0 && nameint <= WELCOME_MAX_ENTRIES);
+
+ /* cannot unset welcome that is not set */
+ if (!WelcomeIsSet(namearray) && EmptyString(text)) {
+ * 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 (MyUser(sptr) && WelcomeTS(namearray) >= timestamp)
-+ timestamp = WelcomeTS(namearray) +1;
++ if (MyUser(sptr)) {
++ if (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'
++ * 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 */
-+ ((strlen(WelcomeText(namearray)) < strlen(text)) || /* our text is shorter */
-+ (ircd_strcmp(WelcomeText(namearray), text) < 0)))) { /* our text is 'smaller' */
++ else if ((timestamp < WelcomeTS(namearray)) || /* we got a newer one */
++ ((timestamp == WelcomeTS(namearray)) && /* same timestamp */
++ (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;
+ * compare new message with old message
+ */
+ if (IsUser(sptr) && (MyUser(sptr) || (flags & WELCOME_LOCAL))) {
-+ if (ircd_strcmp(text, WelcomeText(namearray)) == 0) {
++ if (strcmp(text, WelcomeText(namearray)) == 0) { /* use strcmp because the user may wish to change case */
+ sendcmdto_one(&me, CMD_NOTICE, sptr,
+ "%C :WELCOME: Cannot change %s message for %s - nothing to change",
+ sptr, (flags & WELCOME_LOCAL) ? "local" : "global", name);
+ }
+
+ /* do not insert for last global/local entry and when not set yet */
-+ if ((flags & WELCOME_INSERT) && ((!WelcomeIsSet(namearray)) || (nameint == max)))
++ if ((flags & WELCOME_INSERT) &&
++ ((!WelcomeIsSet(namearray)) || (nameint == WELCOME_MAX_ENTRIES)))
+ flags &= ~WELCOME_INSERT;
+
+ /* unset */
projects / irc / quakenet / snircd-patchqueue.git / blobdiff