GitHub-Mirror/NeoStats
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more ircd cleanups

Browse source
This commit is contained in:
Mark 2003-12-10 20:51:46 +00:00
parent 73bad7cf22
commit e6108f4847
11 changed files with 273 additions and 748 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
Bahamut.c
View file

@ -37,9 +37,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Smode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
@ -80,11 +80,11 @@ IntCommands cmd_list[] = {
,
{MSG_CREDITS, Usr_Credits, 1, 0}
,
{MSG_SERVER, Usr_AddServer, 1, 0}
{MSG_SERVER, Usr_Server, 1, 0}
,
{MSG_SQUIT, Usr_DelServer, 1, 0}
{MSG_SQUIT, Usr_Squit, 1, 0}
,
{MSG_QUIT, Usr_DelUser, 1, 0}
{MSG_QUIT, Usr_Quit, 1, 0}
,
{MSG_MODE, Usr_Mode, 1, 0}
,
@ -494,85 +494,27 @@ sburst_cmd (int b)
}
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_GLOBOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
sts (":%s %s :%s", from, MSG_GLOBOPS, buf);
}
static void
@ -692,7 +634,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -714,19 +656,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -755,13 +697,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Pong (char *origin, char **argv, int argc)

101
Ircu.c
View file

@ -35,9 +35,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Smode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
@ -80,11 +80,11 @@ IntCommands cmd_list[] = {
,
{MSG_CREDITS, Usr_Credits, 1, 0}
,
{MSG_SERVER, Usr_AddServer, 1, 0}
{MSG_SERVER, Usr_Server, 1, 0}
,
{MSG_SQUIT, Usr_DelServer, 1, 0}
{MSG_SQUIT, Usr_Squit, 1, 0}
,
{MSG_QUIT, Usr_DelUser, 1, 0}
{MSG_QUIT, Usr_Quit, 1, 0}
,
{MSG_MODE, Usr_Mode, 1, 0}
,
@ -487,86 +487,29 @@ srakill_cmd (const char *host, const char *ident)
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
sts (":%s %s :%s", from, MSG_GLOBOPS, buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_GLOBOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
}
static void
Srv_Sjoin (char *origin, char **argv, int argc)
@ -692,7 +635,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -714,19 +657,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -755,13 +698,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Vhost (char *origin, char **argv, int argc)

103
QuantumIRCd.c
View file

@ -37,9 +37,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Smode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
@ -82,9 +82,9 @@ IntCommands cmd_list[] = {
{MSG_MOTD, TOK_MOTD, Usr_MOTD, 1, 0},
{MSG_ADMIN, TOK_ADMIN, Usr_Admin, 1, 0},
{MSG_CREDITS, TOK_CREDITS, Usr_Credits, 1, 0},
{MSG_SERVER, TOK_SERVER, Usr_AddServer, 1, 0},
{MSG_SQUIT, TOK_SQUIT, Usr_DelServer, 1, 0},
{MSG_QUIT, TOK_QUIT, Usr_DelUser, 1, 0},
{MSG_SERVER, TOK_SERVER, Usr_Server, 1, 0},
{MSG_SQUIT, TOK_SQUIT, Usr_Squit, 1, 0},
{MSG_QUIT, TOK_QUIT, Usr_Quit, 1, 0},
{MSG_MODE, TOK_MODE, Usr_Mode, 1, 0},
{MSG_SVSMODE, TOK_SVSMODE, Usr_Smode, 1, 0},
{MSG_KILL, TOK_KILL, Usr_Kill, 1, 0},
@ -581,89 +581,30 @@ sburst_cmd (int b)
return 1;
}
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, (me.token ? TOK_PRIVATE : MSG_PRIVATE), me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, (me.token ? TOK_PRIVATE : MSG_PRIVATE), to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, (me.token ? TOK_NOTICE : MSG_NOTICE), to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
sts (":%s %s :%s", from, (me.token ? TOK_GLOBOPS : MSG_GLOBOPS), buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_GLOBOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
}
static void
@ -794,7 +735,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -816,19 +757,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -857,13 +798,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Vhost (char *origin, char **argv, int argc)

104
Ultimate.c
View file

@ -37,9 +37,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Smode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
@ -94,9 +94,9 @@ IntCommands cmd_list[] = {
{MSG_MOTD, TOK_MOTD, Usr_MOTD, 1, 0},
{MSG_ADMIN, TOK_ADMIN, Usr_Admin, 1, 0},
{MSG_CREDITS, TOK_CREDITS, Usr_Credits, 1, 0},
{MSG_SERVER, TOK_SERVER, Usr_AddServer, 1, 0},
{MSG_SQUIT, TOK_SQUIT, Usr_DelServer, 1, 0},
{MSG_QUIT, TOK_QUIT, Usr_DelUser, 1, 0},
{MSG_SERVER, TOK_SERVER, Usr_Server, 1, 0},
{MSG_SQUIT, TOK_SQUIT, Usr_Squit, 1, 0},
{MSG_QUIT, TOK_QUIT, Usr_Quit, 1, 0},
{MSG_MODE, TOK_MODE, Usr_Mode, 1, 0},
{MSG_SVSMODE, TOK_SVSMODE, Usr_Smode, 1, 0},
{MSG_KILL, TOK_KILL, Usr_Kill, 1, 0},
@ -680,90 +680,30 @@ sburst_cmd (int b)
return 1;
}
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, (me.token ? TOK_PRIVATE : MSG_PRIVATE), me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, (me.token ? TOK_PRIVATE : MSG_PRIVATE), to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, (me.token ? TOK_NOTICE : MSG_NOTICE), to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
sts (":%s %s :%s", from, (me.token ? TOK_GLOBOPS : MSG_GLOBOPS), buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_GLOBOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
}
static void
Srv_Sjoin (char *origin, char **argv, int argc)
{
@ -896,7 +836,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -918,19 +858,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -963,13 +903,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Vhost (char *origin, char **argv, int argc)

101
Unreal.c
View file

@ -37,9 +37,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Smode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
@ -81,9 +81,9 @@ IntCommands cmd_list[] = {
{MSG_MOTD, TOK_MOTD, Usr_MOTD, 1, 0},
{MSG_ADMIN, TOK_ADMIN, Usr_Admin, 1, 0},
{MSG_CREDITS, TOK_CREDITS, Usr_Credits, 1, 0},
{MSG_SERVER, TOK_SERVER, Usr_AddServer, 1, 0},
{MSG_SQUIT, TOK_SQUIT, Usr_DelServer, 1, 0},
{MSG_QUIT, TOK_QUIT, Usr_DelUser, 1, 0},
{MSG_SERVER, TOK_SERVER, Usr_Server, 1, 0},
{MSG_SQUIT, TOK_SQUIT, Usr_Squit, 1, 0},
{MSG_QUIT, TOK_QUIT, Usr_Quit, 1, 0},
{MSG_MODE, TOK_MODE, Usr_Mode, 1, 0},
{MSG_SVSMODE, TOK_SVSMODE, Usr_Smode, 1, 0},
{MSG_SVS2MODE, TOK_SVS2MODE, Usr_Smode, 1, 0},
@ -523,86 +523,29 @@ srakill_cmd (const char *host, const char *ident)
}
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, (me.token ? TOK_PRIVATE : MSG_PRIVATE), me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, (me.token ? TOK_PRIVATE : MSG_PRIVATE), to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, (me.token ? TOK_NOTICE : MSG_NOTICE), to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
sts (":%s %s :%s", from, (me.token ? TOK_GLOBOPS : MSG_GLOBOPS), buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_GLOBOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
}
static void
Srv_Connect (char *origin, char **argv, int argc)
@ -625,7 +568,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -647,19 +590,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -687,13 +630,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Vhost (char *origin, char **argv, int argc)

102
hybrid7.c
View file

@ -35,9 +35,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
static void Usr_Pong (char *origin, char **argv, int argc);
@ -76,11 +76,11 @@ IntCommands cmd_list[] = {
,
{MSG_CREDITS, Usr_Credits, 1, 0}
,
{MSG_SERVER, Usr_AddServer, 1, 0}
{MSG_SERVER, Usr_Server, 1, 0}
,
{MSG_SQUIT, Usr_DelServer, 1, 0}
{MSG_SQUIT, Usr_Squit, 1, 0}
,
{MSG_QUIT, Usr_DelUser, 1, 0}
{MSG_QUIT, Usr_Quit, 1, 0}
,
{MSG_MODE, Usr_Mode, 1, 0}
,
@ -481,85 +481,27 @@ srakill_cmd (const char *host, const char *ident)
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_WALLOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
sts (":%s %s :%s", from, MSG_WALLOPS, ircd_buf);
}
static void
@ -674,7 +616,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -696,19 +638,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -737,13 +679,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Pong (char *origin, char **argv, int argc)

96
ircd.c
View file

@ -31,6 +31,7 @@
#include "log.h"
#include "services.h"
static char ircd_buf[BUFSIZE];
static char UmodeStringBuf[64];
/** @brief UmodeMaskToString
@ -558,6 +559,18 @@ flood (User * u)
return 0;
}
/** @brief Display NeoStats version info
*
*
*
* @return
*/
void
ns_usr_version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
}
/** @brief Display our MOTD Message of the Day from the external neostats.motd file
*
*
@ -722,3 +735,86 @@ privmsg_list (char *to, char *from, const char **text)
text++;
}
}
void
chanalert (char *who, char *fmt, ...)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
chan_privmsg(who, ircd_buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
send_privmsg (to, from, ircd_buf);
} else {
send_notice (to, from, ircd_buf);
}
}
void
privmsg (char *to, const char *from, char *fmt, ...)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
send_privmsg (to, from, ircd_buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
send_notice (to, from, ircd_buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
send_globops(from, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
}

6
ircd.h
View file

@ -67,9 +67,15 @@ void ns_usr_admin (char *nick, char **argv, int argc);
void ns_usr_credits (char *nick, char **argv, int argc);
void ns_usr_stats (char *origin, char **argv, int argc);
void ns_usr_pong (char *origin, char **argv, int argc);
void ns_usr_version (char *origin, char **argv, int argc);
/* Defined in ircd specific files but common to all */
int SignOn_NewBot (const char *nick, const char *user, const char *host, const char *rname, long Umode);
void init_ircd (void);
void chan_privmsg (char *who, char *buf);
void send_privmsg (char *to, const char *from, char *buf);
void send_notice (char *to, const char *from, char *buf);
void send_globops (char *from, char *buf);
#endif

101
liquidircd.c
View file

@ -38,9 +38,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Smode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
@ -84,11 +84,11 @@ IntCommands cmd_list[] = {
,
{MSG_CREDITS, Usr_Credits, 1, 0}
,
{MSG_SERVER, Usr_AddServer, 1, 0}
{MSG_SERVER, Usr_Server, 1, 0}
,
{MSG_SQUIT, Usr_DelServer, 1, 0}
{MSG_SQUIT, Usr_Squit, 1, 0}
,
{MSG_QUIT, Usr_DelUser, 1, 0}
{MSG_QUIT, Usr_Quit, 1, 0}
,
{MSG_MODE, Usr_Mode, 1, 0}
,
@ -573,86 +573,29 @@ sburst_cmd (int b)
}
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
sts (":%s %s :%s", from, MSG_GLOBOPS, buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_GLOBOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
}
static void
Srv_Sjoin (char *origin, char **argv, int argc)
@ -771,7 +714,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -793,19 +736,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -834,13 +777,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Vhost (char *origin, char **argv, int argc)

101
mystic.c
View file

@ -37,9 +37,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Smode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
@ -78,9 +78,9 @@ IntCommands cmd_list[] = {
{MSG_MOTD, TOK_MOTD, Usr_MOTD, 1, 0},
{MSG_ADMIN, TOK_ADMIN, Usr_Admin, 1, 0},
{MSG_CREDITS, TOK_CREDITS, Usr_Credits, 1, 0},
{MSG_SERVER, TOK_SERVER, Usr_AddServer, 1, 0},
{MSG_SQUIT, TOK_SQUIT, Usr_DelServer, 1, 0},
{MSG_QUIT, TOK_QUIT, Usr_DelUser, 1, 0},
{MSG_SERVER, TOK_SERVER, Usr_Server, 1, 0},
{MSG_SQUIT, TOK_SQUIT, Usr_Squit, 1, 0},
{MSG_QUIT, TOK_QUIT, Usr_Quit, 1, 0},
{MSG_MODE, TOK_MODE, Usr_Mode, 1, 0},
{MSG_SVSMODE, TOK_SVSMODE, Usr_Smode, 1, 0},
{MSG_KILL, TOK_KILL, Usr_Kill, 1, 0},
@ -492,86 +492,29 @@ sburst_cmd (int b)
}
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, (me.token ? TOK_PRIVATE : MSG_PRIVATE), me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, (me.token ? TOK_PRIVATE : MSG_PRIVATE), to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, (me.token ? TOK_NOTICE : MSG_NOTICE), to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
sts (":%s %s :%s", from, (me.token ? TOK_GLOBOPS : MSG_GLOBOPS), buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_GLOBOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
}
static void
Srv_Connect (char *origin, char **argv, int argc)
@ -595,7 +538,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -617,19 +560,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -658,13 +601,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Vhost (char *origin, char **argv, int argc)

104
neoircd.c
View file

@ -35,9 +35,9 @@ static void Usr_Version (char *origin, char **argv, int argc);
static void Usr_MOTD (char *origin, char **argv, int argc);
static void Usr_Admin (char *origin, char **argv, int argc);
static void Usr_Credits (char *origin, char **argv, int argc);
static void Usr_AddServer (char *origin, char **argv, int argc);
static void Usr_DelServer (char *origin, char **argv, int argc);
static void Usr_DelUser (char *origin, char **argv, int argc);
static void Usr_Server (char *origin, char **argv, int argc);
static void Usr_Squit (char *origin, char **argv, int argc);
static void Usr_Quit (char *origin, char **argv, int argc);
static void Usr_Mode (char *origin, char **argv, int argc);
static void Usr_Kill (char *origin, char **argv, int argc);
static void Usr_Pong (char *origin, char **argv, int argc);
@ -77,11 +77,11 @@ IntCommands cmd_list[] = {
,
{MSG_CREDITS, Usr_Credits, 1, 0}
,
{MSG_SERVER, Usr_AddServer, 1, 0}
{MSG_SERVER, Usr_Server, 1, 0}
,
{MSG_SQUIT, Usr_DelServer, 1, 0}
{MSG_SQUIT, Usr_Squit, 1, 0}
,
{MSG_QUIT, Usr_DelUser, 1, 0}
{MSG_QUIT, Usr_Quit, 1, 0}
,
{MSG_MODE, Usr_Mode, 1, 0}
,
@ -500,89 +500,29 @@ srakill_cmd (const char *host, const char *ident)
void
chanalert (char *who, char *fmt, ...)
chan_privmsg (char *who, char *buf)
{
va_list ap;
if (!me.onchan)
return;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, ircd_buf);
sts (":%s %s %s :%s", who, MSG_PRIVATE, me.chan, buf);
}
void
prefmsg (char *to, const char *from, char *fmt, ...)
send_privmsg (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.want_privmsg) {
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
} else {
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
}
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, buf);
}
void
privmsg (char *to, const char *from, char *fmt, ...)
send_notice (char *to, const char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_PRIVATE, to, ircd_buf);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, buf);
}
void
notice (char *to, const char *from, char *fmt, ...)
send_globops (char *from, char *buf)
{
va_list ap;
if (findbot (to)) {
chanalert (s_Services, "Message From our Bot(%s) to Our Bot(%s), Dropping Message", from, to);
return;
}
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
sts (":%s %s %s :%s", from, MSG_NOTICE, to, ircd_buf);
sts (":%s %s :%s", from, MSG_WALLOPS, ircd_buf);
}
void
globops (char *from, char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
ircvsnprintf (ircd_buf, BUFSIZE, fmt, ap);
va_end (ap);
if (me.onchan) {
sts (":%s %s :%s", from, MSG_WALLOPS, ircd_buf);
} else {
nlog (LOG_NORMAL, LOG_CORE, ircd_buf);
}
}
/* XXXX sjoin sucks man Should do as much of this in a chans.c function*/
@ -699,7 +639,7 @@ Usr_Stats (char *origin, char **argv, int argc)
static void
Usr_Version (char *origin, char **argv, int argc)
{
snumeric_cmd (RPL_VERSION, origin, "%d.%d.%d%s :%s -> %s %s", MAJOR, MINOR, REV, ircd_version, me.name, version_date, version_time);
ns_usr_version (origin, argv, argc);
}
static void
@ -721,19 +661,19 @@ Usr_Credits (char *origin, char **argv, int argc)
}
static void
Usr_AddServer (char *origin, char **argv, int argc)
Usr_Server (char *origin, char **argv, int argc)
{
AddServer (argv[0], origin, atoi (argv[1]));
}
static void
Usr_DelServer (char *origin, char **argv, int argc)
Usr_Squit (char *origin, char **argv, int argc)
{
DelServer (argv[0]);
}
static void
Usr_DelUser (char *origin, char **argv, int argc)
Usr_Quit (char *origin, char **argv, int argc)
{
DelUser (origin);
}
@ -751,13 +691,7 @@ Usr_Mode (char *origin, char **argv, int argc)
static void
Usr_Kill (char *origin, char **argv, int argc)
{
User *u;
u = finduser (argv[0]);
if (u) {
KillUser (argv[0]);
} else {
nlog (LOG_WARNING, LOG_CORE, "Can't find user %s for Kill", argv[0]);
}
KillUser (argv[0]);
}
static void
Usr_Pong (char *origin, char **argv, int argc)