patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust member variable names in NetworkSettings

Browse Source
This commit is contained in:
Thomas Basler 2023-12-12 23:54:06 +01:00
parent 66530638de
commit 4f7597eaa1
2 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/NetworkSettings.h
View File

@ -66,22 +66,23 @@ private:
Task _loopTask; Task _loopTask;
bool adminEnabled = true; static constexpr byte DNS_PORT = 53;
bool forceDisconnection = false;
uint32_t adminTimeoutCounter = 0; bool _adminEnabled = true;
uint32_t adminTimeoutCounterMax = 0; bool _forceDisconnection = false;
uint32_t connectTimeoutTimer = 0; uint32_t _adminTimeoutCounter = 0;
uint32_t connectRedoTimer = 0; uint32_t _adminTimeoutCounterMax = 0;
uint32_t lastTimerCall = 0; uint32_t _connectTimeoutTimer = 0;
const byte DNS_PORT = 53; uint32_t _connectRedoTimer = 0;
IPAddress apIp; uint32_t _lastTimerCall = 0;
IPAddress apNetmask; IPAddress _apIp;
std::unique_ptr<DNSServer> dnsServer; IPAddress _apNetmask;
bool dnsServerStatus = false; std::unique_ptr<DNSServer> _dnsServer;
bool _dnsServerStatus = false;
network_mode _networkMode = network_mode::Undefined; network_mode _networkMode = network_mode::Undefined;
bool _ethConnected = false; bool _ethConnected = false;
std::vector<NetworkEventCbList_t> _cbEventList; std::vector<NetworkEventCbList_t> _cbEventList;
bool lastMdnsEnabled = false; bool _lastMdnsEnabled = false;
}; };
extern NetworkSettingsClass NetworkSettings; extern NetworkSettingsClass NetworkSettings;

74
src/NetworkSettings.cpp
View File

@ -12,10 +12,10 @@
#include <ETH.h> #include <ETH.h>
NetworkSettingsClass::NetworkSettingsClass() NetworkSettingsClass::NetworkSettingsClass()
: apIp(192, 168, 4, 1) : _apIp(192, 168, 4, 1)
, apNetmask(255, 255, 255, 0) , _apNetmask(255, 255, 255, 0)
{ {
dnsServer.reset(new DNSServer()); _dnsServer.reset(new DNSServer());
} }
void NetworkSettingsClass::init(Scheduler& scheduler) void NetworkSettingsClass::init(Scheduler& scheduler)
@ -120,11 +120,11 @@ void NetworkSettingsClass::handleMDNS()
{ {
const bool mdnsEnabled = Configuration.get().Mdns.Enabled; const bool mdnsEnabled = Configuration.get().Mdns.Enabled;
if (lastMdnsEnabled == mdnsEnabled) { if (_lastMdnsEnabled == mdnsEnabled) {
return; return;
} }
lastMdnsEnabled = mdnsEnabled; _lastMdnsEnabled = mdnsEnabled;
MDNS.end(); MDNS.end();
@ -147,17 +147,17 @@ void NetworkSettingsClass::handleMDNS()
void NetworkSettingsClass::setupMode() void NetworkSettingsClass::setupMode()
{ {
if (adminEnabled) { if (_adminEnabled) {
WiFi.mode(WIFI_AP_STA); WiFi.mode(WIFI_AP_STA);
String ssidString = getApName(); String ssidString = getApName();
WiFi.softAPConfig(apIp, apIp, apNetmask); WiFi.softAPConfig(_apIp, _apIp, _apNetmask);
WiFi.softAP(ssidString.c_str(), Configuration.get().Security.Password); WiFi.softAP(ssidString.c_str(), Configuration.get().Security.Password);
dnsServer->setErrorReplyCode(DNSReplyCode::NoError); _dnsServer->setErrorReplyCode(DNSReplyCode::NoError);
dnsServer->start(DNS_PORT, "*", WiFi.softAPIP()); _dnsServer->start(DNS_PORT, "*", WiFi.softAPIP());
dnsServerStatus = true; _dnsServerStatus = true;
} else { } else {
dnsServerStatus = false; _dnsServerStatus = false;
dnsServer->stop(); _dnsServer->stop();
if (_networkMode == network_mode::WiFi) { if (_networkMode == network_mode::WiFi) {
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
} else { } else {
@ -173,9 +173,9 @@ void NetworkSettingsClass::setupMode()
void NetworkSettingsClass::enableAdminMode() void NetworkSettingsClass::enableAdminMode()
{ {
adminEnabled = true; _adminEnabled = true;
adminTimeoutCounter = 0; _adminTimeoutCounter = 0;
adminTimeoutCounterMax = Configuration.get().WiFi.ApTimeout * 60; _adminTimeoutCounterMax = Configuration.get().WiFi.ApTimeout * 60;
setupMode(); setupMode();
} }
@ -203,26 +203,26 @@ void NetworkSettingsClass::loop()
applyConfig(); applyConfig();
} }
if (millis() - lastTimerCall > 1000) { if (millis() - _lastTimerCall > 1000) {
if (adminEnabled && adminTimeoutCounterMax > 0) { if (_adminEnabled && _adminTimeoutCounterMax > 0) {
adminTimeoutCounter++; _adminTimeoutCounter++;
if (adminTimeoutCounter % 10 == 0) { if (_adminTimeoutCounter % 10 == 0) {
MessageOutput.printf("Admin AP remaining seconds: %d / %d\r\n", adminTimeoutCounter, adminTimeoutCounterMax); MessageOutput.printf("Admin AP remaining seconds: %d / %d\r\n", _adminTimeoutCounter, _adminTimeoutCounterMax);
} }
} }
connectTimeoutTimer++; _connectTimeoutTimer++;
connectRedoTimer++; _connectRedoTimer++;
lastTimerCall = millis(); _lastTimerCall = millis();
} }
if (adminEnabled) { if (_adminEnabled) {
// Don't disable the admin mode when network is not available // Don't disable the admin mode when network is not available
if (!isConnected()) { if (!isConnected()) {
adminTimeoutCounter = 0; _adminTimeoutCounter = 0;
} }
// If WiFi is connected to AP for more than adminTimeoutCounterMax // If WiFi is connected to AP for more than adminTimeoutCounterMax
// seconds, disable the internal Access Point // seconds, disable the internal Access Point
if (adminTimeoutCounter > adminTimeoutCounterMax) { if (_adminTimeoutCounter > _adminTimeoutCounterMax) {
adminEnabled = false; _adminEnabled = false;
MessageOutput.println("Admin mode disabled"); MessageOutput.println("Admin mode disabled");
setupMode(); setupMode();
} }
@ -230,28 +230,28 @@ void NetworkSettingsClass::loop()
// WiFi is searching for an AP. So disable searching afer // WiFi is searching for an AP. So disable searching afer
// WIFI_RECONNECT_TIMEOUT and repeat after WIFI_RECONNECT_REDO_TIMEOUT // WIFI_RECONNECT_TIMEOUT and repeat after WIFI_RECONNECT_REDO_TIMEOUT
if (isConnected()) { if (isConnected()) {
connectTimeoutTimer = 0; _connectTimeoutTimer = 0;
connectRedoTimer = 0; _connectRedoTimer = 0;
} else { } else {
if (connectTimeoutTimer > WIFI_RECONNECT_TIMEOUT && !forceDisconnection) { if (_connectTimeoutTimer > WIFI_RECONNECT_TIMEOUT && !_forceDisconnection) {
MessageOutput.print("Disable search for AP... "); MessageOutput.print("Disable search for AP... ");
WiFi.mode(WIFI_AP); WiFi.mode(WIFI_AP);
MessageOutput.println("done"); MessageOutput.println("done");
connectRedoTimer = 0; _connectRedoTimer = 0;
forceDisconnection = true; _forceDisconnection = true;
} }
if (connectRedoTimer > WIFI_RECONNECT_REDO_TIMEOUT && forceDisconnection) { if (_connectRedoTimer > WIFI_RECONNECT_REDO_TIMEOUT && _forceDisconnection) {
MessageOutput.print("Enable search for AP... "); MessageOutput.print("Enable search for AP... ");
WiFi.mode(WIFI_AP_STA); WiFi.mode(WIFI_AP_STA);
MessageOutput.println("done"); MessageOutput.println("done");
applyConfig(); applyConfig();
connectTimeoutTimer = 0; _connectTimeoutTimer = 0;
forceDisconnection = false; _forceDisconnection = false;
} }
} }
} }
if (dnsServerStatus) { if (_dnsServerStatus) {
dnsServer->processNextRequest(); _dnsServer->processNextRequest();
} }
handleMDNS(); handleMDNS();