From c4281339b6401d5c83f6231b4b5ade3e8a2334cd Mon Sep 17 00:00:00 2001
From: David Eisner <david.eisner@oriel.oxon.org>
Date: Tue, 5 Nov 2013 11:07:35 +0000
Subject: [PATCH] Avahi hostname choice extracted for reuse

---
 mopidy/frontends/mpd/actor.py | 5 +----
 mopidy/utils/zeroconf.py      | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mopidy/frontends/mpd/actor.py b/mopidy/frontends/mpd/actor.py
index ab5bd35d..66218593 100644
--- a/mopidy/frontends/mpd/actor.py
+++ b/mopidy/frontends/mpd/actor.py
@@ -43,14 +43,11 @@ class MpdFrontend(pykka.ThreadingActor, CoreListener):
         try:
             if self.config['mpd']['zeroconf_enabled']:
                 name = self.config['mpd']['zeroconf_name']
-                import re
-                lo = re.search('(?<![.\d])(127|0)[.]', self.hostname)
-                hostname = "" if lo else self.hostname
 
                 from mopidy.utils.zeroconf import Zeroconf
                 self.service = Zeroconf(
                     stype="_mpd._tcp",
-                    name=name, port=self.port, host=hostname)
+                    name=name, port=self.port, host=self.hostname)
                 self.service.publish()
 
                 logger.info('Registered with Avahi as %s', name)
diff --git a/mopidy/utils/zeroconf.py b/mopidy/utils/zeroconf.py
index 750f6731..d77738b4 100644
--- a/mopidy/utils/zeroconf.py
+++ b/mopidy/utils/zeroconf.py
@@ -18,9 +18,13 @@ class Zeroconf:
         self.name = name
         self.stype = stype
         self.domain = domain
-        self.host = host
         self.port = port
         self.text = text
+        # Let avahi choose how to advertise services
+        # listening on lo and meta addresses
+        import re
+        lo = re.search('(?<![.\d])(127|0)[.]', host)
+        self.host = "" if lo else host
 
     def publish(self):
         bus = dbus.SystemBus()