Skip to content

Commit

Permalink
Check if creation of IPv6 sockets works before using it (fixes #75)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamcik committed Apr 23, 2011
1 parent f20b3b2 commit 0b91b26
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
18 changes: 16 additions & 2 deletions mopidy/frontends/mpd/server.py
Expand Up @@ -9,6 +9,20 @@

logger = logging.getLogger('mopidy.frontends.mpd.server')

def _try_ipv6_socket():
"""Determine if system really supports IPv6"""
if not socket.has_ipv6:
return False
try:
socket.socket(socket.AF_INET6).close()
return True
except IOError, e:
logger.debug(u'Platform supports IPv6, but socket '
'creation failed, disabling: %s', e)
return False

has_ipv6 = _try_ipv6_socket()

class MpdServer(asyncore.dispatcher):
"""
The MPD server. Creates a :class:`mopidy.frontends.mpd.session.MpdSession`
Expand All @@ -21,7 +35,7 @@ def __init__(self):
def start(self):
"""Start MPD server."""
try:
if socket.has_ipv6:
if has_ipv6:
self.create_socket(socket.AF_INET6, socket.SOCK_STREAM)
# Explicitly configure socket to work for both IPv4 and IPv6
self.socket.setsockopt(
Expand Down Expand Up @@ -53,7 +67,7 @@ def handle_close(self):
self.close()

def _format_hostname(self, hostname):
if (socket.has_ipv6
if (has_ipv6
and re.match('\d+.\d+.\d+.\d+', hostname) is not None):
hostname = '::ffff:%s' % hostname
return hostname
6 changes: 4 additions & 2 deletions tests/frontends/mpd/server_test.py
Expand Up @@ -10,20 +10,22 @@ def setUp(self):
self.backend = DummyBackend.start().proxy()
self.mixer = DummyMixer.start().proxy()
self.server = server.MpdServer()
self.has_ipv6 = server.has_ipv6

def tearDown(self):
self.backend.stop().get()
self.mixer.stop().get()
server.has_ipv6 = self.has_ipv6

def test_format_hostname_prefixes_ipv4_addresses_when_ipv6_available(self):
server.socket.has_ipv6 = True
server.has_ipv6 = True
self.assertEqual(self.server._format_hostname('0.0.0.0'),
'::ffff:0.0.0.0')
self.assertEqual(self.server._format_hostname('127.0.0.1'),
'::ffff:127.0.0.1')

def test_format_hostname_does_nothing_when_only_ipv4_available(self):
server.socket.has_ipv6 = False
server.has_ipv6 = False
self.assertEquals(self.server._format_hostname('0.0.0.0'), '0.0.0.0')

class MpdSessionTest(unittest.TestCase):
Expand Down

0 comments on commit 0b91b26

Please sign in to comment.