cleanup log output for uniformity; set peer ACL to disabled by default (it is up to the FNE administrator to properly configure and enable this, it should not be enabled by default);

3.6-maint
Bryan Biedenkapp 2 years ago
parent fe002b270f
commit 12e07a2205

@ -212,10 +212,10 @@ system:
# #
peer_acl: peer_acl:
# Flag indicating whether or not the peer ACLs are enabled. # Flag indicating whether or not the peer ACLs are enabled.
enabled: true enabled: false
# Peer ACL mode: whitelist or blacklist # Peer ACL mode: whitelist or blacklist
mode: whitelist mode: whitelist
# Full path to the white/blacklist file. # Full path to the white/blacklist file.
file: peer_whitelist.dat file: peer_whitelist.dat
# Amount of time between updates of white/blacklist file. (minutes) # Amount of time between updates of white/blacklist file. (minutes)
time: 2 time: 2

@ -348,7 +348,7 @@ bool HostFNE::readParams()
uint32_t talkgroupConfigReload = talkgroupRules["time"].as<uint32_t>(30U); uint32_t talkgroupConfigReload = talkgroupRules["time"].as<uint32_t>(30U);
std::string peerListLookupFile = systemConf["peer_acl"]["file"].as<std::string>(); std::string peerListLookupFile = systemConf["peer_acl"]["file"].as<std::string>();
bool peerListLookupEnable = systemConf["peer_acl"]["enabled"].as<bool>(); bool peerListLookupEnable = systemConf["peer_acl"]["enabled"].as<bool>(false);
std::string peerListModeStr = systemConf["peer_acl"]["mode"].as<std::string>("whitelist"); std::string peerListModeStr = systemConf["peer_acl"]["mode"].as<std::string>("whitelist");
uint32_t peerListConfigReload = systemConf["peer_acl"]["time"].as<uint32_t>(30U); uint32_t peerListConfigReload = systemConf["peer_acl"]["time"].as<uint32_t>(30U);
@ -370,8 +370,8 @@ bool HostFNE::readParams()
// try to load peer whitelist/blacklist // try to load peer whitelist/blacklist
LogInfo("Peer List Lookups"); LogInfo("Peer List Lookups");
LogInfo(" Enabled: %s", peerListLookupEnable ? "Yes" : "No"); LogInfo(" Enabled: %s", peerListLookupEnable ? "yes" : "no");
LogInfo(" Mode: %s", peerListMode == lookups::PeerListLookup::BLACKLIST ? "Blacklist" : "Whitelist"); LogInfo(" Mode: %s", peerListMode == lookups::PeerListLookup::BLACKLIST ? "blacklist" : "whitelist");
LogInfo(" File: %s", peerListLookupFile.length() > 0U ? peerListLookupFile.c_str() : "None"); LogInfo(" File: %s", peerListLookupFile.length() > 0U ? peerListLookupFile.c_str() : "None");
if (peerListConfigReload > 0U) if (peerListConfigReload > 0U)
LogInfo(" Reload: %u mins", peerListConfigReload); LogInfo(" Reload: %u mins", peerListConfigReload);

Loading…
Cancel
Save

Powered by TurnKey Linux.