Merge branch 'pr1441' into dev

This commit is contained in:
Thomas Basler
2023-10-31 19:30:56 +01:00
11 changed files with 68 additions and 9 deletions

View File

@@ -8,6 +8,7 @@
#include "PinMapping.h"
#include "Utils.h"
#include "defaults.h"
#include <ESPmDNS.h>
#include <ETH.h>
NetworkSettingsClass::NetworkSettingsClass()
@@ -110,6 +111,35 @@ void NetworkSettingsClass::raiseEvent(network_event event)
}
}
void NetworkSettingsClass::handleMDNS()
{
bool mdnsEnabled = Configuration.get().Mdns_Enabled;
if (lastMdnsEnabled == mdnsEnabled) {
return;
}
lastMdnsEnabled = mdnsEnabled;
MDNS.end();
if (!mdnsEnabled) {
return;
}
if (MDNS.begin(getHostname())) {
MessageOutput.print("MDNS responder starting...");
MDNS.addService("http", "tcp", 80);
MDNS.addService("opendtu", "tcp", 80);
MDNS.addServiceTxt("opendtu", "tcp", "git_hash", AUTO_GIT_HASH);
MessageOutput.println("done");
} else {
MessageOutput.println("Error setting up MDNS responder!");
}
}
void NetworkSettingsClass::setupMode()
{
if (adminEnabled) {
@@ -218,6 +248,8 @@ void NetworkSettingsClass::loop()
if (dnsServerStatus) {
dnsServer->processNextRequest();
}
handleMDNS();
}
void NetworkSettingsClass::applyConfig()
@@ -417,4 +449,4 @@ network_mode NetworkSettingsClass::NetworkMode()
return _networkMode;
}
NetworkSettingsClass NetworkSettings;
NetworkSettingsClass NetworkSettings;