From d691aa3302053bce7b58efbcb37c38027c12ecc0 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 11 Nov 2016 10:32:45 -0800
Subject: [PATCH] Update naming for subnet whitelist in ds

---
 domain-server/src/DomainServer.cpp | 12 ++++++------
 domain-server/src/DomainServer.h   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 722ffc6a74..8e1cabe149 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -158,9 +158,9 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
 
     qDebug() << "domain-server is running";
-    static const SubnetMask LOCALHOST_MASK { QHostAddress("127.0.0.1"), 32 };
+    static const Subnet LOCALHOST { QHostAddress("127.0.0.1"), 32 };
 
-    this->_acIPAddressWhitelist = { LOCALHOST_MASK };
+    this->_acSubnetWhitelist = { LOCALHOST };
 
     _settingsManager.getWhitelistAssignmentClientAddresses();
     auto whitelist = _settingsManager.valueOrDefaultValueForKeyPath("security.ac_address_whitelist").toStringList();
@@ -189,7 +189,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
         if (!ip.isNull()) {
             qDebug() << "Adding AC whitelist IP: " << mask << " -> " << (ip.toString() + "/" + QString::number(netmask));
-            _acIPAddressWhitelist.push_back({ ip , netmask });
+            _acSubnetWhitelist.push_back({ ip , netmask });
         } else {
             qDebug() << "Ignoring ip in whitelist, invalid ip: " << mask;
         }
@@ -1039,12 +1039,12 @@ void DomainServer::processRequestAssignmentPacket(QSharedPointer<ReceivedMessage
 
     auto senderAddr = message->getSenderSockAddr().getAddress();
 
-    auto isHostAddressInSubnet = [&senderAddr](const SubnetMask& mask) -> bool {
+    auto isHostAddressInSubnet = [&senderAddr](const Subnet& mask) -> bool {
         return senderAddr.isInSubnet(mask);
     };
 
-    auto it = find_if(_acIPAddressWhitelist.begin(), _acIPAddressWhitelist.end(), isHostAddressInSubnet);
-    if (it != _acIPAddressWhitelist.end()) {
+    auto it = find_if(_acSubnetWhitelist.begin(), _acSubnetWhitelist.end(), isHostAddressInSubnet);
+    if (it != _acSubnetWhitelist.end()) {
         auto maskString = it->first.toString() + "/" + QString::number(it->second);
         qDebug() << "Received connection from whitelisted ip: " << senderAddr.toString()
             << ", matches subnet mask: " << maskString;
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 34c408b621..73135695eb 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -36,8 +36,8 @@
 typedef QSharedPointer<Assignment> SharedAssignmentPointer;
 typedef QMultiHash<QUuid, WalletTransaction*> TransactionHash;
 
-using SubnetMask = QPair<QHostAddress, int>;
-using SubnetMaskList = std::vector<QPair<QHostAddress, int>>;
+using Subnet = QPair<QHostAddress, int>;
+using SubnetList = std::vector<Subnet>;
 
 class DomainServer : public QCoreApplication, public HTTPSRequestHandler {
     Q_OBJECT
@@ -159,7 +159,7 @@ private:
 
     void setupGroupCacheRefresh();
 
-    SubnetMaskList _acIPAddressWhitelist;
+    SubnetList _acSubnetWhitelist;
 
     DomainGatekeeper _gatekeeper;