From 4a6e0e21338da87d54dd301a4a4075d61dc43b3f Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 24 Nov 2021 20:29:29 +0000 Subject: Refactor the ClassTypes enum and move into ConnectClass. --- src/configreader.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/configreader.cpp') diff --git a/src/configreader.cpp b/src/configreader.cpp index 579cfaff6..6d4b41382 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -154,7 +154,7 @@ void ServerConfig::CrossCheckOperClassType() void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) { - typedef std::map, std::shared_ptr> ClassMap; + typedef std::map, std::shared_ptr> ClassMap; ClassMap oldBlocksByMask; if (current) { @@ -162,12 +162,12 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) { switch (c->type) { - case CC_ALLOW: - case CC_DENY: + case ConnectClass::ALLOW: + case ConnectClass::DENY: oldBlocksByMask[std::make_pair(stdalgo::string::join(c->GetHosts()), c->type)] = c; break; - case CC_NAMED: + case ConnectClass::NAMED: oldBlocksByMask[std::make_pair(c->GetName(), c->type)] = c; break; } @@ -220,14 +220,14 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) std::string name = tag->getString("name"); std::string mask; - char type; + ConnectClass::Type type; if (tag->readString("allow", mask, false) && !mask.empty()) - type = CC_ALLOW; + type = ConnectClass::ALLOW; else if (tag->readString("deny", mask, false) && !mask.empty()) - type = CC_DENY; + type = ConnectClass::DENY; else if (!name.empty()) - type = CC_NAMED; + type = ConnectClass::NAMED; else throw CoreException("Connect class must have allow, deny, or name specified at " + tag->source.str()); -- cgit v1.3.1-10-gc9f91