From 428ca87b01ad6c0487b424ce478f775cb7d94519 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 10 Feb 2016 20:54:17 -0600 Subject: [PATCH] modules: chase MsgBuf API change --- modules/core/m_ban.c | 8 ++++---- modules/core/m_die.c | 8 ++++---- modules/core/m_error.c | 8 ++++---- modules/core/m_join.c | 12 ++++++------ modules/core/m_kick.c | 4 ++-- modules/core/m_kill.c | 8 ++++---- modules/core/m_message.c | 16 ++++++++-------- modules/core/m_mode.c | 20 ++++++++++---------- modules/core/m_nick.c | 28 ++++++++++++++-------------- modules/core/m_part.c | 4 ++-- modules/core/m_quit.c | 8 ++++---- modules/core/m_server.c | 12 ++++++------ modules/core/m_squit.c | 8 ++++---- modules/m_accept.c | 4 ++-- modules/m_admin.c | 12 ++++++------ modules/m_away.c | 4 ++-- modules/m_cap.c | 4 ++-- modules/m_capab.c | 8 ++++---- modules/m_certfp.c | 4 ++-- modules/m_challenge.c | 4 ++-- modules/m_chghost.c | 16 ++++++++-------- modules/m_close.c | 4 ++-- modules/m_cmessage.c | 16 ++++++++-------- modules/m_connect.c | 8 ++++---- modules/m_dline.c | 16 ++++++++-------- modules/m_encap.c | 6 +++--- modules/m_etrace.c | 16 ++++++++-------- modules/m_grant.c | 8 ++++---- modules/m_help.c | 12 ++++++------ modules/m_info.c | 8 ++++---- modules/m_invite.c | 4 ++-- modules/m_ison.c | 4 ++-- modules/m_kline.c | 24 ++++++++++++------------ modules/m_knock.c | 4 ++-- modules/m_links.c | 10 +++++----- modules/m_list.c | 10 +++++----- modules/m_locops.c | 12 ++++++------ modules/m_lusers.c | 8 ++++---- modules/m_map.c | 8 ++++---- modules/m_monitor.c | 4 ++-- modules/m_motd.c | 8 ++++---- modules/m_names.c | 4 ++-- modules/m_oper.c | 4 ++-- modules/m_operspy.c | 4 ++-- modules/m_pass.c | 4 ++-- modules/m_ping.c | 8 ++++---- modules/m_pong.c | 8 ++++---- modules/m_post.c | 4 ++-- modules/m_privs.c | 12 ++++++------ modules/m_rehash.c | 8 ++++---- modules/m_restart.c | 8 ++++---- modules/m_resv.c | 24 ++++++++++++------------ modules/m_sasl.c | 8 ++++---- modules/m_scan.c | 14 +++++++------- modules/m_services.c | 16 ++++++++-------- modules/m_set.c | 4 ++-- modules/m_signon.c | 8 ++++---- modules/m_snote.c | 4 ++-- modules/m_starttls.c | 4 ++-- modules/m_stats.c | 6 ++++-- modules/m_svinfo.c | 4 ++-- modules/m_tb.c | 8 ++++---- modules/m_testline.c | 8 ++++---- modules/m_testmask.c | 4 ++-- modules/m_tginfo.c | 4 ++-- modules/m_time.c | 4 ++-- modules/m_topic.c | 8 ++++---- modules/m_trace.c | 4 ++-- modules/m_unreject.c | 4 ++-- modules/m_user.c | 4 ++-- modules/m_userhost.c | 4 ++-- modules/m_users.c | 4 ++-- modules/m_version.c | 8 ++++---- modules/m_wallops.c | 12 ++++++------ modules/m_who.c | 4 ++-- modules/m_whois.c | 8 ++++---- modules/m_whowas.c | 4 ++-- modules/m_xline.c | 24 ++++++++++++------------ 78 files changed, 332 insertions(+), 330 deletions(-) diff --git a/modules/core/m_ban.c b/modules/core/m_ban.c index e68b8487e..5056ab427 100644 --- a/modules/core/m_ban.c +++ b/modules/core/m_ban.c @@ -46,8 +46,8 @@ #include "hostmask.h" #include "logger.h" -static int m_ban(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int m_ban(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int ms_ban(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); struct Message ban_msgtab = { "BAN", 0, 0, 0, MFLG_SLOW, @@ -58,7 +58,7 @@ mapi_clist_av1 ban_clist[] = { &ban_msgtab, NULL }; DECLARE_MODULE_AV1(ban, NULL, NULL, ban_clist, NULL, NULL, "$Revision: 1349 $"); static int -m_ban(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_ban(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { sendto_one_notice(source_p, ":The BAN command is not user-accessible."); sendto_one_notice(source_p, ":To ban a user from a channel, see /QUOTE HELP CMODE"); @@ -79,7 +79,7 @@ m_ban(struct Client *client_p, struct Client *source_p, int parc, const char *pa * parv[8] - reason (possibly with |operreason) */ static int -ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_ban(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { rb_dlink_node *ptr; struct ConfItem *aconf; diff --git a/modules/core/m_die.c b/modules/core/m_die.c index ef4394f35..997eaa6db 100644 --- a/modules/core/m_die.c +++ b/modules/core/m_die.c @@ -38,8 +38,8 @@ #include "s_newconf.h" #include "hash.h" -static int mo_die(struct Client *, struct Client *, int, const char **); -static int me_die(struct Client *, struct Client *, int, const char **); +static int mo_die(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_die(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static int do_die(struct Client *, const char *); static struct Message die_msgtab = { @@ -55,7 +55,7 @@ DECLARE_MODULE_AV1(die, NULL, NULL, die_clist, NULL, NULL, "$Revision: 3295 $"); * mo_die - DIE command handler */ static int -mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[]) +mo_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[]) { if(!IsOperDie(source_p)) { @@ -90,7 +90,7 @@ mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, cons } static int -me_die(struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[]) +me_die(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[]) { if(!find_shared_conf(source_p->username, source_p->host, source_p->servptr->name, SHARED_DIE)) { diff --git a/modules/core/m_error.c b/modules/core/m_error.c index 9699db9d0..d943f3f81 100644 --- a/modules/core/m_error.c +++ b/modules/core/m_error.c @@ -35,8 +35,8 @@ #include "logger.h" #include "s_conf.h" -static int m_error(struct Client *, struct Client *, int, const char **); -static int ms_error(struct Client *, struct Client *, int, const char **); +static int m_error(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_error(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message error_msgtab = { "ERROR", 0, 0, 0, MFLG_SLOW | MFLG_UNREG, @@ -88,7 +88,7 @@ is_safe_error(const char *message) * parv[*] = parameters */ int -m_error(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_error(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *para; int hideit = ConfigFileEntry.hide_error_messages; @@ -121,7 +121,7 @@ m_error(struct Client *client_p, struct Client *source_p, int parc, const char * } static int -ms_error(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_error(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *para; int hideit = ConfigFileEntry.hide_error_messages; diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 9dcd3964a..7ceaba75d 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -44,9 +44,9 @@ #include "ratelimit.h" #include "s_assert.h" -static int m_join(struct Client *, struct Client *, int, const char **); -static int ms_join(struct Client *, struct Client *, int, const char **); -static int ms_sjoin(struct Client *, struct Client *, int, const char **); +static int m_join(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_join(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_sjoin(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static int h_can_create_channel; static int h_channel_join; @@ -139,7 +139,7 @@ check_forward(struct Client *source_p, struct Channel *chptr, * parv[2] = channel password (key) */ static int -m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static char jbuf[BUFSIZE]; struct Channel *chptr = NULL, *chptr2 = NULL; @@ -392,7 +392,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p * alternatively, a single "0" parameter parts all channels */ static int -ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr; static struct Mode mode; @@ -512,7 +512,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * } static int -ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static char buf_uid[BUFSIZE]; static const char empty_modes[] = "0"; diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c index 6f7e6a168..b3bf8df15 100644 --- a/modules/core/m_kick.c +++ b/modules/core/m_kick.c @@ -39,7 +39,7 @@ #include "s_serv.h" #include "hook.h" -static int m_kick(struct Client *, struct Client *, int, const char **); +static int m_kick(struct MsgBuf *, struct Client *, struct Client *, int, const char **); #define mg_kick { m_kick, 3 } struct Message kick_msgtab = { @@ -58,7 +58,7 @@ DECLARE_MODULE_AV1(kick, NULL, NULL, kick_clist, NULL, NULL, "$Revision: 3317 $" ** parv[3] = kick comment */ static int -m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_kick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct membership *msptr; struct Client *who; diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c index c673f37e0..272d1aa06 100644 --- a/modules/core/m_kill.c +++ b/modules/core/m_kill.c @@ -43,8 +43,8 @@ static int h_can_kill; static char buf[BUFSIZE]; -static int ms_kill(struct Client *, struct Client *, int, const char **); -static int mo_kill(struct Client *, struct Client *, int, const char **); +static int ms_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void relay_kill(struct Client *, struct Client *, struct Client *, const char *, const char *); @@ -68,7 +68,7 @@ DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, kill_hlist, NULL, "$Revision: 3 ** parv[2] = kill path */ static int -mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; const char *inpath = client_p->name; @@ -178,7 +178,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char * * parv[2] = kill path and reason */ static int -ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; const char *user; diff --git a/modules/core/m_message.c b/modules/core/m_message.c index 70963f4d4..34fa5b69d 100644 --- a/modules/core/m_message.c +++ b/modules/core/m_message.c @@ -46,9 +46,9 @@ #include "tgchange.h" #include "inline/stringops.h" -static int m_message(enum message_type, struct Client *, struct Client *, int, const char **); -static int m_privmsg(struct Client *, struct Client *, int, const char **); -static int m_notice(struct Client *, struct Client *, int, const char **); +static int m_message(enum message_type, struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int m_privmsg(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int m_notice(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void expire_tgchange(void *unused); static struct ev_entry *expire_tgchange_event; @@ -152,15 +152,15 @@ const char *cmdname[MESSAGE_TYPE_COUNT] = { }; static int -m_privmsg(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_privmsg(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { - return m_message(MESSAGE_TYPE_PRIVMSG, client_p, source_p, parc, parv); + return m_message(MESSAGE_TYPE_PRIVMSG, msgbuf_p, client_p, source_p, parc, parv); } static int -m_notice(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_notice(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { - return m_message(MESSAGE_TYPE_NOTICE, client_p, source_p, parc, parv); + return m_message(MESSAGE_TYPE_NOTICE, msgbuf_p, client_p, source_p, parc, parv); } /* @@ -170,7 +170,7 @@ m_notice(struct Client *client_p, struct Client *source_p, int parc, const char * - pointer to channel */ static int -m_message(enum message_type msgtype, +m_message(enum message_type msgtype, struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int i; diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c index 458de564a..355e382a5 100644 --- a/modules/core/m_mode.c +++ b/modules/core/m_mode.c @@ -42,11 +42,11 @@ #include "packet.h" #include "s_newconf.h" -static int m_mode(struct Client *, struct Client *, int, const char **); -static int ms_mode(struct Client *, struct Client *, int, const char **); -static int ms_tmode(struct Client *, struct Client *, int, const char **); -static int ms_mlock(struct Client *, struct Client *, int, const char **); -static int ms_bmask(struct Client *, struct Client *, int, const char **); +static int m_mode(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_mode(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_tmode(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_mlock(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_bmask(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message mode_msgtab = { "MODE", 0, 0, 0, MFLG_SLOW, @@ -74,7 +74,7 @@ DECLARE_MODULE_AV1(mode, NULL, NULL, mode_clist, NULL, NULL, "$Revision: 1006 $" * parv[1] - channel */ static int -m_mode(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr = NULL; struct membership *msptr; @@ -151,7 +151,7 @@ m_mode(struct Client *client_p, struct Client *source_p, int parc, const char *p } static int -ms_mode(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr; @@ -170,7 +170,7 @@ ms_mode(struct Client *client_p, struct Client *source_p, int parc, const char * } static int -ms_tmode(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_tmode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr = NULL; struct membership *msptr; @@ -210,7 +210,7 @@ ms_tmode(struct Client *client_p, struct Client *source_p, int parc, const char } static int -ms_mlock(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_mlock(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr = NULL; @@ -270,7 +270,7 @@ possibly_remove_lower_forward(struct Client *fakesource_p, int mems, } static int -ms_bmask(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_bmask(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static char modebuf[BUFSIZE]; static char parabuf[BUFSIZE]; diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c index 93d19d816..fab15e5b6 100644 --- a/modules/core/m_nick.c +++ b/modules/core/m_nick.c @@ -56,13 +56,13 @@ */ #define SAVE_NICKTS 100 -static int mr_nick(struct Client *, struct Client *, int, const char **); -static int m_nick(struct Client *, struct Client *, int, const char **); -static int mc_nick(struct Client *, struct Client *, int, const char **); -static int ms_nick(struct Client *, struct Client *, int, const char **); -static int ms_uid(struct Client *, struct Client *, int, const char **); -static int ms_euid(struct Client *, struct Client *, int, const char **); -static int ms_save(struct Client *, struct Client *, int, const char **); +static int mr_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int m_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mc_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_uid(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_euid(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_save(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static int can_save(struct Client *); static void save_user(struct Client *, struct Client *, struct Client *); static void bad_nickname(struct Client *, const char *); @@ -111,7 +111,7 @@ static int perform_nickchange_collides(struct Client *, struct Client *, * parv[1] = nickname */ static int -mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; char nick[NICKLEN]; @@ -169,7 +169,7 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char * * parv[1] = nickname */ static int -m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; char nick[NICKLEN]; @@ -244,7 +244,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p * parv[2] = TS when nick change */ static int -mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mc_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; time_t newts = 0; @@ -284,7 +284,7 @@ mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char * } static int -ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *nick, *server; @@ -317,7 +317,7 @@ ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char * * parv[9] - gecos */ static int -ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_uid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; time_t newts = 0; @@ -408,7 +408,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p * parv[11] - gecos */ static int -ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_euid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; time_t newts = 0; @@ -500,7 +500,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char * * parv[2] - TS */ static int -ms_save(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_save(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; diff --git a/modules/core/m_part.c b/modules/core/m_part.c index 17fac283e..db2d96717 100644 --- a/modules/core/m_part.c +++ b/modules/core/m_part.c @@ -42,7 +42,7 @@ #include "inline/stringops.h" #include "hook.h" -static int m_part(struct Client *, struct Client *, int, const char **); +static int m_part(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message part_msgtab = { "PART", 0, 0, 0, MFLG_SLOW, @@ -66,7 +66,7 @@ static int do_message_hook(struct Client *source_p, struct Channel *chptr, const ** parv[2] = reason */ static int -m_part(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_part(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char *p, *name; char reason[REASONLEN + 1]; diff --git a/modules/core/m_quit.c b/modules/core/m_quit.c index 22e1ae4e2..52489e161 100644 --- a/modules/core/m_quit.c +++ b/modules/core/m_quit.c @@ -36,8 +36,8 @@ #include "s_conf.h" #include "inline/stringops.h" -static int m_quit(struct Client *, struct Client *, int, const char **); -static int ms_quit(struct Client *, struct Client *, int, const char **); +static int m_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message quit_msgtab = { "QUIT", 0, 0, 0, MFLG_SLOW | MFLG_UNREG, @@ -53,7 +53,7 @@ DECLARE_MODULE_AV1(quit, NULL, NULL, quit_clist, NULL, NULL, "$Revision: 1333 $" ** parv[1] = comment */ static int -m_quit(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_quit(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char *comment = LOCAL_COPY((parc > 1 && parv[1]) ? parv[1] : client_p->name); char reason[REASONLEN + 1]; @@ -89,7 +89,7 @@ m_quit(struct Client *client_p, struct Client *source_p, int parc, const char *p ** parv[1] = comment */ static int -ms_quit(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_quit(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char *comment = LOCAL_COPY((parc > 1 && parv[1]) ? parv[1] : client_p->name); diff --git a/modules/core/m_server.c b/modules/core/m_server.c index 8a0abd5e0..143b0c33e 100644 --- a/modules/core/m_server.c +++ b/modules/core/m_server.c @@ -42,9 +42,9 @@ #include "parse.h" #include "modules.h" -static int mr_server(struct Client *, struct Client *, int, const char **); -static int ms_server(struct Client *, struct Client *, int, const char **); -static int ms_sid(struct Client *, struct Client *, int, const char **); +static int mr_server(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_server(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_sid(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message server_msgtab = { "SERVER", 0, 0, 0, MFLG_SLOW | MFLG_UNREG, @@ -69,7 +69,7 @@ static int set_server_gecos(struct Client *, const char *); * parv[3] = serverinfo */ static int -mr_server(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char info[REALLEN + 1]; const char *name; @@ -289,7 +289,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char * parv[3] = serverinfo */ static int -ms_server(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char info[REALLEN + 1]; /* same size as in s_misc.c */ @@ -492,7 +492,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char } static int -ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_sid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; struct remote_conf *hub_p; diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c index 587b851bb..140b31a5c 100644 --- a/modules/core/m_squit.c +++ b/modules/core/m_squit.c @@ -40,8 +40,8 @@ #include "hash.h" #include "s_newconf.h" -static int ms_squit(struct Client *, struct Client *, int, const char **); -static int mo_squit(struct Client *, struct Client *, int, const char **); +static int ms_squit(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_squit(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message squit_msgtab = { "SQUIT", 0, 0, 0, MFLG_SLOW, @@ -68,7 +68,7 @@ static struct squit_parms *find_squit(struct Client *client_p, * parv[2] = comment */ static int -mo_squit(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_squit(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct squit_parms *found_squit; const char *comment = (parc > 2 && parv[2]) ? parv[2] : client_p->name; @@ -109,7 +109,7 @@ mo_squit(struct Client *client_p, struct Client *source_p, int parc, const char * parv[2] = comment */ static int -ms_squit(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_squit(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; const char *comment = (parc > 2 && parv[2]) ? parv[2] : client_p->name; diff --git a/modules/m_accept.c b/modules/m_accept.c index a0a47fd1d..17a24fe07 100644 --- a/modules/m_accept.c +++ b/modules/m_accept.c @@ -36,7 +36,7 @@ #include "parse.h" #include "modules.h" -static int m_accept(struct Client *, struct Client *, int, const char **); +static int m_accept(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void build_nicklist(struct Client *, char *, char *, const char *); static void add_accept(struct Client *, struct Client *); @@ -57,7 +57,7 @@ DECLARE_MODULE_AV1(accept, NULL, NULL, accept_clist, NULL, NULL, "$Revision: 254 * parv[1] = servername */ static int -m_accept(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_accept(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char *nick; char *p = NULL; diff --git a/modules/m_admin.c b/modules/m_admin.c index 9d551cabc..943fac0a7 100644 --- a/modules/m_admin.c +++ b/modules/m_admin.c @@ -36,9 +36,9 @@ #include "hook.h" #include "modules.h" -static int m_admin(struct Client *, struct Client *, int, const char **); -static int mr_admin(struct Client *, struct Client *, int, const char **); -static int ms_admin(struct Client *, struct Client *, int, const char **); +static int m_admin(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mr_admin(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_admin(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void do_admin(struct Client *source_p); static void admin_spy(struct Client *); @@ -63,7 +63,7 @@ DECLARE_MODULE_AV1(admin, NULL, NULL, admin_clist, admin_hlist, NULL, "$Revision * parv[1] = servername */ static int -mr_admin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_admin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0L; @@ -88,7 +88,7 @@ mr_admin(struct Client *client_p, struct Client *source_p, int parc, const char * parv[1] = servername */ static int -m_admin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_admin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0L; @@ -118,7 +118,7 @@ m_admin(struct Client *client_p, struct Client *source_p, int parc, const char * * parv[1] = servername */ static int -ms_admin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_admin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(hunt_server(client_p, source_p, ":%s ADMIN :%s", 1, parc, parv) != HUNTED_ISME) return 0; diff --git a/modules/m_away.c b/modules/m_away.c index 60680e529..2713fa2a9 100644 --- a/modules/m_away.c +++ b/modules/m_away.c @@ -37,7 +37,7 @@ #include "s_serv.h" #include "packet.h" -static int m_away(struct Client *, struct Client *, int, const char **); +static int m_away(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message away_msgtab = { "AWAY", 0, 0, 0, MFLG_SLOW, @@ -66,7 +66,7 @@ DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $" ** parv[1] = away message */ static int -m_away(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(MyClient(source_p) && source_p->localClient->next_away && !IsFloodDone(source_p)) diff --git a/modules/m_cap.c b/modules/m_cap.c index 635f24052..0860dfd8a 100644 --- a/modules/m_cap.c +++ b/modules/m_cap.c @@ -47,7 +47,7 @@ typedef int (*bqcmp)(const void *, const void *); -static int m_cap(struct Client *, struct Client *, int, const char **); +static int m_cap(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static int modinit(void); struct Message cap_msgtab = { @@ -472,7 +472,7 @@ clicap_cmd_search(const char *command, struct clicap_cmd *entry) } static int -m_cap(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_cap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct clicap_cmd *cmd; diff --git a/modules/m_capab.c b/modules/m_capab.c index b03fb3fd1..0079753a8 100644 --- a/modules/m_capab.c +++ b/modules/m_capab.c @@ -33,8 +33,8 @@ #include "parse.h" #include "modules.h" -static int mr_capab(struct Client *, struct Client *, int, const char **); -static int me_gcap(struct Client *, struct Client *, int, const char **); +static int mr_capab(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_gcap(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message capab_msgtab = { "CAPAB", 0, 0, 0, MFLG_SLOW | MFLG_UNREG, @@ -54,7 +54,7 @@ DECLARE_MODULE_AV1(capab, NULL, NULL, capab_clist, NULL, NULL, "$Revision: 1295 * */ static int -mr_capab(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_capab(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int i; char *p; @@ -90,7 +90,7 @@ mr_capab(struct Client *client_p, struct Client *source_p, int parc, const char } static int -me_gcap(struct Client *client_p, struct Client *source_p, +me_gcap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char *t = LOCAL_COPY(parv[1]); diff --git a/modules/m_certfp.c b/modules/m_certfp.c index 7d6f7ed74..f9b670317 100644 --- a/modules/m_certfp.c +++ b/modules/m_certfp.c @@ -38,7 +38,7 @@ #include "msg.h" #include "modules.h" -static int me_certfp(struct Client *, struct Client *, int, const char **); +static int me_certfp(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message certfp_msgtab = { "CERTFP", 0, 0, 0, MFLG_SLOW, @@ -54,7 +54,7 @@ DECLARE_MODULE_AV1(certfp, NULL, NULL, certfp_clist, NULL, NULL, "$Revision$"); ** parv[1] = certfp string */ static int -me_certfp(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_certfp(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if (!IsPerson(source_p)) return 0; diff --git a/modules/m_challenge.c b/modules/m_challenge.c index 677dfcb20..feee9084f 100644 --- a/modules/m_challenge.c +++ b/modules/m_challenge.c @@ -72,7 +72,7 @@ static int challenge_load(void) DECLARE_MODULE_AV1(challenge, challenge_load, NULL, NULL, NULL, NULL, "$Revision: 3161 $"); #else -static int m_challenge(struct Client *, struct Client *, int, const char **); +static int m_challenge(struct MsgBuf *, struct Client *, struct Client *, int, const char **); /* We have openssl support, so include /CHALLENGE */ struct Message challenge_msgtab = { @@ -104,7 +104,7 @@ cleanup_challenge(struct Client *target_p) * */ static int -m_challenge(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_challenge(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct oper_conf *oper_p; char *challenge = NULL; /* to placate gcc */ diff --git a/modules/m_chghost.c b/modules/m_chghost.c index 8475824d3..e63ec1dc4 100644 --- a/modules/m_chghost.c +++ b/modules/m_chghost.c @@ -28,10 +28,10 @@ #include "whowas.h" #include "monitor.h" -static int me_realhost(struct Client *, struct Client *, int, const char **); -static int ms_chghost(struct Client *, struct Client *, int, const char **); -static int me_chghost(struct Client *, struct Client *, int, const char **); -static int mo_chghost(struct Client *, struct Client *, int, const char **); +static int me_realhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_chghost(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_chghost(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_chghost(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message realhost_msgtab = { "REALHOST", 0, 0, 0, MFLG_SLOW, @@ -91,7 +91,7 @@ clean_host(const char *host) * race condition. */ static int -me_realhost(struct Client *client_p, struct Client *source_p, +me_realhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if (!IsPerson(source_p)) @@ -149,7 +149,7 @@ do_chghost(struct Client *source_p, struct Client *target_p, * parv[2] = host */ static int -ms_chghost(struct Client *client_p, struct Client *source_p, +ms_chghost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -176,7 +176,7 @@ ms_chghost(struct Client *client_p, struct Client *source_p, * parv[2] = host */ static int -me_chghost(struct Client *client_p, struct Client *source_p, +me_chghost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -198,7 +198,7 @@ me_chghost(struct Client *client_p, struct Client *source_p, * No, make it toggleable via ./configure. --nenolod */ static int -mo_chghost(struct Client *client_p, struct Client *source_p, +mo_chghost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { #ifdef ENABLE_OPER_CHGHOST diff --git a/modules/m_close.c b/modules/m_close.c index 19d4e0125..1d5ecb965 100644 --- a/modules/m_close.c +++ b/modules/m_close.c @@ -33,7 +33,7 @@ #include "parse.h" #include "modules.h" -static int mo_close(struct Client *, struct Client *, int, const char **); +static int mo_close(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message close_msgtab = { "CLOSE", 0, 0, 0, MFLG_SLOW, @@ -48,7 +48,7 @@ DECLARE_MODULE_AV1(close, NULL, NULL, close_clist, NULL, NULL, "$Revision: 254 $ * - added by Darren Reed Jul 13 1992. */ static int -mo_close(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_close(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; rb_dlink_node *ptr; diff --git a/modules/m_cmessage.c b/modules/m_cmessage.c index fccc66523..7edb39294 100644 --- a/modules/m_cmessage.c +++ b/modules/m_cmessage.c @@ -44,9 +44,9 @@ #include "packet.h" #include "supported.h" -static int m_cmessage(int, const char *, struct Client *, struct Client *, int, const char **); -static int m_cprivmsg(struct Client *, struct Client *, int, const char **); -static int m_cnotice(struct Client *, struct Client *, int, const char **); +static int m_cmessage(int, const char *, struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int m_cprivmsg(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int m_cnotice(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static int _modinit(void) @@ -80,19 +80,19 @@ DECLARE_MODULE_AV1(cmessage, _modinit, _moddeinit, cmessage_clist, NULL, NULL, " #define NOTICE 1 static int -m_cprivmsg(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_cprivmsg(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { - return m_cmessage(PRIVMSG, "PRIVMSG", client_p, source_p, parc, parv); + return m_cmessage(PRIVMSG, "PRIVMSG", msgbuf_p, client_p, source_p, parc, parv); } static int -m_cnotice(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_cnotice(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { - return m_cmessage(NOTICE, "NOTICE", client_p, source_p, parc, parv); + return m_cmessage(NOTICE, "NOTICE", msgbuf_p, client_p, source_p, parc, parv); } static int -m_cmessage(int p_or_n, const char *command, +m_cmessage(int p_or_n, const char *command, struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; diff --git a/modules/m_connect.c b/modules/m_connect.c index 6edd210cf..9de18495b 100644 --- a/modules/m_connect.c +++ b/modules/m_connect.c @@ -40,8 +40,8 @@ #include "modules.h" #include "sslproc.h" -static int mo_connect(struct Client *, struct Client *, int, const char **); -static int ms_connect(struct Client *, struct Client *, int, const char **); +static int mo_connect(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_connect(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message connect_msgtab = { "CONNECT", 0, 0, 0, MFLG_SLOW, @@ -62,7 +62,7 @@ DECLARE_MODULE_AV1(connect, NULL, NULL, connect_clist, NULL, NULL, "$Revision: 3 * parv[3] = remote server */ static int -mo_connect(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int port; int tmpport; @@ -162,7 +162,7 @@ mo_connect(struct Client *client_p, struct Client *source_p, int parc, const cha * parv[3] = remote server */ static int -ms_connect(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_connect(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int port; int tmpport; diff --git a/modules/m_dline.c b/modules/m_dline.c index a4bc98875..a4dc3f634 100644 --- a/modules/m_dline.c +++ b/modules/m_dline.c @@ -45,10 +45,10 @@ #include "bandbi.h" #include "operhash.h" -static int mo_dline(struct Client *, struct Client *, int, const char **); -static int me_dline(struct Client *, struct Client *, int, const char **); -static int mo_undline(struct Client *, struct Client *, int, const char **); -static int me_undline(struct Client *, struct Client *, int, const char **); +static int mo_dline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_dline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_undline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_undline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message dline_msgtab = { "DLINE", 0, 0, 0, MFLG_SLOW, @@ -74,7 +74,7 @@ static int apply_undline(struct Client *, const char *); * parv[2] - reason */ static int -mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_dline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char def[] = "No Reason"; const char *dlhost; @@ -142,7 +142,7 @@ mo_dline(struct Client *client_p, struct Client *source_p, int parc, const char * parv[1] = dline to remove */ static int -mo_undline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_undline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *cidr; const char *target_server = NULL; @@ -178,7 +178,7 @@ mo_undline(struct Client *client_p, struct Client *source_p, int parc, const cha } static int -me_dline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) +me_dline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv) { int tdline_time = atoi(parv[1]); /* Since this is coming over a server link, assume that the originating @@ -200,7 +200,7 @@ me_dline(struct Client *client_p, struct Client *source_p, int parc, const char } static int -me_undline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) +me_undline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv) { if(!IsPerson(source_p)) return 0; diff --git a/modules/m_encap.c b/modules/m_encap.c index 3cbfcccba..ac773cf1e 100644 --- a/modules/m_encap.c +++ b/modules/m_encap.c @@ -43,7 +43,7 @@ #include "parse.h" #include "modules.h" -static int ms_encap(struct Client *client_p, struct Client *source_p, +static int ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); struct Message encap_msgtab = { @@ -61,7 +61,7 @@ DECLARE_MODULE_AV1(encap, NULL, NULL, encap_clist, NULL, NULL, "$Revision: 254 $ * parv[3] - parameters */ static int -ms_encap(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_encap(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char buffer[BUFSIZE]; char *ptr; @@ -101,7 +101,7 @@ ms_encap(struct Client *client_p, struct Client *source_p, int parc, const char /* if it matches us, find a matching handler and call it */ if(match(parv[1], me.name)) - handle_encap(client_p, source_p, parv[2], parc - 2, parv + 2); + handle_encap(msgbuf_p, client_p, source_p, parv[2], parc - 2, parv + 2); return 0; } diff --git a/modules/m_etrace.c b/modules/m_etrace.c index 614f54d96..1d325c55f 100644 --- a/modules/m_etrace.c +++ b/modules/m_etrace.c @@ -52,10 +52,10 @@ #include "logger.h" #include "supported.h" -static int mo_etrace(struct Client *, struct Client *, int, const char **); -static int me_etrace(struct Client *, struct Client *, int, const char **); -static int m_chantrace(struct Client *, struct Client *, int, const char **); -static int mo_masktrace(struct Client *, struct Client *, int, const char **); +static int mo_etrace(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_etrace(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int m_chantrace(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_masktrace(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message etrace_msgtab = { "ETRACE", 0, 0, 0, MFLG_SLOW, @@ -100,7 +100,7 @@ static const char *spoofed_sockhost = "0"; * parv[2] = [target] */ static int -mo_etrace(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_etrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(parc > 1 && !EmptyString(parv[1])) { @@ -138,7 +138,7 @@ mo_etrace(struct Client *client_p, struct Client *source_p, int parc, const char } static int -me_etrace(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_etrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -228,7 +228,7 @@ do_single_etrace(struct Client *source_p, struct Client *target_p) } static int -m_chantrace(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_chantrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; struct Channel *chptr; @@ -341,7 +341,7 @@ match_masktrace(struct Client *source_p, rb_dlink_list *list, } static int -mo_masktrace(struct Client *client_p, struct Client *source_p, int parc, +mo_masktrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char *name, *username, *hostname, *gecos; diff --git a/modules/m_grant.c b/modules/m_grant.c index 175e16e54..d65db2e17 100644 --- a/modules/m_grant.c +++ b/modules/m_grant.c @@ -16,8 +16,8 @@ #include "s_conf.h" #include "s_newconf.h" -static int mo_grant(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int me_grant(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int mo_grant(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int me_grant(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); static int do_grant(struct Client *source_p, struct Client *target_p, const char *new_privset); @@ -31,7 +31,7 @@ mapi_clist_av1 grant_clist[] = { &grant_msgtab, NULL }; DECLARE_MODULE_AV1(grant, NULL, NULL, grant_clist, NULL, NULL, "$Revision$"); static int -mo_grant(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_grant(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -63,7 +63,7 @@ mo_grant(struct Client *client_p, struct Client *source_p, int parc, const char return 0; } -static int me_grant(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static int me_grant(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; diff --git a/modules/m_help.c b/modules/m_help.c index f1f1d2eae..b27142c3b 100644 --- a/modules/m_help.c +++ b/modules/m_help.c @@ -38,9 +38,9 @@ #include "cache.h" #include "irc_dictionary.h" -static int m_help(struct Client *, struct Client *, int, const char **); -static int mo_help(struct Client *, struct Client *, int, const char **); -static int mo_uhelp(struct Client *, struct Client *, int, const char **); +static int m_help(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_help(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_uhelp(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void dohelp(struct Client *, int, const char *); struct Message help_msgtab = { @@ -59,7 +59,7 @@ DECLARE_MODULE_AV1(help, NULL, NULL, help_clist, NULL, NULL, "$Revision: 254 $") * m_help - HELP message handler */ static int -m_help(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_help(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { dohelp(source_p, HELP_USER, parc > 1 ? parv[1] : NULL); @@ -70,7 +70,7 @@ m_help(struct Client *client_p, struct Client *source_p, int parc, const char *p * mo_help - HELP message handler */ static int -mo_help(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_help(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { dohelp(source_p, HELP_OPER, parc > 1 ? parv[1] : NULL); return 0; @@ -81,7 +81,7 @@ mo_help(struct Client *client_p, struct Client *source_p, int parc, const char * * This is used so that opers can view the user help file without deopering */ static int -mo_uhelp(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_uhelp(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { dohelp(source_p, HELP_USER, parc > 1 ? parv[1] : NULL); return 0; diff --git a/modules/m_info.c b/modules/m_info.c index 202716a65..124d733e9 100644 --- a/modules/m_info.c +++ b/modules/m_info.c @@ -46,8 +46,8 @@ static void send_birthdate_online_time(struct Client *source_p); static void send_info_text(struct Client *source_p); static void info_spy(struct Client *); -static int m_info(struct Client *, struct Client *, int, const char **); -static int mo_info(struct Client *, struct Client *, int, const char **); +static int m_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_info(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message info_msgtab = { "INFO", 0, 0, 0, MFLG_SLOW, @@ -672,7 +672,7 @@ static struct InfoStruct info_table[] = { ** parv[1] = servername */ static int -m_info(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0L; @@ -704,7 +704,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p ** parv[1] = servername */ static int -mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_info(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME) { diff --git a/modules/m_invite.c b/modules/m_invite.c index 742d63e88..efd3ae96a 100644 --- a/modules/m_invite.c +++ b/modules/m_invite.c @@ -41,7 +41,7 @@ #include "packet.h" #include "tgchange.h" -static int m_invite(struct Client *, struct Client *, int, const char **); +static int m_invite(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message invite_msgtab = { "INVITE", 0, 0, 0, MFLG_SLOW, @@ -57,7 +57,7 @@ static void add_invite(struct Channel *, struct Client *); * parv[2] - channel name */ static int -m_invite(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_invite(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; struct Channel *chptr; diff --git a/modules/m_ison.c b/modules/m_ison.c index 5533545cb..545d7119d 100644 --- a/modules/m_ison.c +++ b/modules/m_ison.c @@ -39,7 +39,7 @@ #include -static int m_ison(struct Client *, struct Client *, int, const char **); +static int m_ison(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message ison_msgtab = { "ISON", 0, 0, 0, MFLG_SLOW, @@ -63,7 +63,7 @@ static char buf2[BUFSIZE]; * ISON :nicklist */ static int -m_ison(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_ison(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; char *nick; diff --git a/modules/m_kline.c b/modules/m_kline.c index a47939d42..5f8003630 100644 --- a/modules/m_kline.c +++ b/modules/m_kline.c @@ -46,12 +46,12 @@ #include "bandbi.h" #include "operhash.h" -static int mo_kline(struct Client *, struct Client *, int, const char **); -static int ms_kline(struct Client *, struct Client *, int, const char **); -static int me_kline(struct Client *, struct Client *, int, const char **); -static int mo_unkline(struct Client *, struct Client *, int, const char **); -static int ms_unkline(struct Client *, struct Client *, int, const char **); -static int me_unkline(struct Client *, struct Client *, int, const char **); +static int mo_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message kline_msgtab = { "KLINE", 0, 0, 0, MFLG_SLOW, @@ -95,7 +95,7 @@ static void remove_prop_kline(struct Client *, struct ConfItem *); * parv[5] - reason */ static int -mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char **parv) +mo_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv) { char def[] = "No Reason"; char user[USERLEN + 2]; @@ -240,7 +240,7 @@ mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char * parv[5] - reason */ static int -ms_kline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int tkline_time = atoi(parv[2]); @@ -265,7 +265,7 @@ ms_kline(struct Client *client_p, struct Client *source_p, int parc, const char } static int -me_kline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* : */ if(!IsPerson(source_p)) @@ -352,7 +352,7 @@ handle_remote_kline(struct Client *source_p, int tkline_time, * parv[3] - optional target server */ static int -mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *user; char *host; @@ -453,7 +453,7 @@ mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha * parv[3] - host to unkline */ static int -ms_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* parv[0] parv[1] parv[2] parv[3] * oper target server user host */ @@ -470,7 +470,7 @@ ms_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha } static int -me_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* user host */ if(!IsPerson(source_p)) diff --git a/modules/m_knock.c b/modules/m_knock.c index 8235c48ab..7b124fb3d 100644 --- a/modules/m_knock.c +++ b/modules/m_knock.c @@ -38,7 +38,7 @@ #include "s_serv.h" #include "supported.h" -static int m_knock(struct Client *, struct Client *, int, const char **); +static int m_knock(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message knock_msgtab = { "KNOCK", 0, 0, 0, MFLG_SLOW, @@ -75,7 +75,7 @@ DECLARE_MODULE_AV1(knock, _modinit, _moddeinit, knock_clist, NULL, NULL, "$Revis * */ static int -m_knock(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_knock(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr; char *p, *name; diff --git a/modules/m_links.c b/modules/m_links.c index 5918659d0..d7451c471 100644 --- a/modules/m_links.c +++ b/modules/m_links.c @@ -39,8 +39,8 @@ #include "scache.h" #include "s_assert.h" -static int m_links(struct Client *, struct Client *, int, const char **); -static int mo_links(struct Client *, struct Client *, int, const char **); +static int m_links(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_links(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static char * clean_string(char *dest, const unsigned char *src, size_t len); struct Message links_msgtab = { @@ -66,18 +66,18 @@ DECLARE_MODULE_AV1(links, NULL, NULL, links_clist, links_hlist, NULL, "$Revision * parv[2] = servername mask */ static int -m_links(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_links(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(ConfigServerHide.flatten_links && !IsExemptShide(source_p)) scache_send_flattened_links(source_p); else - mo_links(client_p, source_p, parc, parv); + mo_links(msgbuf_p, client_p, source_p, parc, parv); return 0; } static int -mo_links(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_links(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *mask = ""; struct Client *target_p; diff --git a/modules/m_list.c b/modules/m_list.c index d33741f43..e28c6db43 100644 --- a/modules/m_list.c +++ b/modules/m_list.c @@ -58,8 +58,8 @@ static rb_dlink_list safelisting_clients = { NULL, NULL, 0 }; static int _modinit(void); static void _moddeinit(void); -static int m_list(struct Client *, struct Client *, int, const char **); -static int mo_list(struct Client *, struct Client *, int, const char **); +static int m_list(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_list(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void list_one_channel(struct Client *source_p, struct Channel *chptr, int visible); @@ -130,7 +130,7 @@ static void safelist_check_cliexit(hook_data_client_exit * hdata) * XXX - With SAFELIST, do we really need to continue pacing? * In theory, the server cannot be lagged by this. --nenolod */ -static int m_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static int m_list(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0L; @@ -154,13 +154,13 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co last_used = rb_current_time(); } - return mo_list(client_p, source_p, parc, parv); + return mo_list(msgbuf_p, client_p, source_p, parc, parv); } /* mo_list() * parv[1] = channel */ -static int mo_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static int mo_list(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct ListClient *params; char *p; diff --git a/modules/m_locops.c b/modules/m_locops.c index e7e02bd7a..5b74e0e33 100644 --- a/modules/m_locops.c +++ b/modules/m_locops.c @@ -39,9 +39,9 @@ #include "modules.h" #include "s_serv.h" -static int m_locops(struct Client *, struct Client *, int, const char **); -static int ms_locops(struct Client *, struct Client *, int, const char **); -static int me_locops(struct Client *, struct Client *, int, const char **); +static int m_locops(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_locops(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_locops(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message locops_msgtab = { "LOCOPS", 0, 0, 0, MFLG_SLOW, @@ -57,7 +57,7 @@ DECLARE_MODULE_AV1(locops, NULL, NULL, locops_clist, NULL, NULL, "$Revision: 254 * parv[1] = message text */ static int -m_locops(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_locops(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { sendto_wallops_flags(UMODE_LOCOPS, source_p, "LOCOPS - %s", parv[1]); @@ -69,7 +69,7 @@ m_locops(struct Client *client_p, struct Client *source_p, int parc, const char } static int -ms_locops(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_locops(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* source_p parv[1] parv[2] * oper target serv message @@ -87,7 +87,7 @@ ms_locops(struct Client *client_p, struct Client *source_p, int parc, const char } static int -me_locops(struct Client *client_p, struct Client *source_p, +me_locops(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(!IsPerson(source_p)) diff --git a/modules/m_lusers.c b/modules/m_lusers.c index bc18fe2a3..bbc3b4d23 100644 --- a/modules/m_lusers.c +++ b/modules/m_lusers.c @@ -36,8 +36,8 @@ #include "parse.h" #include "modules.h" -static int m_lusers(struct Client *, struct Client *, int, const char **); -static int ms_lusers(struct Client *, struct Client *, int, const char **); +static int m_lusers(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_lusers(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message lusers_msgtab = { "LUSERS", 0, 0, 0, MFLG_SLOW, @@ -56,7 +56,7 @@ DECLARE_MODULE_AV1(lusers, NULL, NULL, lusers_clist, NULL, NULL, "$Revision: 254 * to cause a force */ static int -m_lusers(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_lusers(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0; @@ -91,7 +91,7 @@ m_lusers(struct Client *client_p, struct Client *source_p, int parc, const char * to cause a force */ static int -ms_lusers(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_lusers(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(parc > 2) { diff --git a/modules/m_map.c b/modules/m_map.c index 6d00c8798..2b7ba7ba2 100644 --- a/modules/m_map.c +++ b/modules/m_map.c @@ -32,8 +32,8 @@ #define USER_COL 50 /* display | Users: %d at col 50 */ -static int m_map(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int mo_map(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int m_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int mo_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); struct Message map_msgtab = { "MAP", 0, 0, 0, MFLG_SLOW, @@ -51,7 +51,7 @@ static char buf[BUFSIZE]; /* m_map */ static int -m_map(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if((!IsExemptShide(source_p) && ConfigServerHide.flatten_links) || ConfigFileEntry.map_oper_only) @@ -70,7 +70,7 @@ m_map(struct Client *client_p, struct Client *source_p, int parc, const char *pa ** mo_map */ static int -mo_map(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_map(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { dump_map(client_p, &me, buf); scache_send_missing(client_p); diff --git a/modules/m_monitor.c b/modules/m_monitor.c index 61310fb1a..166d68c20 100644 --- a/modules/m_monitor.c +++ b/modules/m_monitor.c @@ -43,7 +43,7 @@ static int monitor_init(void); static void monitor_deinit(void); -static int m_monitor(struct Client *, struct Client *, int, const char **); +static int m_monitor(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message monitor_msgtab = { "MONITOR", 0, 0, 0, MFLG_SLOW, @@ -324,7 +324,7 @@ show_monitor_status(struct Client *client_p) } static int -m_monitor(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_monitor(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { switch(parv[1][0]) { diff --git a/modules/m_motd.c b/modules/m_motd.c index f798029a5..fbafed108 100644 --- a/modules/m_motd.c +++ b/modules/m_motd.c @@ -38,8 +38,8 @@ #include "cache.h" #include "ratelimit.h" -static int m_motd(struct Client *, struct Client *, int, const char **); -static int mo_motd(struct Client *, struct Client *, int, const char **); +static int m_motd(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_motd(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message motd_msgtab = { "MOTD", 0, 0, 0, MFLG_SLOW, @@ -63,7 +63,7 @@ static void motd_spy(struct Client *); ** parv[1] = servername */ static int -m_motd(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_motd(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0; @@ -93,7 +93,7 @@ m_motd(struct Client *client_p, struct Client *source_p, int parc, const char *p ** parv[1] = servername */ static int -mo_motd(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_motd(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(hunt_server(client_p, source_p, ":%s MOTD :%s", 1, parc, parv) != HUNTED_ISME) return 0; diff --git a/modules/m_names.c b/modules/m_names.c index 315d52074..839d952dc 100644 --- a/modules/m_names.c +++ b/modules/m_names.c @@ -39,7 +39,7 @@ #include "parse.h" #include "modules.h" -static int m_names(struct Client *, struct Client *, int, const char **); +static int m_names(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message names_msgtab = { "NAMES", 0, 0, 0, MFLG_SLOW, @@ -60,7 +60,7 @@ static void names_global(struct Client *source_p); * parv[1] = channel */ static int -m_names(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_names(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0; struct Channel *chptr = NULL; diff --git a/modules/m_oper.c b/modules/m_oper.c index 9646e6b38..c6ee2dca9 100644 --- a/modules/m_oper.c +++ b/modules/m_oper.c @@ -41,7 +41,7 @@ #include "packet.h" #include "cache.h" -static int m_oper(struct Client *, struct Client *, int, const char **); +static int m_oper(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message oper_msgtab = { "OPER", 0, 0, 0, MFLG_SLOW, @@ -59,7 +59,7 @@ static int match_oper_password(const char *password, struct oper_conf *oper_p); * parv[2] = oper password */ static int -m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_oper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct oper_conf *oper_p; const char *name; diff --git a/modules/m_operspy.c b/modules/m_operspy.c index bb3ed3282..2b1c5cfa4 100644 --- a/modules/m_operspy.c +++ b/modules/m_operspy.c @@ -44,7 +44,7 @@ #include "modules.h" #include "logger.h" -static int ms_operspy(struct Client *client_p, struct Client *source_p, +static int ms_operspy(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); struct Message operspy_msgtab = { @@ -61,7 +61,7 @@ DECLARE_MODULE_AV1(operspy, NULL, NULL, operspy_clist, NULL, NULL, "$Revision: 2 * parv[2] - optional params */ static int -ms_operspy(struct Client *client_p, struct Client *source_p, +ms_operspy(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static char buffer[BUFSIZE]; diff --git a/modules/m_pass.c b/modules/m_pass.c index e7cc7cd37..7883df67e 100644 --- a/modules/m_pass.c +++ b/modules/m_pass.c @@ -37,7 +37,7 @@ #include "hash.h" #include "s_conf.h" -static int mr_pass(struct Client *, struct Client *, int, const char **); +static int mr_pass(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message pass_msgtab = { "PASS", 0, 0, 0, MFLG_SLOW | MFLG_UNREG, @@ -57,7 +57,7 @@ DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 3550 $" * parv[3] = optional TS version field -- needed for TS6 */ static int -mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_pass(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char *auth_user, *pass, *buf; buf = LOCAL_COPY(parv[1]); diff --git a/modules/m_ping.c b/modules/m_ping.c index 16c13bd80..fa94fe472 100644 --- a/modules/m_ping.c +++ b/modules/m_ping.c @@ -37,8 +37,8 @@ #include "s_conf.h" #include "s_serv.h" -static int m_ping(struct Client *, struct Client *, int, const char **); -static int ms_ping(struct Client *, struct Client *, int, const char **); +static int m_ping(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_ping(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message ping_msgtab = { "PING", 0, 0, 0, MFLG_SLOW, @@ -54,7 +54,7 @@ DECLARE_MODULE_AV1(ping, NULL, NULL, ping_clist, NULL, NULL, "$Revision: 254 $") ** parv[2] = destination */ static int -m_ping(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_ping(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; const char *destination; @@ -85,7 +85,7 @@ m_ping(struct Client *client_p, struct Client *source_p, int parc, const char *p } static int -ms_ping(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_ping(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; const char *destination; diff --git a/modules/m_pong.c b/modules/m_pong.c index 9de629d33..a7c1158d8 100644 --- a/modules/m_pong.c +++ b/modules/m_pong.c @@ -40,8 +40,8 @@ #include "hash.h" #include "modules.h" -static int mr_pong(struct Client *, struct Client *, int, const char **); -static int ms_pong(struct Client *, struct Client *, int, const char **); +static int mr_pong(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_pong(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message pong_msgtab = { "PONG", 0, 0, 0, MFLG_SLOW | MFLG_UNREG, @@ -52,7 +52,7 @@ mapi_clist_av1 pong_clist[] = { &pong_msgtab, NULL }; DECLARE_MODULE_AV1(pong, NULL, NULL, pong_clist, NULL, NULL, "$Revision: 3181 $"); static int -ms_pong(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; const char *destination; @@ -99,7 +99,7 @@ ms_pong(struct Client *client_p, struct Client *source_p, int parc, const char * } static int -mr_pong(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(parc == 2 && !EmptyString(parv[1])) { diff --git a/modules/m_post.c b/modules/m_post.c index 52407476a..e6004bf09 100644 --- a/modules/m_post.c +++ b/modules/m_post.c @@ -35,7 +35,7 @@ #include "modules.h" #include "s_conf.h" -static int mr_dumb_proxy(struct Client *, struct Client *, int, const char **); +static int mr_dumb_proxy(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message post_msgtab = { "POST", 0, 0, 0, MFLG_SLOW | MFLG_UNREG, @@ -62,7 +62,7 @@ DECLARE_MODULE_AV1(post, NULL, NULL, post_clist, NULL, NULL, "$Revision: 498 $") ** parv[1] = comment */ static int -mr_dumb_proxy(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_dumb_proxy(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { exit_client(client_p, source_p, source_p, "Client Exit"); diff --git a/modules/m_privs.c b/modules/m_privs.c index 8388442ae..8d29ea85d 100644 --- a/modules/m_privs.c +++ b/modules/m_privs.c @@ -40,9 +40,9 @@ #include "s_conf.h" #include "s_newconf.h" -static int m_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int me_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int mo_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int m_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int me_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int mo_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); struct Message privs_msgtab = { "PRIVS", 0, 0, 0, MFLG_SLOW, @@ -113,7 +113,7 @@ static void show_privs(struct Client *source_p, struct Client *target_p) target_p->name, buf); } -static int me_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static int me_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -127,7 +127,7 @@ static int me_privs(struct Client *client_p, struct Client *source_p, int parc, return 0; } -static int mo_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static int mo_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -154,7 +154,7 @@ static int mo_privs(struct Client *client_p, struct Client *source_p, int parc, return 0; } -static int m_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static int m_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if (parc >= 2 && !EmptyString(parv[1]) && irccmp(parv[1], source_p->name)) { diff --git a/modules/m_rehash.c b/modules/m_rehash.c index dae84c2c8..ebfb548eb 100644 --- a/modules/m_rehash.c +++ b/modules/m_rehash.c @@ -46,8 +46,8 @@ #include "irc_radixtree.h" #include "sslproc.h" -static int mo_rehash(struct Client *, struct Client *, int, const char **); -static int me_rehash(struct Client *, struct Client *, int, const char **); +static int mo_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message rehash_msgtab = { "REHASH", 0, 0, 0, MFLG_SLOW, @@ -356,7 +356,7 @@ do_rehash(struct Client *source_p, const char *type) * parv[2] = destination */ static int -mo_rehash(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *type = NULL, *target_server = NULL; @@ -398,7 +398,7 @@ mo_rehash(struct Client *client_p, struct Client *source_p, int parc, const char } static int -me_rehash(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if (!IsPerson(source_p)) diff --git a/modules/m_restart.c b/modules/m_restart.c index 8e2459e1a..7725d90f9 100644 --- a/modules/m_restart.c +++ b/modules/m_restart.c @@ -40,8 +40,8 @@ #include "modules.h" #include "hash.h" -static int mo_restart(struct Client *, struct Client *, int, const char **); -static int me_restart(struct Client *, struct Client *, int, const char **); +static int mo_restart(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_restart(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static int do_restart(struct Client *source_p, const char *servername); struct Message restart_msgtab = { @@ -57,7 +57,7 @@ DECLARE_MODULE_AV1(restart, NULL, NULL, restart_clist, NULL, NULL, "$Revision: 3 * */ static int -mo_restart(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_restart(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { char buf[BUFSIZE]; rb_dlink_node *ptr; @@ -97,7 +97,7 @@ mo_restart(struct Client *client_p, struct Client *source_p, int parc, const cha } static int -me_restart(struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[]) +me_restart(struct MsgBuf *msgbuf_p __unused, struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[]) { if(!find_shared_conf(source_p->username, source_p->host, source_p->servptr->name, SHARED_DIE)) { diff --git a/modules/m_resv.c b/modules/m_resv.c index 498d4429b..335442d57 100644 --- a/modules/m_resv.c +++ b/modules/m_resv.c @@ -40,12 +40,12 @@ #include "bandbi.h" #include "operhash.h" -static int mo_resv(struct Client *, struct Client *, int, const char **); -static int ms_resv(struct Client *, struct Client *, int, const char **); -static int me_resv(struct Client *, struct Client *, int, const char **); -static int mo_unresv(struct Client *, struct Client *, int, const char **); -static int ms_unresv(struct Client *, struct Client *, int, const char **); -static int me_unresv(struct Client *, struct Client *, int, const char **); +static int mo_resv(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_resv(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_resv(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_unresv(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_unresv(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_unresv(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message resv_msgtab = { "RESV", 0, 0, 0, MFLG_SLOW | MFLG_UNREG, @@ -77,7 +77,7 @@ static void remove_resv(struct Client *source_p, const char *name, int propagate * parv[2] = reason */ static int -mo_resv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_resv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *name; const char *reason; @@ -155,7 +155,7 @@ mo_resv(struct Client *client_p, struct Client *source_p, int parc, const char * * parv[3] = reason */ static int -ms_resv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_resv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* parv[0] parv[1] parv[2] parv[3] * oper target server resv reason @@ -173,7 +173,7 @@ ms_resv(struct Client *client_p, struct Client *source_p, int parc, const char * } static int -me_resv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_resv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* time name 0 :reason */ if(!IsPerson(source_p)) @@ -423,7 +423,7 @@ cluster_resv(struct Client *source_p, int temp_time, const char *name, const cha * parv[1] = channel/nick to unforbid */ static int -mo_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_unresv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int propagated = 1; @@ -464,7 +464,7 @@ mo_unresv(struct Client *client_p, struct Client *source_p, int parc, const char * parv[2] = resv to remove */ static int -ms_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_unresv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* parv[0] parv[1] parv[2] * oper target server resv to remove @@ -482,7 +482,7 @@ ms_unresv(struct Client *client_p, struct Client *source_p, int parc, const char } static int -me_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_unresv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* name */ if(!IsPerson(source_p)) diff --git a/modules/m_sasl.c b/modules/m_sasl.c index 38c7baeb3..480c11aa7 100644 --- a/modules/m_sasl.c +++ b/modules/m_sasl.c @@ -43,8 +43,8 @@ #include "s_newconf.h" #include "s_conf.h" -static int m_authenticate(struct Client *, struct Client *, int, const char **); -static int me_sasl(struct Client *, struct Client *, int, const char **); +static int m_authenticate(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_sasl(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void abort_sasl(struct Client *); static void abort_sasl_exit(hook_data_client_exit *); @@ -75,7 +75,7 @@ mapi_hfn_list_av1 sasl_hfnlist[] = { DECLARE_MODULE_AV1(sasl, NULL, NULL, sasl_clist, NULL, sasl_hfnlist, "$Revision: 1409 $"); static int -m_authenticate(struct Client *client_p, struct Client *source_p, +m_authenticate(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *agent_p = NULL; @@ -147,7 +147,7 @@ m_authenticate(struct Client *client_p, struct Client *source_p, } static int -me_sasl(struct Client *client_p, struct Client *source_p, +me_sasl(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p, *agent_p; diff --git a/modules/m_scan.c b/modules/m_scan.c index 71f3b6107..7e25adc39 100644 --- a/modules/m_scan.c +++ b/modules/m_scan.c @@ -51,9 +51,9 @@ #include "modules.h" #include "logger.h" -static int mo_scan(struct Client *, struct Client *, int, const char **); -static int scan_umodes(struct Client *, struct Client *, int, const char **); -/*static int scan_cmodes(struct Client *, struct Client *, int, const char **);*/ +static int mo_scan(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int scan_umodes(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +/*static int scan_cmodes(struct MsgBuf *, struct Client *, struct Client *, int, const char **);*/ struct Message scan_msgtab = { "SCAN", 0, 0, 0, MFLG_SLOW, @@ -63,7 +63,7 @@ struct Message scan_msgtab = { mapi_clist_av1 scan_clist[] = { &scan_msgtab, NULL }; DECLARE_MODULE_AV1(scan, NULL, NULL, scan_clist, NULL, NULL, "$Revision: 1853 $"); -typedef int (*scan_handler)(struct Client *, struct Client *, int, +typedef int (*scan_handler)(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct scan_cmd { @@ -84,7 +84,7 @@ static const char *spoofed_sockhost = "0"; * parv[2] = [target] */ static int -mo_scan(struct Client *client_p, struct Client *source_p, int parc, +mo_scan(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct scan_cmd *sptr; @@ -97,7 +97,7 @@ mo_scan(struct Client *client_p, struct Client *source_p, int parc, !IsOperAdmin(source_p)) return -1; else - return sptr->handler(client_p, source_p, parc, parv); + return sptr->handler(msgbuf_p, client_p, source_p, parc, parv); } } @@ -108,7 +108,7 @@ mo_scan(struct Client *client_p, struct Client *source_p, int parc, } static int -scan_umodes(struct Client *client_p, struct Client *source_p, int parc, +scan_umodes(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { unsigned int allowed_umodes = 0, disallowed_umodes = 0; diff --git a/modules/m_services.c b/modules/m_services.c index 47e76ce5c..3091f38d3 100644 --- a/modules/m_services.c +++ b/modules/m_services.c @@ -55,10 +55,10 @@ static void _moddeinit(void); static void mark_services(void); static void unmark_services(void); -static int me_su(struct Client *, struct Client *, int, const char **); -static int me_login(struct Client *, struct Client *, int, const char **); -static int me_rsfnc(struct Client *, struct Client *, int, const char **); -static int me_nickdelay(struct Client *, struct Client *, int, const char **); +static int me_su(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_login(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_rsfnc(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int me_nickdelay(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void h_svc_server_introduced(hook_data_client *); static void h_svc_whois(hook_data_client *); @@ -114,7 +114,7 @@ _moddeinit(void) } static int -me_su(struct Client *client_p, struct Client *source_p, +me_su(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -147,7 +147,7 @@ me_su(struct Client *client_p, struct Client *source_p, } static int -me_login(struct Client *client_p, struct Client *source_p, +me_login(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(!IsPerson(source_p)) @@ -158,7 +158,7 @@ me_login(struct Client *client_p, struct Client *source_p, } static int -me_rsfnc(struct Client *client_p, struct Client *source_p, +me_rsfnc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -267,7 +267,7 @@ doit: ** parv[2] = nick */ static int -me_nickdelay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_nickdelay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int duration; struct nd_entry *nd; diff --git a/modules/m_set.c b/modules/m_set.c index f27040bfc..0935c71c8 100644 --- a/modules/m_set.c +++ b/modules/m_set.c @@ -41,7 +41,7 @@ #include "parse.h" #include "modules.h" -static int mo_set(struct Client *, struct Client *, int, const char **); +static int mo_set(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message set_msgtab = { "SET", 0, 0, 0, MFLG_SLOW, @@ -454,7 +454,7 @@ quote_splitusers(struct Client *source_p, const char *arg, int newval) * set options while running */ static int -mo_set(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_set(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int newval; int i, n; diff --git a/modules/m_signon.c b/modules/m_signon.c index f2d25aeb5..8a1cef3e3 100644 --- a/modules/m_signon.c +++ b/modules/m_signon.c @@ -51,8 +51,8 @@ #include "match.h" #include "s_user.h" -static int me_svslogin(struct Client *, struct Client *, int, const char **); -static int ms_signon(struct Client *, struct Client *, int, const char **); +static int me_svslogin(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_signon(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void send_signon(struct Client *, struct Client *, const char *, const char *, const char *, unsigned int, const char *); @@ -114,7 +114,7 @@ clean_host(const char *host) } static int -me_svslogin(struct Client *client_p, struct Client *source_p, +me_svslogin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p, *exist_p; @@ -244,7 +244,7 @@ me_svslogin(struct Client *client_p, struct Client *source_p, } static int -ms_signon(struct Client *client_p, struct Client *source_p, +ms_signon(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; diff --git a/modules/m_snote.c b/modules/m_snote.c index d40917f1e..06a071dcf 100644 --- a/modules/m_snote.c +++ b/modules/m_snote.c @@ -50,7 +50,7 @@ #include "parse.h" #include "modules.h" -static int me_snote(struct Client *, struct Client *, int, const char **); +static int me_snote(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message snote_msgtab = { "SNOTE", 0, 0, 0, MFLG_SLOW, @@ -66,7 +66,7 @@ DECLARE_MODULE_AV1(snote, NULL, NULL, snote_clist, NULL, NULL, "$Revision: 623 $ * parv[2] = message */ static int -me_snote(struct Client *client_p, struct Client *source_p, int parc, +me_snote(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* if there's more than just two params, this is a protocol diff --git a/modules/m_starttls.c b/modules/m_starttls.c index 6c1530b52..9d7b351b8 100644 --- a/modules/m_starttls.c +++ b/modules/m_starttls.c @@ -32,7 +32,7 @@ #include "s_assert.h" #include "logger.h" -static int mr_starttls(struct Client *, struct Client *, int, const char **); +static int mr_starttls(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message starttls_msgtab = { "STARTTLS", 0, 0, 0, MFLG_SLOW, @@ -44,7 +44,7 @@ mapi_clist_av1 starttls_clist[] = { &starttls_msgtab, NULL }; DECLARE_MODULE_AV1(starttls, NULL, NULL, starttls_clist, NULL, NULL, "$Revision$"); static int -mr_starttls(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_starttls(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { #ifdef HAVE_LIBCRYPTO ssl_ctl_t *ctl; diff --git a/modules/m_stats.c b/modules/m_stats.c index 4fccb5e96..63f9dc1f2 100644 --- a/modules/m_stats.c +++ b/modules/m_stats.c @@ -51,7 +51,7 @@ #include "irc_radixtree.h" #include "sslproc.h" -static int m_stats (struct Client *, struct Client *, int, const char **); +static int m_stats (struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message stats_msgtab = { "STATS", 0, 0, 0, MFLG_SLOW, @@ -191,7 +191,7 @@ static struct StatsStruct stats_cmd_table[] = { * if found execute it. */ static int -m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_stats(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0; int i; @@ -903,7 +903,9 @@ stats_ssld_foreach(void *data, pid_t pid, int cli_count, enum ssld_status status static void stats_ssld(struct Client *source_p) { +#if 0 ssld_foreach_info(stats_ssld_foreach, source_p); +#endif } static void diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c index 9fec29d8e..2a04189e0 100644 --- a/modules/m_svinfo.c +++ b/modules/m_svinfo.c @@ -37,7 +37,7 @@ #include "parse.h" #include "modules.h" -static int ms_svinfo(struct Client *, struct Client *, int, const char **); +static int ms_svinfo(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message svinfo_msgtab = { "SVINFO", 0, 0, 0, MFLG_SLOW, @@ -55,7 +55,7 @@ DECLARE_MODULE_AV1(svinfo, NULL, NULL, svinfo_clist, NULL, NULL, "$Revision: 494 * parv[4] = server's idea of UTC time */ static int -ms_svinfo(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_svinfo(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { signed long deltat; time_t theirtime; diff --git a/modules/m_tb.c b/modules/m_tb.c index d6eadf29c..243c24f98 100644 --- a/modules/m_tb.c +++ b/modules/m_tb.c @@ -44,8 +44,8 @@ #include "hash.h" #include "s_serv.h" -static int ms_tb(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int ms_etb(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int ms_etb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); struct Message tb_msgtab = { "TB", 0, 0, 0, MFLG_SLOW, @@ -68,7 +68,7 @@ DECLARE_MODULE_AV1(tb, NULL, NULL, tb_clist, NULL, NULL, "$Revision: 1349 $"); * parv[4] - topic */ static int -ms_tb(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_tb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr; const char *newtopic; @@ -134,7 +134,7 @@ ms_tb(struct Client *client_p, struct Client *source_p, int parc, const char *pa * parv[5] - topic */ static int -ms_etb(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_etb(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr; const char *newtopic; diff --git a/modules/m_testline.c b/modules/m_testline.c index ff9169219..70e684265 100644 --- a/modules/m_testline.c +++ b/modules/m_testline.c @@ -41,8 +41,8 @@ #include "s_newconf.h" #include "reject.h" -static int mo_testline(struct Client *, struct Client *, int, const char **); -static int mo_testgecos(struct Client *, struct Client *, int, const char **); +static int mo_testline(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_testgecos(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message testline_msgtab = { "TESTLINE", 0, 0, 0, MFLG_SLOW, @@ -57,7 +57,7 @@ mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL }; DECLARE_MODULE_AV1(testline, NULL, NULL, testline_clist, NULL, NULL, "$Revision: 3303 $"); static int -mo_testline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct ConfItem *aconf; struct ConfItem *resv_p; @@ -231,7 +231,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch } static int -mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_testgecos(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct ConfItem *aconf; diff --git a/modules/m_testmask.c b/modules/m_testmask.c index 68313b2d0..271e0649a 100644 --- a/modules/m_testmask.c +++ b/modules/m_testmask.c @@ -48,7 +48,7 @@ #include "parse.h" #include "modules.h" -static int mo_testmask(struct Client *client_p, struct Client *source_p, +static int mo_testmask(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); struct Message testmask_msgtab = { @@ -63,7 +63,7 @@ static const char *empty_sockhost = "255.255.255.255"; static const char *spoofed_sockhost = "0"; static int -mo_testmask(struct Client *client_p, struct Client *source_p, +mo_testmask(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; diff --git a/modules/m_tginfo.c b/modules/m_tginfo.c index 052c3cc1d..30cf267eb 100644 --- a/modules/m_tginfo.c +++ b/modules/m_tginfo.c @@ -39,7 +39,7 @@ #include "modules.h" #include "s_newconf.h" /* add_tgchange */ -static int me_tginfo(struct Client *, struct Client *, int, const char **); +static int me_tginfo(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message tginfo_msgtab = { "TGINFO", 0, 0, 0, MFLG_SLOW, @@ -55,7 +55,7 @@ DECLARE_MODULE_AV1(tginfo, NULL, NULL, tginfo_clist, NULL, NULL, "$Revision$"); ** parv[1] = 0, reserved for future use (number of remaining targets) */ static int -me_tginfo(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_tginfo(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if (!IsPerson(source_p)) return 0; diff --git a/modules/m_time.c b/modules/m_time.c index d1728a70a..605561c66 100644 --- a/modules/m_time.c +++ b/modules/m_time.c @@ -36,7 +36,7 @@ #include "modules.h" #include "packet.h" -static int m_time(struct Client *, struct Client *, int, const char **); +static int m_time(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static char *date(void); struct Message time_msgtab = { @@ -63,7 +63,7 @@ static const char *weekdays[] = { * parv[1] = servername */ static int -m_time(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_time(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* this is not rate limited, so end the grace period */ if(MyClient(source_p) && !IsFloodDone(source_p)) diff --git a/modules/m_topic.c b/modules/m_topic.c index 9b9123b02..83dbe6938 100644 --- a/modules/m_topic.c +++ b/modules/m_topic.c @@ -43,8 +43,8 @@ #include "logger.h" #include "inline/stringops.h" -static int m_topic(struct Client *, struct Client *, int, const char **); -static int ms_topic(struct Client *, struct Client *, int, const char **); +static int m_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_topic(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message topic_msgtab = { "TOPIC", 0, 0, 0, MFLG_SLOW, @@ -60,7 +60,7 @@ DECLARE_MODULE_AV1(topic, NULL, NULL, topic_clist, NULL, NULL, "$Revision: 254 $ * parv[2] = new topic, if setting topic */ static int -m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr = NULL; struct membership *msptr; @@ -189,7 +189,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char * * Let servers always set a topic */ static int -ms_topic(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Channel *chptr = NULL; diff --git a/modules/m_trace.c b/modules/m_trace.c index 868c1b499..ce5eb18bf 100644 --- a/modules/m_trace.c +++ b/modules/m_trace.c @@ -42,7 +42,7 @@ #include "parse.h" #include "modules.h" -static int m_trace(struct Client *, struct Client *, int, const char **); +static int m_trace(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void trace_spy(struct Client *, struct Client *); @@ -70,7 +70,7 @@ static const char *empty_sockhost = "255.255.255.255"; * parv[1] = servername */ static int -m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_trace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p = NULL; struct Class *cltmp; diff --git a/modules/m_unreject.c b/modules/m_unreject.c index 4479c0326..4f9cb3842 100644 --- a/modules/m_unreject.c +++ b/modules/m_unreject.c @@ -32,7 +32,7 @@ #include "modules.h" #include "send.h" -static int mo_unreject(struct Client *, struct Client *, int, const char **); +static int mo_unreject(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message unreject_msgtab = { "UNREJECT", 0, 0, 0, MFLG_SLOW, @@ -47,7 +47,7 @@ DECLARE_MODULE_AV1(unreject, NULL, NULL, unreject_clist, NULL, NULL, "$Revision: * */ static int -mo_unreject(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_unreject(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(ConfigFileEntry.reject_after_count == 0 || ConfigFileEntry.reject_ban_time == 0 || ConfigFileEntry.reject_duration == 0) diff --git a/modules/m_user.c b/modules/m_user.c index 0760e7c50..7ef022aa2 100644 --- a/modules/m_user.c +++ b/modules/m_user.c @@ -38,7 +38,7 @@ #include "blacklist.h" #include "s_assert.h" -static int mr_user(struct Client *, struct Client *, int, const char **); +static int mr_user(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message user_msgtab = { "USER", 0, 0, 0, MFLG_SLOW, @@ -58,7 +58,7 @@ static int do_local_user(struct Client *client_p, struct Client *source_p, * parv[4] = users gecos */ static int -mr_user(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mr_user(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static char buf[BUFSIZE]; char *p; diff --git a/modules/m_userhost.c b/modules/m_userhost.c index b1e58aeaf..65a5fad14 100644 --- a/modules/m_userhost.c +++ b/modules/m_userhost.c @@ -38,7 +38,7 @@ static char buf[BUFSIZE]; -static int m_userhost(struct Client *, struct Client *, int, const char **); +static int m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message userhost_msgtab = { "USERHOST", 0, 0, 0, MFLG_SLOW, @@ -54,7 +54,7 @@ DECLARE_MODULE_AV1(userhost, NULL, NULL, userhost_clist, NULL, NULL, "$Revision: * information only (no spurious AWAY labels or channels). */ static int -m_userhost(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; char response[NICKLEN * 2 + USERLEN + HOSTLEN + 30]; diff --git a/modules/m_users.c b/modules/m_users.c index 7415cbdea..82ab1c808 100644 --- a/modules/m_users.c +++ b/modules/m_users.c @@ -35,7 +35,7 @@ #include "parse.h" #include "modules.h" -static int m_users(struct Client *, struct Client *, int, const char **); +static int m_users(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message users_msgtab = { "USERS", 0, 0, 0, MFLG_SLOW, @@ -50,7 +50,7 @@ DECLARE_MODULE_AV1(users, NULL, NULL, users_clist, NULL, NULL, "$Revision: 254 $ * parv[1] = servername */ static int -m_users(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_users(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(hunt_server(client_p, source_p, ":%s USERS :%s", 1, parc, parv) == HUNTED_ISME) { diff --git a/modules/m_version.c b/modules/m_version.c index be97edfe2..2a12ffb9c 100644 --- a/modules/m_version.c +++ b/modules/m_version.c @@ -38,8 +38,8 @@ static char *confopts(void); -static int m_version(struct Client *, struct Client *, int, const char **); -static int mo_version(struct Client *, struct Client *, int, const char **); +static int m_version(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int mo_version(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message version_msgtab = { "VERSION", 0, 0, 0, MFLG_SLOW, @@ -54,7 +54,7 @@ DECLARE_MODULE_AV1(version, NULL, NULL, version_clist, NULL, NULL, "$Revision: 1 * parv[1] = remote server */ static int -m_version(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_version(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0L; @@ -92,7 +92,7 @@ m_version(struct Client *client_p, struct Client *source_p, int parc, const char * parv[1] = remote server */ static int -mo_version(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_version(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(hunt_server(client_p, source_p, ":%s VERSION :%s", 1, parc, parv) == HUNTED_ISME) { diff --git a/modules/m_wallops.c b/modules/m_wallops.c index fe4ce22f9..2479dbf6d 100644 --- a/modules/m_wallops.c +++ b/modules/m_wallops.c @@ -38,9 +38,9 @@ #include "modules.h" #include "s_serv.h" -static int mo_operwall(struct Client *, struct Client *, int, const char **); -static int ms_operwall(struct Client *, struct Client *, int, const char **); -static int ms_wallops(struct Client *, struct Client *, int, const char **); +static int mo_operwall(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_operwall(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_wallops(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message wallops_msgtab = { "WALLOPS", 0, 0, 0, MFLG_SLOW, @@ -59,7 +59,7 @@ DECLARE_MODULE_AV1(wallops, NULL, NULL, wallops_clist, NULL, NULL, "$Revision: 1 * parv[1] = message text */ static int -mo_operwall(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_operwall(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { if(!IsOperOperwall(source_p)) { @@ -81,7 +81,7 @@ mo_operwall(struct Client *client_p, struct Client *source_p, int parc, const ch * parv[1] = message text */ static int -ms_operwall(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_operwall(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s OPERWALL :%s", use_id(source_p), parv[1]); @@ -95,7 +95,7 @@ ms_operwall(struct Client *client_p, struct Client *source_p, int parc, const ch * parv[1] = message text */ static int -ms_wallops(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_wallops(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { const char *prefix = ""; diff --git a/modules/m_who.c b/modules/m_who.c index b387c4303..577e23c6b 100644 --- a/modules/m_who.c +++ b/modules/m_who.c @@ -63,7 +63,7 @@ struct who_format const char *querytype; }; -static int m_who(struct Client *, struct Client *, int, const char **); +static int m_who(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message who_msgtab = { "WHO", 0, 0, 0, MFLG_SLOW, @@ -103,7 +103,7 @@ static void do_who(struct Client *source_p, ** parv[2] = additional selection flag and format options */ static int -m_who(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0; struct Client *target_p; diff --git a/modules/m_whois.c b/modules/m_whois.c index cb2ed0d5d..9780066fd 100644 --- a/modules/m_whois.c +++ b/modules/m_whois.c @@ -50,8 +50,8 @@ static void do_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); static void single_whois(struct Client *source_p, struct Client *target_p, int operspy); -static int m_whois(struct Client *, struct Client *, int, const char **); -static int ms_whois(struct Client *, struct Client *, int, const char **); +static int m_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static int ms_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message whois_msgtab = { "WHOIS", 0, 0, 0, MFLG_SLOW, @@ -77,7 +77,7 @@ DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision * parv[1] = nickname masklist */ static int -m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0; @@ -123,7 +123,7 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char * * parv[2] = nickname to whois */ static int -ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; diff --git a/modules/m_whowas.c b/modules/m_whowas.c index 15032f6de..d2e15ca6a 100644 --- a/modules/m_whowas.c +++ b/modules/m_whowas.c @@ -41,7 +41,7 @@ #include "parse.h" #include "modules.h" -static int m_whowas(struct Client *, struct Client *, int, const char **); +static int m_whowas(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message whowas_msgtab = { "WHOWAS", 0, 0, 0, MFLG_SLOW, @@ -56,7 +56,7 @@ DECLARE_MODULE_AV1(whowas, NULL, NULL, whowas_clist, NULL, NULL, "$Revision: 171 ** parv[1] = nickname queried */ static int -m_whowas(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +m_whowas(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { rb_dlink_list *whowas_list; rb_dlink_node *ptr; diff --git a/modules/m_xline.c b/modules/m_xline.c index 7d8bd0c32..b35b223be 100644 --- a/modules/m_xline.c +++ b/modules/m_xline.c @@ -53,14 +53,14 @@ #include "bandbi.h" #include "operhash.h" -static int mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int me_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int mo_unxline(struct Client *client_p, struct Client *source_p, int parc, +static int mo_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int ms_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int me_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); +static int mo_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int ms_unxline(struct Client *client_p, struct Client *source_p, int parc, +static int ms_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); -static int me_unxline(struct Client *client_p, struct Client *source_p, int parc, +static int me_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]); struct Message xline_msgtab = { @@ -100,7 +100,7 @@ static void remove_xline(struct Client *source_p, const char *name, * parv[3] - reason */ static int -mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct ConfItem *aconf; const char *name; @@ -187,7 +187,7 @@ mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char * handles a remote xline */ static int -ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* parv[0] parv[1] parv[2] parv[3] parv[4] * oper target serv xline type reason @@ -206,7 +206,7 @@ ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char } static int -me_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_xline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* time name type :reason */ if(!IsPerson(source_p)) @@ -388,7 +388,7 @@ cluster_xline(struct Client *source_p, int temp_time, const char *name, const ch * parv[1] - thing to unxline */ static int -mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +mo_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { int propagated = 1; @@ -426,7 +426,7 @@ mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const cha * handles a remote unxline */ static int -ms_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +ms_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* parv[0] parv[1] parv[2] * oper target server gecos @@ -444,7 +444,7 @@ ms_unxline(struct Client *client_p, struct Client *source_p, int parc, const cha } static int -me_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +me_unxline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { /* name */ if(!IsPerson(source_p))