summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2012-10-30 15:50:39 -0400
committerAdam <Adam@anope.org>2012-10-30 15:50:39 -0400
commitb07928eea95dc2c12a2be8adfe804e2019881ee5 (patch)
tree6ae3ca2794f13d868c5931fc71ebbefa0313265c /modules
parent1ef748038083e845af040ddc0b52ac27d2fe6753 (diff)
Clean up ngircd proto mod slightly, and send sqlines before introducing clients
Diffstat (limited to 'modules')
-rw-r--r--modules/protocol/inspircd-ts6.h6
-rw-r--r--modules/protocol/ngircd.cpp11
2 files changed, 5 insertions, 12 deletions
diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h
index e60600b4b..e03f5fa1f 100644
--- a/modules/protocol/inspircd-ts6.h
+++ b/modules/protocol/inspircd-ts6.h
@@ -49,14 +49,12 @@ class InspIRCdTS6Proto : public IRCDProto
void SendAddLine(const Anope::string &type, const Anope::string &mask, time_t duration, const Anope::string &addedby, const Anope::string &reason)
{
- const BotInfo *bi = findbot(Config->OperServ);
- UplinkSocket::Message(bi) << "ADDLINE " << type << " " << mask << " " << addedby << " " << Anope::CurTime << " " << duration << " :" << reason;
+ UplinkSocket::Message(Me) << "ADDLINE " << type << " " << mask << " " << addedby << " " << Anope::CurTime << " " << duration << " :" << reason;
}
void SendDelLine(const Anope::string &type, const Anope::string &mask)
{
- const BotInfo *bi = findbot(Config->OperServ);
- UplinkSocket::Message(bi) << "DELLINE " << type << " " << mask;
+ UplinkSocket::Message(Me) << "DELLINE " << type << " " << mask;
}
protected:
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 5d88fcb75..442d2c8e5 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -45,8 +45,6 @@ class ngIRCdProto : public IRCDProto
void SendClientIntroduction(const User *u) anope_override
{
Anope::string modes = "+" + u->GetModes();
- XLine x(u->nick, "Reserved for services");
- ircdproto->SendSQLine(NULL, &x);
UplinkSocket::Message(Me) << "NICK " << u->nick << " 1 " << u->GetIdent() << " " << u->host << " 1 " << modes << " :" << u->realname;
}
@@ -106,9 +104,9 @@ class ngIRCdProto : public IRCDProto
UplinkSocket::Message(bi) << "KICK " << chan->name << " " << user->nick;
}
- void SendLogin(User *u) { } anope_override
+ void SendLogin(User *u) anope_override { }
- void SendLogout(User *u) { } anope_override
+ void SendLogout(User *u) anope_override { }
void SendModeInternal(const BotInfo *bi, const Channel *dest, const Anope::string &buf) anope_override
{
@@ -180,7 +178,7 @@ struct IRCDMessage005 : IRCDMessage
unsigned newlen = convertTo<unsigned>(data);
if (Config->NickLen != newlen)
{
- Log() << "Config->NickLen changed from " << Config->NickLen << " to " << newlen;
+ Log() << "NickLen changed from " << Config->NickLen << " to " << newlen;
Config->NickLen = newlen;
}
}
@@ -190,7 +188,6 @@ struct IRCDMessage005 : IRCDMessage
}
};
-
struct IRCDMessage376 : IRCDMessage
{
IRCDMessage376() : IRCDMessage("376", 2) { }
@@ -209,8 +206,6 @@ struct IRCDMessage376 : IRCDMessage
}
};
-
-
struct IRCDMessageChaninfo : IRCDMessage
{
IRCDMessageChaninfo() : IRCDMessage("CHANINFO", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }