ircd/s_user.c
add showing of welcome messages on connect
-diff -r 42bf40ebc839 include/handlers.h
---- a/include/handlers.h Fri Jan 30 11:47:37 2009 +0100
-+++ b/include/handlers.h Fri Jan 30 13:14:46 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 0e1d8ae7ca15 include/client.h
+--- a/include/client.h Sun Feb 15 16:04:36 2009 +0100
++++ b/include/client.h Sun Feb 15 16:05:56 2009 +0100
+@@ -149,6 +149,8 @@
+ PRIV_GLINE_LOOKUP, /* staff can use /GLINE to lookup a gline */
+ PRIV_HIDE_CHANS, /* oper can set usermode +n */
+ PRIV_CHECK_CHANNEL, /* staff can /CHECK #channel */
++ PRIV_WELCOME, /* oper can WELCOME */
++ PRIV_LOCAL_WELCOME, /* oper can local WELCOME */
+ PRIV_LAST_PRIV /**< number of privileges */
+ };
+
+diff -r 0e1d8ae7ca15 include/handlers.h
+--- a/include/handlers.h Sun Feb 15 16:04:36 2009 +0100
++++ b/include/handlers.h Sun Feb 15 16:05:56 2009 +0100
+@@ -154,6 +154,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 @@
+@@ -189,6 +190,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 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 @@
+@@ -247,6 +249,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_whois(struct Client*, struct Client*, int, char*[]);
extern int mh_nohelp(struct Client*, struct Client*, int, char*[]);
-@@ -308,6 +311,7 @@
+@@ -313,6 +316,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_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 42bf40ebc839 include/ircd_features.h
---- a/include/ircd_features.h Fri Jan 30 11:47:37 2009 +0100
-+++ b/include/ircd_features.h Fri Jan 30 13:14:46 2009 +0100
+diff -r 0e1d8ae7ca15 include/ircd_features.h
+--- a/include/ircd_features.h Sun Feb 15 16:04:36 2009 +0100
++++ b/include/ircd_features.h Sun Feb 15 16:05:56 2009 +0100
@@ -101,6 +101,7 @@
FEAT_IRCD_RES_TIMEOUT,
FEAT_AUTH_TIMEOUT,
FEAT_HIS_STATS_w,
FEAT_HIS_STATS_x,
FEAT_HIS_STATS_y,
-diff -r 42bf40ebc839 include/msg.h
---- a/include/msg.h Fri Jan 30 11:47:37 2009 +0100
-+++ b/include/msg.h Fri Jan 30 13:14:46 2009 +0100
-@@ -196,6 +196,10 @@
+diff -r 0e1d8ae7ca15 include/msg.h
+--- a/include/msg.h Sun Feb 15 16:04:36 2009 +0100
++++ b/include/msg.h Sun Feb 15 16:05:56 2009 +0100
+@@ -200,6 +200,10 @@
#define TOK_NOTICE "O"
#define CMD_NOTICE MSG_NOTICE, TOK_NOTICE
#define MSG_WALLCHOPS "WALLCHOPS" /* WC */
#define TOK_WALLCHOPS "WC"
#define CMD_WALLCHOPS MSG_WALLCHOPS, TOK_WALLCHOPS
-diff -r 42bf40ebc839 include/numeric.h
---- a/include/numeric.h Fri Jan 30 11:47:37 2009 +0100
-+++ b/include/numeric.h Fri Jan 30 13:14:46 2009 +0100
+diff -r 0e1d8ae7ca15 include/numeric.h
+--- a/include/numeric.h Sun Feb 15 16:04:36 2009 +0100
++++ b/include/numeric.h Sun Feb 15 16:05:56 2009 +0100
@@ -116,6 +116,7 @@
RPL_STATSGLINE 227 Dalnet
RPL_STATSVLINE 227 unreal */
#define ERR_SILELISTFULL 511 /* Undernet extension */
/* ERR_NOTIFYFULL 512 aircd */
/* ERR_TOOMANYWATCH 512 Numeric List: Dalnet */
-diff -r 42bf40ebc839 include/welcome.h
+diff -r 0e1d8ae7ca15 include/welcome.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/welcome.h Fri Jan 30 13:14:46 2009 +0100
++++ b/include/welcome.h Sun Feb 15 16:05:56 2009 +0100
@@ -0,0 +1,60 @@
+#ifndef INCLUDED_welcome_h
+#define INCLUDED_welcome_h
+extern void welcome_stats(struct Client *sptr, const struct StatDesc *sd, char *param);
+
+#endif /* INCLUDED_welcome_h */
-diff -r 42bf40ebc839 ircd/Makefile.in
---- a/ircd/Makefile.in Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/Makefile.in Fri Jan 30 13:14:46 2009 +0100
-@@ -187,6 +187,7 @@
+diff -r 0e1d8ae7ca15 ircd/Makefile.in
+--- a/ircd/Makefile.in Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/Makefile.in Sun Feb 15 16:05:56 2009 +0100
+@@ -188,6 +188,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 @@
+@@ -1180,6 +1182,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 @@
+@@ -1441,6 +1448,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 42bf40ebc839 ircd/ircd_features.c
---- a/ircd/ircd_features.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/ircd_features.c Fri Jan 30 13:14:46 2009 +0100
-@@ -355,6 +355,7 @@
+diff -r 0e1d8ae7ca15 ircd/client.c
+--- a/ircd/client.c Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/client.c Sun Feb 15 16:05:56 2009 +0100
+@@ -184,6 +184,7 @@
+ FlagSet(&privs_local, PRIV_WHOX);
+ FlagSet(&privs_local, PRIV_DISPLAY);
+ FlagSet(&privs_local, PRIV_FORCE_LOCAL_OPMODE);
++ FlagSet(&privs_local, PRIV_LOCAL_WELCOME);
+ FlagClr(&privs_local, PRIV_STAFF);
+ FlagClr(&privs_local, PRIV_CLAIM_NICK);
+ FlagClr(&privs_local, PRIV_GLINE_LOOKUP);
+@@ -247,6 +248,7 @@
+ ClrPriv(client, PRIV_OPMODE);
+ ClrPriv(client, PRIV_OPKICK);
+ ClrPriv(client, PRIV_BADCHAN);
++ ClrPriv(client, PRIV_WELCOME);
+ }
+ /* TODO: better way than this? */
+ /* do not let staff have privs they should not have */
+@@ -283,6 +285,7 @@
+ P(USER_PRIVACY),
+ P(STAFF), P(CLAIM_NICK), P(GLINE_LOOKUP), P(HIDE_CHANS),
+ P(CHECK_CHANNEL),
++ P(WELCOME), P(LOCAL_WELCOME),
+ #undef P
+ { 0, 0 }
+ };
+diff -r 0e1d8ae7ca15 ircd/ircd_features.c
+--- a/ircd/ircd_features.c Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/ircd_features.c Sun Feb 15 16:05:56 2009 +0100
+@@ -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 @@
+@@ -408,6 +409,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 42bf40ebc839 ircd/m_welcome.c
+diff -r 0e1d8ae7ca15 ircd/ircd_lexer.l
+--- a/ircd/ircd_lexer.l Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/ircd_lexer.l Sun Feb 15 16:05:56 2009 +0100
+@@ -173,6 +173,8 @@
+ { "gline_lookup", TPRIV_GLINE_LOOKUP },
+ { "hide_chans", TPRIV_HIDE_CHANS },
+ { "check_channel", TPRIV_CHECK_CHANNEL },
++ { "local_welcome", TPRIV_LOCAL_WELCOME },
++ { "welcome", TPRIV_WELCOME },
+ { NULL, 0 }
+ };
+ static int ntokens;
+diff -r 0e1d8ae7ca15 ircd/ircd_parser.y
+--- a/ircd/ircd_parser.y Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/ircd_parser.y Sun Feb 15 16:05:56 2009 +0100
+@@ -192,6 +192,7 @@
+ %token TPRIV_CHANNEL_PRIVACY TPRIV_USER_PRIVACY TPRIV_LIST_CHAN
+ %token TPRIV_STAFF TPRIV_CLAIM_NICK TPRIV_GLINE_LOOKUP TPRIV_HIDE_CHANS
+ %token TPRIV_CHECK_CHANNEL
++%token TPRIV_LOCAL_WELCOME TPRIV_WELCOME
+ /* and some types... */
+ %type <num> sizespec
+ %type <num> timespec timefactor factoredtimes factoredtime
+@@ -715,6 +716,8 @@
+ TPRIV_GLINE_LOOKUP { $$ = PRIV_GLINE_LOOKUP; } |
+ TPRIV_CHECK_CHANNEL { $$ = PRIV_CHECK_CHANNEL; } |
+ TPRIV_HIDE_CHANS { $$ = PRIV_HIDE_CHANS; } |
++ TPRIV_LOCAL_WELCOME { $$ = PRIV_LOCAL_WELCOME; } |
++ TPRIV_WELCOME { $$ = PRIV_WELCOME; } |
+ TPRIV_PARANOID { $$ = PRIV_PARANOID; } ;
+ yesorno: YES { $$ = 1; } | NO { $$ = 0; };
+
+diff -r 0e1d8ae7ca15 ircd/m_welcome.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/m_welcome.c Fri Jan 30 13:14:46 2009 +0100
-@@ -0,0 +1,300 @@
++++ b/ircd/m_welcome.c Sun Feb 15 16:05:56 2009 +0100
+@@ -0,0 +1,308 @@
+/*
+ * 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"
+ if (parc < 2)
+ return welcome_list(sptr, 0);
+
-+ /* TODO: add PRIV_WELCOME? */
-+ /* check PRIVS */
-+ if (!HasPriv(sptr,PRIV_SERVERINFO))
-+ return send_reply(sptr, ERR_NOPRIVILEGES);
-+
++ /* TODO: move feature check here? */
+ /* 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);
+ }
-+
++
++ /* check PRIVS */
++ /* 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);
++
+ /* set the parameters */
+
+ /* target not given, only name - setting local welcome */
+ /* 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 == '!') {
+ }
+ return 0;
+}
-diff -r 42bf40ebc839 ircd/parse.c
---- a/ircd/parse.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/parse.c Fri Jan 30 13:14:46 2009 +0100
-@@ -667,6 +667,15 @@
+diff -r 0e1d8ae7ca15 ircd/parse.c
+--- a/ircd/parse.c Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/parse.c Sun Feb 15 16:05:56 2009 +0100
+@@ -674,6 +674,15 @@
/* UNREG, CLIENT, SERVER, OPER, SERVICE, HELP */
{ m_unregistered, m_not_oper, ms_opkick, mo_opkick, m_ignore, mh_nohelp }
},
/* 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 42bf40ebc839 ircd/s_err.c
---- a/ircd/s_err.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/s_err.c Fri Jan 30 13:14:46 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/s_err.c
+--- a/ircd/s_err.c Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/s_err.c Sun Feb 15 16:05:56 2009 +0100
@@ -486,7 +486,7 @@
/* 226 */
{ RPL_STATSALINE, "%s", "226" },
/* 510 */
{ 0 },
/* 511 */
-diff -r 42bf40ebc839 ircd/s_serv.c
---- a/ircd/s_serv.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/s_serv.c Fri Jan 30 13:14:46 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/s_serv.c
+--- a/ircd/s_serv.c Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/s_serv.c Sun Feb 15 16:05:56 2009 +0100
@@ -57,6 +57,7 @@
#include "struct.h"
#include "sys.h"
/*
* Pass on my client information to the new server
-diff -r 42bf40ebc839 ircd/s_stats.c
---- a/ircd/s_stats.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/s_stats.c Fri Jan 30 13:14:46 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/s_stats.c
+--- a/ircd/s_stats.c Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/s_stats.c Sun Feb 15 16:05:56 2009 +0100
@@ -54,6 +54,7 @@
#include "send.h"
#include "struct.h"
#include <stdio.h>
#include <stdlib.h>
-@@ -689,9 +690,12 @@
+@@ -691,9 +692,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 42bf40ebc839 ircd/s_user.c
---- a/ircd/s_user.c Fri Jan 30 11:47:37 2009 +0100
-+++ b/ircd/s_user.c Fri Jan 30 13:14:46 2009 +0100
+diff -r 0e1d8ae7ca15 ircd/s_user.c
+--- a/ircd/s_user.c Sun Feb 15 16:04:36 2009 +0100
++++ b/ircd/s_user.c Sun Feb 15 16:05:56 2009 +0100
@@ -63,6 +63,7 @@
#include "userload.h"
#include "version.h"
#include "handlers.h" /* m_motd and m_lusers */
-@@ -411,6 +412,9 @@
+@@ -413,6 +414,9 @@
cli_info(sptr), NumNick(cptr) /* two %s's */);
IPcheck_connect_succeeded(sptr);
}
else {
struct Client *acptr = user->server;
-diff -r 42bf40ebc839 ircd/welcome.c
+diff -r 0e1d8ae7ca15 ircd/welcome.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/ircd/welcome.c Fri Jan 30 13:14:46 2009 +0100
++++ b/ircd/welcome.c Sun Feb 15 16:05:56 2009 +0100
@@ -0,0 +1,373 @@
+/*
+ * IRC - Internet Relay Chat, ircd/welcome.c
projects / irc / quakenet / snircd-patchqueue.git / blobdiff