3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zeroconf: add support for configurable mdns hostnames 

Signed-off-by:  Eric Callahan <aksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-06-21 13:38:53 -04:00
parent adc32379da
commit 95d5f045db
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moonraker/components/zeroconf.py
View File

@ -53,6 +53,7 @@ class ZeroconfRegistrar:
self.server = config.get_server() self.server = config.get_server()
self.runner = AsyncRunner(IPVersion.All) self.runner = AsyncRunner(IPVersion.All)
hi = self.server.get_host_info() hi = self.server.get_host_info()
self.mdns_name = config.get("mdns_hostname", hi["hostname"])
addr: str = hi["address"] addr: str = hi["address"]
if addr.lower() == "all": if addr.lower() == "all":
addr = "::" addr = "::"
@ -78,7 +79,7 @@ class ZeroconfRegistrar:
# Use the UUID. First 8 hex digits should be unique enough # Use the UUID. First 8 hex digits should be unique enough
instance_name = f"Moonraker-{instance_uuid[:8]}" instance_name = f"Moonraker-{instance_uuid[:8]}"
hi = self.server.get_host_info() hi = self.server.get_host_info()
host = hi["hostname"] host = self.mdns_name
zc_service_props = { zc_service_props = {
"uuid": instance_uuid, "uuid": instance_uuid,
"https_port": hi["ssl_port"] if app.https_enabled() else "", "https_port": hi["ssl_port"] if app.https_enabled() else "",
@ -96,7 +97,7 @@ class ZeroconfRegistrar:
fam = socket.AF_INET6 if host_addr.version == 6 else socket.AF_INET fam = socket.AF_INET6 if host_addr.version == 6 else socket.AF_INET
addresses = [(socket.inet_pton(fam, str(self.cfg_addr)))] addresses = [(socket.inet_pton(fam, str(self.cfg_addr)))]
zc_service_name = f"{instance_name} @ {host}.{ZC_SERVICE_TYPE}" zc_service_name = f"{instance_name} @ {host}.{ZC_SERVICE_TYPE}"
server_name = hi["hostname"] or instance_name.lower() server_name = self.mdns_name or instance_name.lower()
self.service_info = AsyncServiceInfo( self.service_info = AsyncServiceInfo(
ZC_SERVICE_TYPE, ZC_SERVICE_TYPE,
zc_service_name, zc_service_name,