Add config option to use hostname/IP for mDNS

bbc · Jan 23, 2019 · 8614e3d · 8614e3d
1 parent 01f2f1b
commit 8614e3d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/nmoscommon/mdns/mdnsListener.py b/nmoscommon/mdns/mdnsListener.py
@@ -71,7 +71,7 @@ def _buildClientCallback(self, action, info):
             "type": info.type,
             "name": info.name,
             "port": info.port,
-            "hostname": info.name,
+            "hostname": info.server.rstrip("."),
             "address": inet_ntoa(info.address),
             "txt": info.properties
         }
diff --git a/nmoscommon/mdnsbridge.py b/nmoscommon/mdnsbridge.py
@@ -94,7 +94,7 @@ def getHref(self, srv_type, priority=None):
 
     def _createHref(self, service):
         proto = service['protocol']
-        if service.get('hostname') is not None:
+        if service.get('hostname') is not None and self.config["prefer_hostnames"]:
             address = service['hostname']
         else:
             address = service['address']

diff --git a/nmoscommon/nmoscommonconfig.py b/nmoscommon/nmoscommonconfig.py
@@ -23,6 +23,7 @@
     "priority": 0,
     "https_mode": "disabled",
     "prefer_ipv6": False,
+    "prefer_hostnames": False,
     "node_hostname": None,
     "fix_proxy": "disabled",
     "logging": {

diff --git a/setup.py b/setup.py
@@ -34,6 +34,7 @@ def create_default_conf():
         "priority": 0,
         "https_mode": "disabled",
         "prefer_ipv6": False,
+        "prefer_hostnames": False,
         "node_hostname": None,
         "fix_proxy": "disabled",
         "logging": {