piss everyone off and properly relabel "enabled" options to "enable" to keep project consistency;

Author: gatekeep

configs/fne-config.example.yml

@@ -128,7 +128,7 @@ master:
     #
     crypto_container:
         # Flag indicating whether or not crypto services are enabled.
-        enabled: false
+        enable: false
         # Full path to the talkgroup rules file.
         file: key_container.ekc
         # Container password.
@@ -151,7 +151,7 @@ master:
 peers:
     - name: EXAMPLEPEER
       # Flag indicating whether or not the peer is enabled.
-      enabled: true
+      enable: true
       # Hostname/IP address of the FNE master to connect to.
       masterAddress: 127.0.0.1
       # Port number of the FNE master to connect to.
@@ -246,7 +246,7 @@ system:
     #
     peer_acl:
         # Flag indicating whether or not the peer ACLs are enabled.
-        enabled: false
+        enable: false
         # Peer ACL mode: whitelist or blacklist
         mode: whitelist
         # Full path to the white/blacklist file.
@@ -260,7 +260,7 @@ system:
 vtun:
     # Flag indicating the virtual network tunnel is enabled.
     # (If this is enabled, dvmfne must be run as root to create the TUN interface.)
-    enabled: false
+    enable: false
     # Operational mode for the network tunnel (dmr or p25).
     digitalMode: p25
 

src/fne/HostFNE.cpp

@@ -362,7 +362,7 @@ bool HostFNE::readParams()
     uint32_t talkgroupConfigReload = talkgroupRules["time"].as<uint32_t>(30U);
 
     yaml::Node cryptoContainer = masterConf["crypto_container"];
-    bool cryptoContainerEnabled = cryptoContainer["enabled"].as<bool>(false);
+    bool cryptoContainerEnabled = cryptoContainer["enable"].as<bool>(false);
 #if !defined(ENABLE_TCP_SSL)
     cryptoContainerEnabled = false;
 #endif // ENABLE_TCP_SSL
@@ -371,7 +371,7 @@ bool HostFNE::readParams()
     uint32_t cryptoContainerReload = cryptoContainer["time"].as<uint32_t>(30U);
 
     std::string peerListLookupFile = systemConf["peer_acl"]["file"].as<std::string>();
-    bool peerListLookupEnable = systemConf["peer_acl"]["enabled"].as<bool>(false);
+    bool peerListLookupEnable = systemConf["peer_acl"]["enable"].as<bool>(false);
     std::string peerListModeStr = systemConf["peer_acl"]["mode"].as<std::string>("whitelist");
     uint32_t peerListConfigReload = systemConf["peer_acl"]["time"].as<uint32_t>(30U);
 
@@ -735,7 +735,7 @@ bool HostFNE::createPeerNetworks()
         for (size_t i = 0; i < peerList.size(); i++) {
             yaml::Node& peerConf = peerList[i];
 
-            bool enabled = peerConf["enabled"].as<bool>(false);
+            bool enabled = peerConf["enable"].as<bool>(false);
             std::string masterAddress = peerConf["masterAddress"].as<std::string>();
             uint16_t masterPort = (uint16_t)peerConf["masterPort"].as<uint32_t>(TRAFFIC_DEFAULT_PORT);
             std::string password = peerConf["password"].as<std::string>();
@@ -835,7 +835,7 @@ bool HostFNE::createVirtualNetworking()
 {
     yaml::Node vtunConf = m_conf["vtun"];
 #if !defined(_WIN32)
-    bool vtunEnabled = vtunConf["enabled"].as<bool>(false);
+    bool vtunEnabled = vtunConf["enable"].as<bool>(false);
     if (vtunEnabled) {
         m_vtunEnabled = vtunEnabled;
 
@@ -1049,4 +1049,4 @@ void HostFNE::processPeer(network::PeerNetwork* peerNetwork)
             m_network->nxdnTrafficHandler()->processFrame(data.get(), length, peerId, peerNetwork->pktLastSeq(), streamId, true);
         }
     }
-}
+}