summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/example.conf1
-rw-r--r--docs/Changes1
-rw-r--r--docs/README4
-rw-r--r--include/extern.h2
-rw-r--r--include/modes.h7
-rw-r--r--include/services.h2
-rw-r--r--modules/protocol/bahamut.cpp2
-rw-r--r--modules/protocol/inspircd11.cpp2
-rw-r--r--modules/protocol/inspircd12.cpp60
-rw-r--r--modules/protocol/inspircd20.cpp58
-rw-r--r--modules/protocol/plexus.cpp717
-rw-r--r--modules/protocol/ratbox.cpp31
-rw-r--r--modules/protocol/unreal32.cpp2
-rw-r--r--src/protocol.cpp8
-rw-r--r--src/servers.cpp8
15 files changed, 802 insertions, 103 deletions
diff --git a/data/example.conf b/data/example.conf
index cb5f77d25..a7bb64751 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -160,6 +160,7 @@ serverinfo
* - ratbox
* - bahamut
* - unreal32
+ * - plexus
*/
type = "inspircd12"
diff --git a/docs/Changes b/docs/Changes
index 0ab0670b2..eaa22312f 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -4,6 +4,7 @@ A Automatically set channel founder to the user with the highest access if there
A /chanserv clone command to copy settings from one channel to another.
A Ability for users to delete their own access in channels
A Ability for users with registrations pending to drop their registrations with /nickserv drop
+A Added support for Plexus 3
F Changed the GHOST command to not allow ghosting unidentified users if the RECOVER command exists
Anope Version 1.9.3
diff --git a/docs/README b/docs/README
index 787bd27a9..bf7baed48 100644
--- a/docs/README
+++ b/docs/README
@@ -185,8 +185,7 @@ Table of Contents
* HostServ, a neat service that allows users to show custom vHosts
(virtual hosts) instead of their real IP address; this only works
- on daemons supporting ip cloaking, such as UnrealIRCd, UltimateIRCd
- and ViagraIRCd.
+ on daemons supporting ip cloaking, such as UnrealIRCd.
Anope currently works with:
@@ -194,6 +193,7 @@ Table of Contents
* InspIRCd 1.1, 1.2, or 2.0
* Ratbox 2.0.6 or later
* UnrealIRCd 3.2 or later
+ * Plexus 3 or later
Anope could also work with some of the daemons derived by the ones listed
above, but there's no support for them if they work or don't work.
diff --git a/include/extern.h b/include/extern.h
index bd951ee5e..d16c5e1db 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -333,8 +333,6 @@ E void get_user_stats(long &count, long &mem);
E User *finduser(const Anope::string &nick);
-E Anope::string TS6SID;
-
E User *do_nick(const Anope::string &source, const Anope::string &nick, const Anope::string &username, const Anope::string &host, const Anope::string &server, const Anope::string &realname, time_t ts, const Anope::string &ip, const Anope::string &vhost, const Anope::string &uid, const Anope::string &modes);
E void do_umode(const Anope::string &, const Anope::string &user, const Anope::string &modes);
diff --git a/include/modes.h b/include/modes.h
index ce0281cd0..90d3a2b11 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -16,10 +16,10 @@ enum UserModeName
UMODE_BEGIN,
UMODE_SERV_ADMIN, UMODE_BOT, UMODE_CO_ADMIN, UMODE_FILTER, UMODE_HIDEOPER, UMODE_NETADMIN,
- UMODE_REGPRIV, UMODE_PROTECTED, UMODE_NO_CTCP, UMODE_WEBTV, UMODE_WHOIS, UMODE_ADMIN, UMODE_DEAF,
+ UMODE_REGPRIV, UMODE_PROTECTED, UMODE_NO_CTCP, UMODE_WEBTV, UMODE_WEBIRC, UMODE_WHOIS, UMODE_ADMIN, UMODE_DEAF,
UMODE_GLOBOPS, UMODE_HELPOP, UMODE_INVIS, UMODE_OPER, UMODE_PRIV, UMODE_GOD, UMODE_REGISTERED,
- UMODE_SNOMASK, UMODE_VHOST, UMODE_WALLOPS, UMODE_CLOAK, UMODE_SSL, UMODE_CALLERID, UMODE_COMMONCHANS,
- UMODE_HIDDEN, UMODE_STRIPCOLOR, UMODE_INVISIBLE_OPER,
+ UMODE_SNOMASK, UMODE_VHOST, UMODE_WALLOPS, UMODE_CLOAK, UMODE_SSL, UMODE_SOFTCALLERID, UMODE_CALLERID,
+ UMODE_COMMONCHANS, UMODE_HIDDEN, UMODE_STRIPCOLOR, UMODE_INVISIBLE_OPER,
UMODE_END
};
@@ -36,6 +36,7 @@ enum ChannelModeName
CMODE_NOCTCP, CMODE_FILTER, CMODE_NOKNOCK, CMODE_REDIRECT, CMODE_REGMODERATED, CMODE_NONICK, CMODE_OPERONLY,
CMODE_NOKICK, CMODE_REGISTEREDONLY, CMODE_STRIPCOLOR, CMODE_NONOTICE, CMODE_NOINVITE, CMODE_ALLINVITE,
CMODE_BLOCKCAPS, CMODE_PERM, CMODE_NICKFLOOD, CMODE_JOINFLOOD, CMODE_DELAYEDJOIN, CMODE_NOREJOIN,
+ CMODE_BANDWIDTH,
/* b/e/I */
CMODE_BAN, CMODE_EXCEPT,
diff --git a/include/services.h b/include/services.h
index 305b520ac..61532b82d 100644
--- a/include/services.h
+++ b/include/services.h
@@ -433,7 +433,6 @@ struct IRCDVar
{
const char *name; /* Name of the IRCd command */
const char *pseudoclient_mode; /* Mode used by BotServ Bots */
- int max_symbols; /* Chan Max Symbols */
int svsnick; /* Supports SVSNICK */
int vhost; /* Supports vhost */
int snline; /* Supports SNline */
@@ -443,7 +442,6 @@ struct IRCDVar
int chansqline; /* Supports Channel Sqlines */
int quitonkill; /* IRCD sends QUIT when kill */
int svsmode_unban; /* svsmode can be used to unban */
- int reversekickcheck; /* Can reverse ban check */
int vident; /* Supports vidents */
int svshold; /* Supports svshold */
int tsonmode; /* Timestamp on mode changes */
diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index e2a5b2af7..7c0a23112 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -17,7 +17,6 @@
IRCDVar myIrcd[] = {
{"Bahamut 1.8.x", /* ircd name */
"+", /* Modes used by pseudoclients */
- 2, /* Chan Max Symbols */
1, /* SVSNICK */
0, /* Vhost */
1, /* Supports SNlines */
@@ -27,7 +26,6 @@ IRCDVar myIrcd[] = {
1, /* Chan SQlines */
1, /* Quit on Kill */
1, /* SVSMODE unban */
- 0, /* Reverse */
0, /* vidents */
1, /* svshold */
1, /* time stamp on mode */
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index f7a13ad7a..f6326a7dc 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -18,7 +18,6 @@
IRCDVar myIrcd[] = {
{"InspIRCd 1.1", /* ircd name */
"+I", /* Modes used by pseudoclients */
- 5, /* Chan Max Symbols */
1, /* SVSNICK */
1, /* Vhost */
1, /* Supports SNlines */
@@ -28,7 +27,6 @@ IRCDVar myIrcd[] = {
0, /* Chan SQlines */
0, /* Quit on Kill */
0, /* SVSMODE unban */
- 1, /* Reverse */
1, /* vidents */
1, /* svshold */
0, /* time stamp on mode */
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index 196c748cf..b69ed81c8 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -18,7 +18,6 @@
IRCDVar myIrcd[] = {
{"InspIRCd 1.2", /* ircd name */
"+I", /* Modes used by pseudoclients */
- 5, /* Chan Max Symbols */
1, /* SVSNICK */
1, /* Vhost */
0, /* Supports SNlines */
@@ -28,7 +27,6 @@ IRCDVar myIrcd[] = {
0, /* Chan SQlines */
0, /* Quit on Kill */
0, /* SVSMODE unban */
- 1, /* Reverse */
1, /* vidents */
1, /* svshold */
0, /* time stamp on mode */
@@ -64,7 +62,7 @@ void inspircd_cmd_chghost(const Anope::string &nick, const Anope::string &vhost)
return;
}
- send_cmd(HostServ ? HostServ->GetUID() : TS6SID, "CHGHOST %s %s", nick.c_str(), vhost.c_str());
+ send_cmd(HostServ ? HostServ->GetUID() : Config->Numeric, "CHGHOST %s %s", nick.c_str(), vhost.c_str());
}
bool event_idle(const Anope::string &source, const std::vector<Anope::string> &params)
@@ -87,7 +85,7 @@ class InspIRCdProto : public IRCDProto
{
void SendAkillDel(const XLine *x)
{
- send_cmd(OperServ ? OperServ->GetUID() : TS6SID, "GLINE %s", x->Mask.c_str());
+ send_cmd(OperServ ? OperServ->GetUID() : Config->Numeric, "GLINE %s", x->Mask.c_str());
}
void SendTopic(BotInfo *whosets, Channel *c)
@@ -112,12 +110,12 @@ class InspIRCdProto : public IRCDProto
time_t timeleft = x->Expires - Anope::CurTime;
if (timeleft > 172800 || !x->Expires)
timeleft = 172800;
- send_cmd(OperServ ? OperServ->GetUID() : TS6SID, "ADDLINE G %s@%s %s %ld %ld :%s", x->GetUser().c_str(), x->GetHost().c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), static_cast<long>(timeleft), x->Reason.c_str());
+ send_cmd(OperServ ? OperServ->GetUID() : Config->Numeric, "ADDLINE G %s@%s %s %ld %ld :%s", x->GetUser().c_str(), x->GetHost().c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), static_cast<long>(timeleft), x->Reason.c_str());
}
void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf)
{
- send_cmd(source ? source->GetUID() : TS6SID, "KILL %s :%s", user->GetUID().c_str(), buf.c_str());
+ send_cmd(source ? source->GetUID() : Config->Numeric, "KILL %s :%s", user->GetUID().c_str(), buf.c_str());
}
void SendSVSMode(const User *u, int ac, const char **av)
@@ -127,24 +125,24 @@ class InspIRCdProto : public IRCDProto
void SendNumericInternal(const Anope::string &source, int numeric, const Anope::string &dest, const Anope::string &buf)
{
- send_cmd(TS6SID, "PUSH %s ::%s %03d %s %s", dest.c_str(), source.c_str(), numeric, dest.c_str(), buf.c_str());
+ send_cmd(Config->Numeric, "PUSH %s ::%s %03d %s %s", dest.c_str(), source.c_str(), numeric, dest.c_str(), buf.c_str());
}
void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf)
{
- send_cmd(source ? source->GetUID() : TS6SID, "FMODE %s %u %s", dest->name.c_str(), static_cast<unsigned>(dest->creation_time), buf.c_str());
+ send_cmd(source ? source->GetUID() : Config->Numeric, "FMODE %s %u %s", dest->name.c_str(), static_cast<unsigned>(dest->creation_time), buf.c_str());
}
void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf)
{
if (buf.empty())
return;
- send_cmd(bi ? bi->GetUID() : TS6SID, "MODE %s %s", u->GetUID().c_str(), buf.c_str());
+ send_cmd(bi ? bi->GetUID() : Config->Numeric, "MODE %s %s", u->GetUID().c_str(), buf.c_str());
}
void SendClientIntroduction(const User *u, const Anope::string &modes)
{
- send_cmd(TS6SID, "UID %s %ld %s %s %s %s 0.0.0.0 %ld %s :%s", u->GetUID().c_str(), static_cast<long>(u->timestamp), u->nick.c_str(), u->host.c_str(), u->host.c_str(), u->GetIdent().c_str(), static_cast<long>(u->my_signon), modes.c_str(), u->realname.c_str());
+ send_cmd(Config->Numeric, "UID %s %ld %s %s %s %s 0.0.0.0 %ld %s :%s", u->GetUID().c_str(), static_cast<long>(u->timestamp), u->nick.c_str(), u->host.c_str(), u->host.c_str(), u->GetIdent().c_str(), static_cast<long>(u->my_signon), modes.c_str(), u->realname.c_str());
}
void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf)
@@ -157,7 +155,7 @@ class InspIRCdProto : public IRCDProto
void SendNoticeChanopsInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf)
{
- send_cmd(TS6SID, "NOTICE @%s :%s", dest->name.c_str(), buf.c_str());
+ send_cmd(Config->Numeric, "NOTICE @%s :%s", dest->name.c_str(), buf.c_str());
}
/* SERVER services-dev.chatspike.net password 0 :Description here */
@@ -169,30 +167,30 @@ class InspIRCdProto : public IRCDProto
/* JOIN */
void SendJoin(const BotInfo *user, const Anope::string &channel, time_t chantime)
{
- send_cmd(TS6SID, "FJOIN %s %ld + :,%s", channel.c_str(), static_cast<long>(chantime), user->GetUID().c_str());
+ send_cmd(Config->Numeric, "FJOIN %s %ld + :,%s", channel.c_str(), static_cast<long>(chantime), user->GetUID().c_str());
}
void SendJoin(BotInfo *user, const ChannelContainer *cc)
{
- send_cmd(TS6SID, "FJOIN %s %ld +%s :%s,%s", cc->chan->name.c_str(), static_cast<long>(cc->chan->creation_time), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildCharPrefixList().c_str(), user->GetUID().c_str());
+ send_cmd(Config->Numeric, "FJOIN %s %ld +%s :%s,%s", cc->chan->name.c_str(), static_cast<long>(cc->chan->creation_time), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildCharPrefixList().c_str(), user->GetUID().c_str());
}
/* UNSQLINE */
void SendSQLineDel(const XLine *x)
{
- send_cmd(TS6SID, "DELLINE Q %s", x->Mask.c_str());
+ send_cmd(Config->Numeric, "DELLINE Q %s", x->Mask.c_str());
}
/* SQLINE */
void SendSQLine(const XLine *x)
{
- send_cmd(TS6SID, "ADDLINE Q %s %s %ld 0 :%s", x->Mask.c_str(), Config->s_OperServ.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
+ send_cmd(Config->Numeric, "ADDLINE Q %s %s %ld 0 :%s", x->Mask.c_str(), Config->s_OperServ.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
}
/* SQUIT */
void SendSquit(const Anope::string &servname, const Anope::string &message)
{
- send_cmd(TS6SID, "SQUIT %s :%s", servname.c_str(), message.c_str());
+ send_cmd(Config->Numeric, "SQUIT %s :%s", servname.c_str(), message.c_str());
}
/* Functions that use serval cmd functions */
@@ -209,8 +207,8 @@ class InspIRCdProto : public IRCDProto
{
inspircd_cmd_pass(uplink_server->password);
SendServer(Me);
- send_cmd(TS6SID, "BURST");
- send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config->ServerName.c_str(), ircd->name, Config->EncModuleList.begin()->c_str(), Anope::Build().c_str());
+ send_cmd(Config->Numeric, "BURST");
+ send_cmd(Config->Numeric, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config->ServerName.c_str(), ircd->name, Config->EncModuleList.begin()->c_str(), Anope::Build().c_str());
}
/* CHGIDENT */
@@ -219,7 +217,7 @@ class InspIRCdProto : public IRCDProto
if (!has_chgidentmod)
ircdproto->SendGlobops(OperServ, "CHGIDENT not loaded!");
else
- send_cmd(HostServ ? HostServ->GetUID() : TS6SID, "CHGIDENT %s %s", nick.c_str(), vIdent.c_str());
+ send_cmd(HostServ ? HostServ->GetUID() : Config->Numeric, "CHGIDENT %s %s", nick.c_str(), vIdent.c_str());
}
/* SVSHOLD - set */
@@ -237,13 +235,13 @@ class InspIRCdProto : public IRCDProto
/* UNSZLINE */
void SendSZLineDel(const XLine *x)
{
- send_cmd(TS6SID, "DELLINE Z %s", x->Mask.c_str());
+ send_cmd(Config->Numeric, "DELLINE Z %s", x->Mask.c_str());
}
/* SZLINE */
void SendSZLine(const XLine *x)
{
- send_cmd(TS6SID, "ADDLINE Z %s %s %ld 0 :%s", x->Mask.c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
+ send_cmd(Config->Numeric, "ADDLINE Z %s %s %ld 0 :%s", x->Mask.c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
}
void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string &)
@@ -264,35 +262,35 @@ class InspIRCdProto : public IRCDProto
{
User *u = finduser(who);
- send_cmd(TS6SID, "METADATA %s swhois :%s", u->GetUID().c_str(), mask.c_str());
+ send_cmd(Config->Numeric, "METADATA %s swhois :%s", u->GetUID().c_str(), mask.c_str());
}
void SendBOB()
{
- send_cmd(TS6SID, "BURST %ld", static_cast<long>(Anope::CurTime));
+ send_cmd(Config->Numeric, "BURST %ld", static_cast<long>(Anope::CurTime));
}
void SendEOB()
{
- send_cmd(TS6SID, "ENDBURST");
+ send_cmd(Config->Numeric, "ENDBURST");
}
void SendGlobopsInternal(BotInfo *source, const Anope::string &buf)
{
if (has_globopsmod)
- send_cmd(source ? source->GetUID() : TS6SID, "SNONOTICE g :%s", buf.c_str());
+ send_cmd(source ? source->GetUID() : Config->Numeric, "SNONOTICE g :%s", buf.c_str());
else
- send_cmd(source ? source->GetUID() : TS6SID, "SNONOTICE A :%s", buf.c_str());
+ send_cmd(source ? source->GetUID() : Config->Numeric, "SNONOTICE A :%s", buf.c_str());
}
void SendAccountLogin(const User *u, const NickCore *account)
{
- send_cmd(TS6SID, "METADATA %s accountname :%s", u->GetUID().c_str(), account->display.c_str());
+ send_cmd(Config->Numeric, "METADATA %s accountname :%s", u->GetUID().c_str(), account->display.c_str());
}
void SendAccountLogout(const User *u, const NickCore *account)
{
- send_cmd(TS6SID, "METADATA %s accountname :", u->GetUID().c_str());
+ send_cmd(Config->Numeric, "METADATA %s accountname :", u->GetUID().c_str());
}
bool IsNickValid(const Anope::string &nick)
@@ -526,7 +524,7 @@ bool event_time(const Anope::string &source, const std::vector<Anope::string> &p
if (params.size() < 2)
return true;
- send_cmd(TS6SID, "TIME %s %s %ld", source.c_str(), params[1].c_str(), static_cast<long>(Anope::CurTime));
+ send_cmd(Config->Numeric, "TIME %s %s %ld", source.c_str(), params[1].c_str(), static_cast<long>(Anope::CurTime));
/* We handled it, don't pass it on to the core..
* The core doesn't understand our syntax anyways.. ~ Viper */
@@ -573,7 +571,7 @@ bool event_rsquit(const Anope::string &source, const std::vector<Anope::string>
/* On InspIRCd we must send a SQUIT when we recieve RSQUIT for a server we have juped */
Server *s = Server::Find(params[0]);
if (s && s->HasFlag(SERVER_JUPED))
- send_cmd(TS6SID, "SQUIT %s :%s", s->GetSID().c_str(), params.size() > 1 ? params[1].c_str() : "");
+ send_cmd(Config->Numeric, "SQUIT %s :%s", s->GetSID().c_str(), params.size() > 1 ? params[1].c_str() : "");
do_squit(source, params[0]);
@@ -1210,7 +1208,7 @@ class ProtoInspIRCd : public Module
this->SetType(PROTOCOL);
if (!Config->Numeric.empty())
- TS6SID = Config->Numeric;
+ Config->Numeric = Config->Numeric;
pmodule_ircd_var(myIrcd);
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 848590b2d..76fb0f1ff 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -18,7 +18,6 @@
IRCDVar myIrcd[] = {
{"InspIRCd 2.0", /* ircd name */
"+I", /* Modes used by pseudoclients */
- 5, /* Chan Max Symbols */
1, /* SVSNICK */
1, /* Vhost */
0, /* Supports SNlines */
@@ -28,7 +27,6 @@ IRCDVar myIrcd[] = {
0, /* Chan SQlines */
0, /* Quit on Kill */
0, /* SVSMODE unban */
- 1, /* Reverse */
1, /* vidents */
1, /* svshold */
0, /* time stamp on mode */
@@ -62,7 +60,7 @@ void inspircd_cmd_chghost(const Anope::string &nick, const Anope::string &vhost)
return;
}
- send_cmd(HostServ ? HostServ->GetUID() : TS6SID, "CHGHOST %s %s", nick.c_str(), vhost.c_str());
+ send_cmd(HostServ ? HostServ->GetUID() : Config->Numeric, "CHGHOST %s %s", nick.c_str(), vhost.c_str());
}
bool event_idle(const Anope::string &source, const std::vector<Anope::string> &params)
@@ -85,7 +83,7 @@ class InspIRCdProto : public IRCDProto
{
void SendAkillDel(const XLine *x)
{
- send_cmd(OperServ ? OperServ->GetUID() : TS6SID, "GLINE %s", x->Mask.c_str());
+ send_cmd(OperServ ? OperServ->GetUID() : Config->Numeric, "GLINE %s", x->Mask.c_str());
}
void SendTopic(BotInfo *whosets, Channel *c)
@@ -110,12 +108,12 @@ class InspIRCdProto : public IRCDProto
time_t timeleft = x->Expires - Anope::CurTime;
if (timeleft > 172800 || !x->Expires)
timeleft = 172800;
- send_cmd(OperServ ? OperServ->GetUID() : TS6SID, "ADDLINE G %s@%s %s %ld %ld :%s", x->GetUser().c_str(), x->GetHost().c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), static_cast<long>(timeleft), x->Reason.c_str());
+ send_cmd(OperServ ? OperServ->GetUID() : Config->Numeric, "ADDLINE G %s@%s %s %ld %ld :%s", x->GetUser().c_str(), x->GetHost().c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), static_cast<long>(timeleft), x->Reason.c_str());
}
void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf)
{
- send_cmd(source ? source->GetUID() : TS6SID, "KILL %s :%s", user->GetUID().c_str(), buf.c_str());
+ send_cmd(source ? source->GetUID() : Config->Numeric, "KILL %s :%s", user->GetUID().c_str(), buf.c_str());
}
void SendSVSMode(const User *u, int ac, const char **av)
@@ -125,24 +123,24 @@ class InspIRCdProto : public IRCDProto
void SendNumericInternal(const Anope::string &source, int numeric, const Anope::string &dest, const Anope::string &buf)
{
- send_cmd(TS6SID, "PUSH %s ::%s %03d %s %s", dest.c_str(), source.c_str(), numeric, dest.c_str(), buf.c_str());
+ send_cmd(Config->Numeric, "PUSH %s ::%s %03d %s %s", dest.c_str(), source.c_str(), numeric, dest.c_str(), buf.c_str());
}
void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf)
{
- send_cmd(source ? source->GetUID() : TS6SID, "FMODE %s %u %s", dest->name.c_str(), static_cast<unsigned>(dest->creation_time), buf.c_str());
+ send_cmd(source ? source->GetUID() : Config->Numeric, "FMODE %s %u %s", dest->name.c_str(), static_cast<unsigned>(dest->creation_time), buf.c_str());
}
void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf)
{
if (buf.empty())
return;
- send_cmd(bi ? bi->GetUID() : TS6SID, "MODE %s %s", u->GetUID().c_str(), buf.c_str());
+ send_cmd(bi ? bi->GetUID() : Config->Numeric, "MODE %s %s", u->GetUID().c_str(), buf.c_str());
}
void SendClientIntroduction(const User *u, const Anope::string &modes)
{
- send_cmd(TS6SID, "UID %s %ld %s %s %s %s 0.0.0.0 %ld %s :%s", u->GetUID().c_str(), static_cast<long>(u->timestamp), u->nick.c_str(), u->host.c_str(), u->host.c_str(), u->GetIdent().c_str(), static_cast<long>(u->my_signon), modes.c_str(), u->realname.c_str());
+ send_cmd(Config->Numeric, "UID %s %ld %s %s %s %s 0.0.0.0 %ld %s :%s", u->GetUID().c_str(), static_cast<long>(u->timestamp), u->nick.c_str(), u->host.c_str(), u->host.c_str(), u->GetIdent().c_str(), static_cast<long>(u->my_signon), modes.c_str(), u->realname.c_str());
}
void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf)
@@ -155,7 +153,7 @@ class InspIRCdProto : public IRCDProto
void SendNoticeChanopsInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf)
{
- send_cmd(TS6SID, "NOTICE @%s :%s", dest->name.c_str(), buf.c_str());
+ send_cmd(Config->Numeric, "NOTICE @%s :%s", dest->name.c_str(), buf.c_str());
}
/* SERVER services-dev.chatspike.net password 0 :Description here */
@@ -167,30 +165,30 @@ class InspIRCdProto : public IRCDProto
/* JOIN */
void SendJoin(const BotInfo *user, const Anope::string &channel, time_t chantime)
{
- send_cmd(TS6SID, "FJOIN %s %ld + :,%s", channel.c_str(), static_cast<long>(chantime), user->GetUID().c_str());
+ send_cmd(Config->Numeric, "FJOIN %s %ld + :,%s", channel.c_str(), static_cast<long>(chantime), user->GetUID().c_str());
}
void SendJoin(BotInfo *user, const ChannelContainer *cc)
{
- send_cmd(TS6SID, "FJOIN %s %ld +%s :%s,%s", cc->chan->name.c_str(), static_cast<long>(cc->chan->creation_time), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildCharPrefixList().c_str(), user->GetUID().c_str());
+ send_cmd(Config->Numeric, "FJOIN %s %ld +%s :%s,%s", cc->chan->name.c_str(), static_cast<long>(cc->chan->creation_time), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildCharPrefixList().c_str(), user->GetUID().c_str());
}
/* UNSQLINE */
void SendSQLineDel(const XLine *x)
{
- send_cmd(TS6SID, "DELLINE Q %s", x->Mask.c_str());
+ send_cmd(Config->Numeric, "DELLINE Q %s", x->Mask.c_str());
}
/* SQLINE */
void SendSQLine(const XLine *x)
{
- send_cmd(TS6SID, "ADDLINE Q %s %s %ld 0 :%s", x->Mask.c_str(), Config->s_OperServ.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
+ send_cmd(Config->Numeric, "ADDLINE Q %s %s %ld 0 :%s", x->Mask.c_str(), Config->s_OperServ.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
}
/* SQUIT */
void SendSquit(const Anope::string &servname, const Anope::string &message)
{
- send_cmd(TS6SID, "SQUIT %s :%s", servname.c_str(), message.c_str());
+ send_cmd(Config->Numeric, "SQUIT %s :%s", servname.c_str(), message.c_str());
}
/* Functions that use serval cmd functions */
@@ -210,8 +208,8 @@ class InspIRCdProto : public IRCDProto
send_cmd("", "CAPAB END");
inspircd_cmd_pass(uplink_server->password);
SendServer(Me);
- send_cmd(TS6SID, "BURST");
- send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config->ServerName.c_str(), ircd->name, Config->EncModuleList.begin()->c_str(), Anope::Build().c_str());
+ send_cmd(Config->Numeric, "BURST");
+ send_cmd(Config->Numeric, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config->ServerName.c_str(), ircd->name, Config->EncModuleList.begin()->c_str(), Anope::Build().c_str());
}
/* CHGIDENT */
@@ -220,7 +218,7 @@ class InspIRCdProto : public IRCDProto
if (!has_chgidentmod)
ircdproto->SendGlobops(OperServ, "CHGIDENT not loaded!");
else
- send_cmd(HostServ ? HostServ->GetUID() : TS6SID, "CHGIDENT %s %s", nick.c_str(), vIdent.c_str());
+ send_cmd(HostServ ? HostServ->GetUID() : Config->Numeric, "CHGIDENT %s %s", nick.c_str(), vIdent.c_str());
}
/* SVSHOLD - set */
@@ -238,13 +236,13 @@ class InspIRCdProto : public IRCDProto
/* UNSZLINE */
void SendSZLineDel(const XLine *x)
{
- send_cmd(TS6SID, "DELLINE Z %s", x->Mask.c_str());
+ send_cmd(Config->Numeric, "DELLINE Z %s", x->Mask.c_str());
}
/* SZLINE */
void SendSZLine(const XLine *x)
{
- send_cmd(TS6SID, "ADDLINE Z %s %s %ld 0 :%s", x->Mask.c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
+ send_cmd(Config->Numeric, "ADDLINE Z %s %s %ld 0 :%s", x->Mask.c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
}
void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string &)
@@ -265,32 +263,32 @@ class InspIRCdProto : public IRCDProto
{
User *u = finduser(who);
- send_cmd(TS6SID, "METADATA %s swhois :%s", u->GetUID().c_str(), mask.c_str());
+ send_cmd(Config->Numeric, "METADATA %s swhois :%s", u->GetUID().c_str(), mask.c_str());
}
void SendBOB()
{
- send_cmd(TS6SID, "BURST %ld", static_cast<long>(Anope::CurTime));
+ send_cmd(Config->Numeric, "BURST %ld", static_cast<long>(Anope::CurTime));
}
void SendEOB()
{
- send_cmd(TS6SID, "ENDBURST");
+ send_cmd(Config->Numeric, "ENDBURST");
}
void SendGlobopsInternal(BotInfo *source, const Anope::string &buf)
{
- send_cmd(source ? source->GetUID() : TS6SID, "SNONOTICE g :%s", buf.c_str());
+ send_cmd(source ? source->GetUID() : Config->Numeric, "SNONOTICE g :%s", buf.c_str());
}
void SendAccountLogin(const User *u, const NickCore *account)
{
- send_cmd(TS6SID, "METADATA %s accountname :%s", u->GetUID().c_str(), account->display.c_str());
+ send_cmd(Config->Numeric, "METADATA %s accountname :%s", u->GetUID().c_str(), account->display.c_str());
}
void SendAccountLogout(const User *u, const NickCore *account)
{
- send_cmd(TS6SID, "METADATA %s accountname :", u->GetUID().c_str());
+ send_cmd(Config->Numeric, "METADATA %s accountname :", u->GetUID().c_str());
}
bool IsNickValid(const Anope::string &nick)
@@ -524,7 +522,7 @@ bool event_time(const Anope::string &source, const std::vector<Anope::string> &p
if (params.size() < 2)
return true;
- send_cmd(TS6SID, "TIME %s %s %ld", source.c_str(), params[1].c_str(), static_cast<long>(Anope::CurTime));
+ send_cmd(Config->Numeric, "TIME %s %s %ld", source.c_str(), params[1].c_str(), static_cast<long>(Anope::CurTime));
/* We handled it, don't pass it on to the core..
* The core doesn't understand our syntax anyways.. ~ Viper */
@@ -570,7 +568,7 @@ bool event_rsquit(const Anope::string &source, const std::vector<Anope::string>
/* On InspIRCd we must send a SQUIT when we recieve RSQUIT for a server we have juped */
Server *s = Server::Find(params[0]);
if (s && s->HasFlag(SERVER_JUPED))
- send_cmd(TS6SID, "SQUIT %s :%s", s->GetSID().c_str(), params.size() > 1 ? params[1].c_str() : "");
+ send_cmd(Config->Numeric, "SQUIT %s :%s", s->GetSID().c_str(), params.size() > 1 ? params[1].c_str() : "");
do_squit(source, params[0]);
@@ -1188,7 +1186,7 @@ class ProtoInspIRCd : public Module
this->SetType(PROTOCOL);
if (!Config->Numeric.empty())
- TS6SID = Config->Numeric;
+ Config->Numeric = Config->Numeric;
pmodule_ircd_var(myIrcd);
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
new file mode 100644
index 000000000..0f37963c5
--- /dev/null
+++ b/modules/protocol/plexus.cpp
@@ -0,0 +1,717 @@
+/* Plexus 3+ IRCD functions
+ *
+ * (C) 2003-2010 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for furhter details.
+ *
+ * Based on the original code of Epona by Lara.
+ * Based on the original code of Services by Andy Church.
+ */
+
+#include "services.h"
+#include "modules.h"
+
+static Anope::string TS6UPLINK;
+
+IRCDVar myIrcd[] = {
+ {"hybrid-7.2.3+plexus-3.0.1", /* ircd name */
+ "+oi", /* Modes used by pseudoclients */
+ 1, /* SVSNICK */
+ 1, /* Vhost */
+ 1, /* Supports SNlines */
+ 1, /* Supports SQlines */
+ 0, /* Supports SZlines */
+ 0, /* Join 2 Message */
+ 1, /* Chan SQlines */
+ 0, /* Quit on Kill */
+ 0, /* SVSMODE unban */
+ 0, /* vidents */
+ 1, /* svshold */
+ 1, /* time stamp on mode */
+ 1, /* UMODE */
+ 0, /* O:LINE */
+ 0, /* No Knock requires +i */
+ 0, /* Can remove User Channel Modes with SVSMODE */
+ 0, /* Sglines are not enforced until user reconnects */
+ 1, /* ts6 */
+ "$$", /* TLD Prefix for Global */
+ 4, /* Max number of modes we can send per line */
+ }
+ ,
+ {NULL}
+};
+
+/*
+ * SVINFO
+ * parv[0] = sender prefix
+ * parv[1] = TS_CURRENT for the server
+ * parv[2] = TS_MIN for the server
+ * parv[3] = server is standalone or connected to non-TS only
+ * parv[4] = server's idea of UTC time
+ */
+static inline void plexus_cmd_svinfo()
+{
+ send_cmd("", "SVINFO 6 5 0 :%ld", static_cast<long>(Anope::CurTime));
+}
+
+/* CAPAB
+ * QS - Can handle quit storm removal
+ * EX - Can do channel +e exemptions
+ * CHW - Can do channel wall @#
+ * LL - Can do lazy links
+ * IE - Can do invite exceptions
+ * EOB - Can do EOB message
+ * KLN - Can do KLINE message
+ * GLN - Can do GLINE message
+ * HUB - This server is a HUB
+ * AOPS - Can do anon ops (+a)
+ * UID - Can do UIDs
+ * ZIP - Can do ZIPlinks
+ * ENC - Can do ENCrypted links
+ * KNOCK - Supports KNOCK
+ * TBURST - Supports TBURST
+ * PARA - Supports invite broadcasting for +p
+ * ENCAP - Supports encapsulization of protocol messages
+ * SVS - Supports services protocol extensions
+ */
+static inline void plexus_cmd_capab()
+{
+ send_cmd("", "CAPAB :QS EX CHW IE EOB KLN UNKLN GLN HUB KNOCK TBURST PARA ENCAP SVS");
+}
+
+/* PASS */
+void plexus_cmd_pass(const Anope::string &pass)
+{
+ send_cmd("", "PASS %s TS 6 :%s", pass.c_str(), Config->Numeric.c_str());
+}
+
+class RatboxProto : public IRCDProto
+{
+ void SendGlobopsInternal(const BotInfo *source, const Anope::string &buf)
+ {
+ if (source)
+ send_cmd(source->GetUID(), "OPERWALL :%s", buf.c_str());
+ else
+ send_cmd(Config->Numeric, "OPERWALL :%s", buf.c_str());
+ }
+
+ void SendSQLine(const XLine *x)
+ {
+ send_cmd(Config->Numeric, "RESV * %s :%s", x->Mask.c_str(), x->Reason.c_str());
+ }
+
+ void SendSGLineDel(const XLine *x)
+ {
+ BotInfo *bi = OperServ;
+ send_cmd(bi ? bi->GetUID() : Config->s_OperServ, "UNXLINE * %s", x->Mask.c_str());
+ }
+
+ void SendSGLine(const XLine *x)
+ {
+ BotInfo *bi = OperServ;
+ send_cmd(bi ? bi->GetUID() : Config->s_OperServ, "XLINE * %s 0 :%s", x->Mask.c_str(), x->Reason.c_str());
+ }
+
+ void SendAkillDel(const XLine *x)
+ {
+ BotInfo *bi = OperServ;
+ send_cmd(bi ? bi->GetUID() : Config->s_OperServ, "UNKLINE * %s %s", x->GetUser().c_str(), x->GetHost().c_str());
+ }
+
+ void SendSQLineDel(const XLine *x)
+ {
+ send_cmd(Config->Numeric, "UNRESV * %s", x->Mask.c_str());
+ }
+
+ void SendJoin(const BotInfo *user, const Anope::string &channel, time_t chantime)
+ {
+ send_cmd(Config->Numeric, "SJOIN %ld %s + :%s", static_cast<long>(chantime), channel.c_str(), user->GetUID().c_str());
+ }
+
+ void SendJoin(const BotInfo *user, const ChannelContainer *cc)
+ {
+ send_cmd(Config->Numeric, "SJOIN %ld %s +%s :%s%s", static_cast<long>(cc->chan->creation_time), cc->chan->name.c_str(), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildModePrefixList().c_str(), user->GetUID().c_str());
+ }
+
+ void SendAkill(const XLine *x)
+ {
+ BotInfo *bi = OperServ;
+ send_cmd(bi ? bi->GetUID() : Config->s_OperServ, "KLINE * %ld %s %s :%s", static_cast<long>(x->Expires - Anope::CurTime), x->GetUser().c_str(), x->GetHost().c_str(), x->Reason.c_str());
+ }
+
+ void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf)
+ {
+ send_cmd(source ? source->GetUID() : Config->Numeric, "KILL %s :%s", user->GetUID().c_str(), buf.c_str());
+ }
+
+ void SendSVSMode(const User *u, int ac, const char **av)
+ {
+ this->SendModeInternal(NULL, u, merge_args(ac, av));
+ }
+
+ void SendServer(const Server *server)
+ {
+ send_cmd("", "SERVER %s %d :%s", server->GetName().c_str(), server->GetHops(), server->GetDescription().c_str());
+ }
+
+ void SendForceNickChange(const User *u, const Anope::string &newnick, time_t when)
+ {
+ send_cmd(Config->Numeric, "ENCAP %s SVSNICK %s %ld %s %ld", u->server->GetName().c_str(), u->nick, static_cast<long>(u->timestamp), newnick, static_cast<long>(when));
+ }
+
+ void SendConnect()
+ {
+ plexus_cmd_pass(uplink_server->password);
+ plexus_cmd_capab();
+ /* Make myself known to myself in the serverlist */
+ SendServer(Me);
+ plexus_cmd_svinfo();
+ }
+
+ void SendClientIntroduction(const User *u, const Anope::string &modes)
+ {
+ EnforceQlinedNick(u->nick, "");
+ send_cmd(Config->Numeric, "UID %s 1 %ld %s %s %s 255.255.255.255 %s 0 %s :%s", u->nick.c_str(), static_cast<long>(u->timestamp), modes.c_str(), u->GetIdent().c_str(), u->host.c_str(), u->GetUID().c_str(), u->host.c_str(), u->realname.c_str());
+ }
+
+ void SendPartInternal(const BotInfo *bi, const Channel *chan, const Anope::string &buf)
+ {
+ if (!buf.empty())
+ send_cmd(bi->GetUID(), "PART %s :%s", chan->name.c_str(), buf.c_str());
+ else
+ send_cmd(bi->GetUID(), "PART %s", chan->name.c_str());
+ }
+
+ void SendNumericInternal(const Anope::string &, int numeric, const Anope::string &dest, const Anope::string &buf)
+ {
+ // This might need to be set in the call to SendNumeric instead of here, will review later -- CyberBotX
+ send_cmd(Config->Numeric, "%03d %s %s", numeric, dest.c_str(), bu