andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #580 from jodal/fix/zeroconf-invalid-host

Browse Source 
Fix invalid host in Zeroconf
This commit is contained in:
Thomas Adamcik 2013-11-15 16:39:13 -08:00
commit 09b6f726fa
1 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
mopidy/utils/zeroconf.py
View File

@ -1,11 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import logging import logging
import re
import socket import socket
import string import string
logger = logging.getLogger('mopidy.utils.zerconf') logger = logging.getLogger('mopidy.utils.zeroconf')
try: try:
import dbus import dbus
@ -17,13 +16,6 @@ _AVAHI_PROTO_UNSPEC = -1
_AVAHI_PUBLISHFLAGS_NONE = 0 _AVAHI_PUBLISHFLAGS_NONE = 0
def _filter_loopback_and_meta_addresses(host):
# TODO: see if we can find a cleaner way of handling this.
if re.search(r'(?<![.\d])(127|0)[.]', host):
return ''
return host
def _convert_text_to_dbus_bytes(text): def _convert_text_to_dbus_bytes(text):
return [dbus.Byte(ord(c)) for c in text] return [dbus.Byte(ord(c)) for c in text]
@ -38,7 +30,10 @@ class Zeroconf(object):
self.domain = domain or '' self.domain = domain or ''
self.port = port self.port = port
self.text = text or [] self.text = text or []
self.host = _filter_loopback_and_meta_addresses(host or '') if host in ('::', '0.0.0.0'):
self.host = ''
else:
self.host = host
template = string.Template(name) template = string.Template(name)
self.name = template.safe_substitute( self.name = template.safe_substitute(
@ -51,31 +46,38 @@ class Zeroconf(object):
try: try:
bus = dbus.SystemBus() bus = dbus.SystemBus()
if not bus.name_has_owner('org.freedesktop.Avahi'):
logger.debug(
'Zeroconf publish failed: Avahi service not running.')
return False
server = dbus.Interface(
bus.get_object('org.freedesktop.Avahi', '/'),
'org.freedesktop.Avahi.Server')
self.group = dbus.Interface(
bus.get_object(
'org.freedesktop.Avahi', server.EntryGroupNew()),
'org.freedesktop.Avahi.EntryGroup')
text = [_convert_text_to_dbus_bytes(t) for t in self.text]
self.group.AddService(
_AVAHI_IF_UNSPEC, _AVAHI_PROTO_UNSPEC,
dbus.UInt32(_AVAHI_PUBLISHFLAGS_NONE), self.name, self.stype,
self.domain, self.host, dbus.UInt16(self.port), text)
self.group.Commit()
return True
except dbus.exceptions.DBusException as e: except dbus.exceptions.DBusException as e:
logger.debug('Zeroconf publish failed: %s', e) logger.debug('Zeroconf publish failed: %s', e)
return False return False
if not bus.name_has_owner('org.freedesktop.Avahi'):
logger.debug('Zeroconf publish failed: Avahi service not running.')
return False
server = dbus.Interface(bus.get_object('org.freedesktop.Avahi', '/'),
'org.freedesktop.Avahi.Server')
self.group = dbus.Interface(
bus.get_object('org.freedesktop.Avahi', server.EntryGroupNew()),
'org.freedesktop.Avahi.EntryGroup')
text = [_convert_text_to_dbus_bytes(t) for t in self.text]
self.group.AddService(_AVAHI_IF_UNSPEC, _AVAHI_PROTO_UNSPEC,
dbus.UInt32(_AVAHI_PUBLISHFLAGS_NONE),
self.name, self.stype, self.domain, self.host,
dbus.UInt16(self.port), text)
self.group.Commit()
return True
def unpublish(self): def unpublish(self):
if self.group: if self.group:
self.group.Reset() try:
self.group = None self.group.Reset()
except dbus.exceptions.DBusException as e:
logger.debug('Zeroconf unpublish failed: %s', e)
finally:
self.group = None