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(), buf.c_str());
+ }
+
+ void SendModeInternal(const BotInfo *bi, const Channel *dest, const Anope::string &buf)
+ {
+ if (bi)
+ send_cmd(bi->GetUID(), "MODE %s %s", dest->name.c_str(), buf.c_str());
+ else
+ send_cmd(Config->Numeric, "MODE %s %s", dest->name.c_str(), buf.c_str());
+ }
+
+ void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf)
+ {
+ send_cmd(bi ? bi->GetUID() : Config->Numeric, "ENCAP * SVSMODE %s %ld %s", u->nick.c_str(), static_cast<long>(u->timestamp), buf.c_str());
+ }
+
+ void SendKickInternal(const BotInfo *bi, const Channel *chan, const User *user, const Anope::string &buf)
+ {
+ if (!buf.empty())
+ send_cmd(bi->GetUID(), "KICK %s %s :%s", chan->name.c_str(), user->GetUID().c_str(), buf.c_str());
+ else
+ send_cmd(bi->GetUID(), "KICK %s %s", chan->name.c_str(), user->GetUID().c_str());
+ }
+
+ void SendNoticeChanopsInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf)
+ {
+ send_cmd("", "NOTICE @%s :%s", dest->name.c_str(), buf.c_str());
+ }
+
+ /* INVITE */
+ void SendInvite(BotInfo *source, const Anope::string &chan, const Anope::string &nick)
+ {
+ User *u = finduser(nick);
+ send_cmd(source->GetUID(), "INVITE %s %s", u ? u->GetUID().c_str() : nick.c_str(), chan.c_str());
+ }
+
+ void SendAccountLogin(const User *u, const NickCore *account)
+ {
+ send_cmd(Config->Numeric, "ENCAP * SU %s %s", u->GetUID().c_str(), account->display.c_str());
+ }
+
+ void SendAccountLogout(const User *u, const NickCore *account)
+ {
+ send_cmd(Config->Numeric, "ENCAP * SU %s", u->GetUID().c_str());
+ }
+
+ bool IsNickValid(const Anope::string &nick)
+ {
+ /* TS6 Save extension -Certus */
+ if (isdigit(nick[0]))
+ return false;
+
+ return true;
+ }
+
+ void SendTopic(BotInfo *bi, Channel *c)
+ {
+ send_cmd(bi->GetUID(), "ENCAP * TOPIC %s %s %lu :%s", c->name.c_str(), c->topic_setter.c_str(), static_cast<unsigned long>(c->topic_time + 1), c->topic.c_str());
+ }
+
+ void SetAutoIdentificationToken(User *u)
+ {
+
+ if (!u->Account())
+ return;
+
+ Anope::string svidbuf = stringify(u->timestamp);
+
+ u->Account()->Shrink("authenticationtoken");
+ u->Account()->Extend("authenticationtoken", new ExtensibleItemRegular<Anope::string>(svidbuf));
+ }
+} ircd_proto;
+
+bool event_sjoin(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ Channel *c = findchan(params[1]);
+ time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : 0;
+ bool keep_their_modes = true;
+
+ if (!c)
+ {
+ c = new Channel(params[1], ts);
+ c->SetFlag(CH_SYNCING);
+ }
+ /* Our creation time is newer than what the server gave us */
+ else if (c->creation_time > ts)
+ {
+ c->creation_time = ts;
+ c->Reset();
+
+ /* Reset mlock */
+ check_modes(c);
+ }
+ /* Their TS is newer than ours, our modes > theirs, unset their modes if need be */
+ else if (ts > c->creation_time)
+ keep_their_modes = false;
+
+ /* If we need to keep their modes, and this SJOIN string contains modes */
+ if (keep_their_modes && params.size() >= 3)
+ {
+ Anope::string modes;
+ for (unsigned i = 2; i < params.size() - 1; ++i)
+ modes += " " + params[i];
+ if (!modes.empty())
+ modes.erase(modes.begin());
+ /* Set the modes internally */
+ c->SetModesInternal(NULL, modes);
+ }
+
+ spacesepstream sep(params[params.size() - 1]);
+ Anope::string buf;
+ while (sep.GetToken(buf))
+ {
+ std::list<ChannelMode *> Status;
+ char ch;
+
+ /* Get prefixes from the nick */
+ while ((ch = ModeManager::GetStatusChar(buf[0])))
+ {
+ buf.erase(buf.begin());
+ ChannelMode *cm = ModeManager::FindChannelModeByChar(ch);
+ if (!cm)
+ {
+ Log() << "Received unknown mode prefix " << buf[0] << " in SJOIN string";
+ continue;
+ }
+
+ if (keep_their_modes)
+ Status.push_back(cm);
+ }
+
+ User *u = finduser(buf);
+ if (!u)
+ {
+ Log(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << c->name;
+ continue;
+ }
+
+ EventReturn MOD_RESULT;
+ FOREACH_RESULT(I_OnPreJoinChannel, OnPreJoinChannel(u, c));
+
+ /* Add the user to the channel */
+ c->JoinUser(u);
+
+ /* Update their status internally on the channel
+ * This will enforce secureops etc on the user
+ */
+ for (std::list<ChannelMode *>::iterator it = Status.begin(), it_end = Status.end(); it != it_end; ++it)
+ c->SetModeInternal(*it, buf);
+
+ /* Now set whatever modes this user is allowed to have on the channel */
+ chan_set_correct_modes(u, c, 1);
+
+ /* Check to see if modules want the user to join, if they do
+ * check to see if they are allowed to join (CheckKick will kick/ban them)
+ * Don't trigger OnJoinChannel event then as the user will be destroyed
+ */
+ if (MOD_RESULT != EVENT_STOP && c->ci && c->ci->CheckKick(u))
+ continue;
+
+ FOREACH_MOD(I_OnJoinChannel, OnJoinChannel(u, c));
+ }
+
+ /* Channel is done syncing */
+ if (c->HasFlag(CH_SYNCING))
+ {
+ /* Unset the syncing flag */
+ c->UnsetFlag(CH_SYNCING);
+ c->Sync();
+ }
+
+ return true;
+}
+
+/*
+ TS6
+ params[0] = nick
+ params[1] = hop
+ params[2] = ts
+ params[3] = modes
+ params[4] = user
+ params[5] = host
+ params[6] = IP
+ params[7] = UID
+ params[8] = services stamp
+ params[9] = realhost
+ params[10] = info
+
+*/
+bool event_nick(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() == 11)
+ {
+ /* Source is always the server */
+ User *user = do_nick("", params[0], params[4], params[9], source, params[10], Anope::string(params[2]).is_pos_number_only() ? convertTo<time_t>(params[2]) : 0, params[6], params[5], params[7], params[3]);
+ if (user)
+ {
+ NickAlias *na = findnick(user->nick);
+ Anope::string svidbuf;
+ if (na && na->nc->GetExtRegular("authenticationtoken", svidbuf) && svidbuf == params[8])
+ {
+ user->Login(na->nc);
+ }
+ else
+ validate_user(user);
+ }
+ }
+ else if (params.size() == 2)
+ do_nick(source, params[0], "", "", "", "", Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0, "", "", "", "");
+ return true;
+}
+
+bool event_topic(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ Channel *c = findchan(params[0]);
+ if (!c)
+ {
+ Log() << "TOPIC for nonexistant channel " << params[0];
+ return true;
+ }
+
+ if (params.size() == 4)
+ {
+ c->ChangeTopicInternal(params[1], params[3], Anope::string(params[2]).is_pos_number_only() ? convertTo<time_t>(params[2]) : Anope::CurTime);
+ }
+ else
+ {
+ c->ChangeTopicInternal(source, (params.size() > 1 ? params[1] : ""));
+ }
+ return true;
+}
+
+bool event_tburst(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() != 4)
+ return true;
+
+ Anope::string setter = myStrGetToken(params[2], '!', 0);
+ time_t topic_time = Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : Anope::CurTime;
+ Channel *c = findchan(params[0]);
+
+ if (!c)
+ {
+ Log() << "TOPIC " << params[3] << " for nonexistent channel " << params[0];
+ return true;
+ }
+
+ c->ChangeTopicInternal(setter, params.size() > 3 ? params[3] : "", topic_time);
+
+ return true;
+}
+
+bool event_436(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() < 1)
+ return true;
+
+ m_nickcoll(params[0]);
+ return true;
+}
+
+bool event_ping(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() < 1)
+ return true;
+ ircdproto->SendPong(params.size() > 1 ? params[1] : Config->ServerName, params[0]);
+ return true;
+}
+
+bool event_away(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ User *u = finduser(source);
+ m_away(u ? u->nick : source, !params.empty() ? params[0] : "");
+ return true;
+}
+
+bool event_kill(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() > 1)
+ m_kill(params[0], params[1]);
+ return true;
+}
+
+bool event_kick(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() > 2)
+ do_kick(source, params[0], params[1], params[2]);
+ return true;
+}
+
+bool event_join(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() != 1)
+ event_sjoin(source, params);
+ else
+ do_join(source, params[0], params[1]);
+ return true;
+}
+
+bool event_motd(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (source.empty())
+ return true;
+
+ m_motd(source);
+ return true;
+}
+
+bool event_privmsg(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() > 1)
+ m_privmsg(source, params[0], params[1]);
+ return true;
+}
+
+bool event_part(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (!params.empty())
+ do_part(source, params[0], params.size() > 1 ? params[1] : "");
+
+ return true;
+}
+
+bool event_whois(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (!source.empty() && !params.empty())
+ {
+ m_whois(source, params[0]);
+ }
+ return true;
+}
+
+/* EVENT: SERVER */
+bool event_server(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params[1].equals_cs("1"))
+ do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[2], TS6UPLINK);
+ else
+ do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[2], "");
+ return true;
+}
+
+bool event_sid(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ /* :42X SID trystan.nomadirc.net 2 43X :ircd-plexus test server */
+ Server *s = Server::Find(source);
+
+ do_server(s->GetName(), params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[3], params[2]);
+ return true;
+}
+
+bool event_squit(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (!params.empty())
+ do_squit(source, params[0]);
+ return true;
+}
+
+bool event_quit(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ User *u = finduser(source);
+
+ do_quit(u ? u->nick : source, !params.empty() ? params[0] : "");
+ return true;
+}
+
+bool event_mode(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params.size() < 2)
+ return true;
+
+ if (params[0][0] == '#' || params[0][0] == '&')
+ do_cmode(source, params[0], params[2], params[1]);
+ else
+ {
+ User *u = finduser(source);
+ User *u2 = finduser(params[0]);
+ if (!u || !u2)
+ return true;
+ do_umode(u->nick, u2->nick, params[1]);
+ }
+ return true;
+}
+
+bool event_tmode(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (params[1][0] == '#')
+ {
+ Anope::string modes = params[2];
+ for (unsigned i = 3; i < params.size(); ++i)
+ modes += " " + params[i];
+ do_cmode(source, params[1], modes, params[0]);
+ }
+ return true;
+}
+
+/* Event: PROTOCTL */
+bool event_capab(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ CapabParse(params);
+ return true;
+}
+
+bool event_pass(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ TS6UPLINK = params[3];
+ return true;
+}
+
+bool event_bmask(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ /* :42X BMASK 1106409026 #ircops b :*!*@*.aol.com */
+ /* 0 1 2 3 */
+ Channel *c = findchan(params[1]);
+
+ if (c)
+ {
+ ChannelMode *ban = ModeManager::FindChannelModeByName(CMODE_BAN),
+ *except = ModeManager::FindChannelModeByName(CMODE_EXCEPT),
+ *invex = ModeManager::FindChannelModeByName(CMODE_INVITEOVERRIDE);
+ Anope::string bans = params[3];
+ int count = myNumToken(bans, ' '), i;
+ for (i = 0; i <= count - 1; ++i)
+ {
+ Anope::string b = myStrGetToken(bans, ' ', i);
+ if (ban && params[2].equals_cs("b"))
+ c->SetModeInternal(ban, b);
+ else if (except && params[2].equals_cs("e"))
+ c->SetModeInternal(except, b);
+ if (invex && params[2].equals_cs("I"))
+ c->SetModeInternal(invex, b);
+ }
+ }
+ return true;
+}
+
+bool event_error(const Anope::string &source, const std::vector<Anope::string> &params)
+{
+ if (!params.empty())
+ Log(LOG_DEBUG) << params[0];
+ return true;
+}
+
+static void AddModes()
+{
+ /* Add user modes */
+ ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, "UMODE_ADMIN", 'a'));
+ ModeManager::AddUserMode(new UserMode(UMODE_INVIS, "UMODE_INVIS", 'i'));
+ ModeManager::AddUserMode(new UserMode(UMODE_OPER, "UMODE_OPER", 'o'));
+ ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, "UMODE_SNOMASK", 's'));
+ ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", 'w'));
+ ModeManager::AddUserMode(new UserMode(UMODE_DEAF, "UMODE_DEAF", 'D'));
+ ModeManager::AddUserMode(new UserMode(UMODE_SOFTCALLERID, "UMODE_SOFTCALLERID", 'G'));
+ ModeManager::AddUserMode(new UserMode(UMODE_NETADMIN, "UMODE_NETADMIN", 'M'));
+ ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, "UMODE_REGPRIV", 'R'));
+ ModeManager::AddUserMode(new UserMode(UMODE_SSL, "UMODE_SSL", 'S'));
+ ModeManager::AddUserMode(new UserMode(UMODE_WEBIRC, "UMODE_WEBIRC", 'W'));
+ ModeManager::AddUserMode(new UserMode(UMODE_CALLERID, "UMODE_CALLERID", 'g'));
+ ModeManager::AddUserMode(new UserMode(UMODE_PRIV, "UMODE_PRIV", 'p'));
+ ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", 'r'));
+ ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, "UMODE_CLOAK", 'x'));
+
+ /* b/e/I */
+ ModeManager::AddChannelMode(new ChannelModeBan('b'));
+ ModeManager::AddChannelMode(new ChannelModeExcept('e'));
+ ModeManager::AddChannelMode(new ChannelModeInvex('I'));
+
+ /* l/k */
+ ModeManager::AddChannelMode(new ChannelModeKey('k'));
+ ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", 'l'));
+
+ /* v/h/o/a/q */
+ ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", 'v', '+'));
+ ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, "CMODE_HALFOP", 'h', '%'));
+ ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, "CMODE_OP", 'o', '@'));
+ ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, "CMODE_PROTECT", 'a', '&'));
+ ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", 'q', '~'));
+
+ /* Add channel modes */
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_BANDWIDTH, "CMODE_BANDWIDTH", 'B'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, "CMODE_REGMODERATED", 'M'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_NONOTICE, "CMODE_NONOTICE", 'N'));
+ ModeManager::AddChannelMode(new ChannelModeOper('O'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", 'R'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, "CMODE_SSL", 'S'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", 'c'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, "CMODE_INVITE", 'i'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", 'm'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", 'n'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", 'p'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, "CMODE_SECRET", 's'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", 't'));
+ ModeManager::AddChannelMode(new ChannelMode(CMODE_PERM, "CMODE_PERM", 'z'));
+}
+
+class ProtoPlexus : public Module
+{
+ Message message_436, message_away, message_join, message_kick, message_kill, message_mode, message_tmode, message_motd,
+ message_nick, message_bmask, message_uid, message_part, message_pass, message_ping, message_privmsg, message_quit,
+ message_server, message_squit, message_topic, message_tb, message_whois, message_capab, message_sjoin, message_error,
+ message_sid;
+ public:
+ ProtoPlexus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator),
+ message_436("436", event_436), message_away("AWAY", event_away), message_join("JOIN", event_join),
+ message_kick("KICK", event_kick), message_kill("KILL", event_kill), message_mode("MODE", event_mode),
+ message_tmode("TMODE", event_tmode), message_motd("MOTD", event_motd), message_nick("NICK", event_nick),
+ message_bmask("BMASK", event_bmask), message_uid("UID", event_nick), message_part("PART", event_part),
+ message_pass("PASS", event_pass), message_ping("PING", event_ping), message_privmsg("PRIVMSG", event_privmsg),
+ message_quit("QUIT", event_quit), message_server("SERVER", event_server), message_squit("SQUIT", event_squit),
+ message_topic("TOPIC", event_topic), message_tb("TB", event_tburst), message_whois("WHOIS", event_whois),
+ message_capab("CAPAB", event_capab), message_sjoin("SJOIN", event_sjoin), message_error("ERROR", event_error),
+ message_sid("SID", event_sid)
+ {
+ this->SetAuthor("Anope");
+ this->SetType(PROTOCOL);
+
+ pmodule_ircd_var(myIrcd);
+
+ CapabType c[] = { CAPAB_ZIP, CAPAB_TS5, CAPAB_QS, CAPAB_UID, CAPAB_KNOCK };
+ for (unsigned i = 0; i < 5; ++i)
+ Capab.SetFlag(c[i]);
+
+ AddModes();
+
+ pmodule_ircd_proto(&ircd_proto);
+ }
+};
+
+MODULE_INIT(ProtoPlexus)
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index 0e034aa00..9190d75cd 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -12,12 +12,11 @@
#include "services.h"
#include "modules.h"
-static Anope::string TS6UPLINK; // XXX is this needed?
+static Anope::string TS6UPLINK;
IRCDVar myIrcd[] = {
{"Ratbox 2.0+", /* ircd name */
"+oi", /* Modes used by pseudoclients */
- 2, /* Chan Max Symbols */
0, /* SVSNICK */
0, /* Vhost */
1, /* Supports SNlines */
@@ -27,7 +26,6 @@ IRCDVar myIrcd[] = {
1, /* Chan SQlines */
0, /* Quit on Kill */
0, /* SVSMODE unban */
- 0, /* Reverse */
0, /* vidents */
0, /* svshold */
0, /* time stamp on mode */
@@ -88,7 +86,7 @@ void ratbox_cmd_capab()
/* PASS */
void ratbox_cmd_pass(const Anope::string &pass)
{
- send_cmd("", "PASS %s TS 6 :%s", pass.c_str(), TS6SID.c_str());
+ send_cmd("", "PASS %s TS 6 :%s", pass.c_str(), Config->Numeric.c_str());
}
class RatboxProto : public IRCDProto
@@ -98,12 +96,12 @@ class RatboxProto : public IRCDProto
if (source)
send_cmd(source->GetUID(), "OPERWALL :%s", buf.c_str());
else
- send_cmd(TS6SID, "OPERWALL :%s", buf.c_str());
+ send_cmd(Config->Numeric, "OPERWALL :%s", buf.c_str());
}
void SendSQLine(const XLine *x)
{
- send_cmd(TS6SID, "RESV * %s :%s", x->Mask.c_str(), x->Reason.c_str());
+ send_cmd(Config->Numeric, "RESV * %s :%s", x->Mask.c_str(), x->Reason.c_str());
}
void SendSGLineDel(const XLine *x)
@@ -126,7 +124,7 @@ class RatboxProto : public IRCDProto
void SendSQLineDel(const XLine *x)
{
- send_cmd(TS6SID, "UNRESV * %s", x->Mask.c_str());
+ send_cmd(Config->Numeric, "UNRESV * %s", x->Mask.c_str());
}
void SendJoin(const BotInfo *user, const Anope::string &channel, time_t chantime)
@@ -147,7 +145,7 @@ class RatboxProto : public IRCDProto
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)
@@ -173,7 +171,7 @@ class RatboxProto : public IRCDProto
void SendClientIntroduction(const User *u, const Anope::string &modes)
{
EnforceQlinedNick(u->nick, "");
- send_cmd(TS6SID, "UID %s 1 %ld %s %s %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->realname.c_str());
+ send_cmd(Config->Numeric, "UID %s 1 %ld %s %s %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->realname.c_str());
}
void SendPartInternal(const BotInfo *bi, const Channel *chan, const Anope::string &buf)
@@ -187,7 +185,7 @@ class RatboxProto : public IRCDProto
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(TS6SID, "%03d %s %s", numeric, dest.c_str(), buf.c_str());
+ send_cmd(Config->Numeric, "%03d %s %s", numeric, dest.c_str(), buf.c_str());
}
void SendModeInternal(const BotInfo *bi, const Channel *dest, const Anope::string &buf)
@@ -195,14 +193,14 @@ class RatboxProto : public IRCDProto
if (bi)
send_cmd(bi->GetUID(), "MODE %s %s", dest->name.c_str(), buf.c_str());
else
- send_cmd(TS6SID, "MODE %s %s", dest->name.c_str(), buf.c_str());
+ send_cmd(Config->Numeric, "MODE %s %s", dest->name.c_str(), 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, "SVSMODE %s %s", u->nick.c_str(), buf.c_str());
+ send_cmd(bi ? bi->GetUID() : Config->Numeric, "SVSMODE %s %s", u->nick.c_str(), buf.c_str());
}
void SendKickInternal(const BotInfo *bi, const Channel *chan, const User *user, const Anope::string &buf)
@@ -227,12 +225,12 @@ class RatboxProto : public IRCDProto
void SendAccountLogin(const User *u, const NickCore *account)
{
- send_cmd(TS6SID, "ENCAP * SU %s %s", u->GetUID().c_str(), account->display.c_str());
+ send_cmd(Config->Numeric, "ENCAP * SU %s %s", u->GetUID().c_str(), account->display.c_str());
}
void SendAccountLogout(const User *u, const NickCore *account)
{
- send_cmd(TS6SID, "ENCAP * SU %s", u->GetUID().c_str());
+ send_cmd(Config->Numeric, "ENCAP * SU %s", u->GetUID().c_str());
}
bool IsNickValid(const Anope::string &nick)
@@ -250,7 +248,7 @@ class RatboxProto : public IRCDProto
if (needjoin)
{
ChannelStatus status;
- status .SetFlag(CMODE_OP);
+ status.SetFlag(CMODE_OP);
ChannelContainer cc(c);
cc.Status = &status;
ircdproto->SendJoin(bi, &cc);
@@ -701,9 +699,6 @@ class ProtoRatbox : public Module
this->SetAuthor("Anope");
this->SetType(PROTOCOL);
- if (!Config->Numeric.empty())
- TS6SID = Config->Numeric;
-
pmodule_ircd_var(myIrcd);
CapabType c[] = { CAPAB_ZIP, CAPAB_TS5, CAPAB_QS, CAPAB_UID, CAPAB_KNOCK, CAPAB_TSMODE };
diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp
index 70e03cf55..80d1ab08d 100644
--- a/modules/protocol/unreal32.cpp
+++ b/modules/protocol/unreal32.cpp
@@ -17,7 +17,6 @@
IRCDVar myIrcd[] = {
{"UnrealIRCd 3.2.x", /* ircd name */
"+Soiq", /* Modes used by pseudoclients */
- 5, /* Chan Max Symbols */
1, /* SVSNICK */
1, /* Vhost */
1, /* Supports SNlines */
@@ -27,7 +26,6 @@ IRCDVar myIrcd[] = {
0, /* Chan SQlines */
0, /* Quit on Kill */
1, /* SVSMODE unban */
- 1, /* Reverse */
1, /* vidents */
1, /* svshold */
1, /* time stamp on mode */
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 0e4449d21..545824681 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -173,9 +173,9 @@ void IRCDProto::SendQuit(const User *u, const char *fmt, ...)
void IRCDProto::SendPing(const Anope::string &servname, const Anope::string &who)
{
if (servname.empty())
- send_cmd(ircd->ts6 ? TS6SID : Config->ServerName, "PING %s", who.c_str());
+ send_cmd(ircd->ts6 ? Config->Numeric : Config->ServerName, "PING %s", who.c_str());
else
- send_cmd(ircd->ts6 ? TS6SID : Config->ServerName, "PING %s %s", servname.c_str(), who.c_str());
+ send_cmd(ircd->ts6 ? Config->Numeric : Config->ServerName, "PING %s %s", servname.c_str(), who.c_str());
}
/**
@@ -187,9 +187,9 @@ void IRCDProto::SendPing(const Anope::string &servname, const Anope::string &who
void IRCDProto::SendPong(const Anope::string &servname, const Anope::string &who)
{
if (servname.empty())
- send_cmd(ircd->ts6 ? TS6SID : Config->ServerName, "PONG %s", who.c_str());
+ send_cmd(ircd->ts6 ? Config->Numeric : Config->ServerName, "PONG %s", who.c_str());
else
- send_cmd(ircd->ts6 ? TS6SID : Config->ServerName, "PONG %s %s", servname.c_str(), who.c_str());
+ send_cmd(ircd->ts6 ? Config->Numeric : Config->ServerName, "PONG %s %s", servname.c_str(), who.c_str());
}
void IRCDProto::SendJoin(BotInfo *bi, const ChannelContainer *cc)
diff --git a/src/servers.cpp b/src/servers.cpp
index acd26b4d3..f7bef6ec7 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -12,8 +12,6 @@
#include "services.h"
#include "modules.h"
-Anope::string TS6SID;
-
/* Anope */
Server *Me = NULL;
@@ -422,7 +420,7 @@ static char ts6_new_uid[10];
static void ts6_uid_increment(unsigned slot)
{
- if (slot != TS6SID.length())
+ if (slot != Config->Numeric.length())
{
if (ts6_new_uid[slot] == 'Z')
ts6_new_uid[slot] = '0';
@@ -456,7 +454,7 @@ const char *ts6_uid_retrieve()
if (!ts6_uid_initted)
{
- snprintf(ts6_new_uid, 10, "%sAAAAAA", TS6SID.c_str());
+ snprintf(ts6_new_uid, 10, "%sAAAAAA", Config->Numeric.c_str());
ts6_uid_initted = true;
}
@@ -522,7 +520,7 @@ const char *ts6_sid_retrieve()
if (!ts6_sid_initted)
{
// Initialize ts6_new_sid with the services server SID
- snprintf(ts6_new_sid, 4, "%s", TS6SID.c_str());
+ snprintf(ts6_new_sid, 4, "%s", Config->Numeric.c_str());
ts6_sid_initted = true;
}
generated by cgit (git 2.34.1) at 2025-06-17 07:56:50 +0000