Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-10 04:06:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes jellyfin/jellyfin-kodi#421

Browse source 
Jellyfin autodiscovery is IPv4 broadcast only.
We're not binding to a specific port, no need for SO_REUSEADDR.

IP_MULTICAST_LOOP belongs to IPPROTO_IP
https://tldp.org/HOWTO/Multicast-HOWTO-6.html
and SO_REUSEADDR belongs to SOL_SOCKET
https://docs.microsoft.com/en-us/windows/win32/winsock/sol-socket-socket-options
This commit is contained in:
Odd Stråbø 2020-11-15 18:50:54 +01:00
parent b9b420358f
commit 020bd59766
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
jellyfin_kodi/jellyfin/connection_manager.py
View file

@ -213,11 +213,7 @@ class ConnectionManager(object):
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock.settimeout(1.0) # This controls the socket.timeout exception sock.settimeout(1.0) # This controls the socket.timeout exception
sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 20)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
sock.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_LOOP, 1)
sock.setsockopt(socket.IPPROTO_IP, socket.SO_REUSEADDR, 1)
LOG.debug("MultiGroup : %s", str(MULTI_GROUP)) LOG.debug("MultiGroup : %s", str(MULTI_GROUP))
LOG.debug("Sending UDP Data: %s", MESSAGE) LOG.debug("Sending UDP Data: %s", MESSAGE)
@ -232,6 +228,8 @@ class ConnectionManager(object):
return servers return servers
while True: while True:
data = None
addr = None
try: try:
data, addr = sock.recvfrom(1024) # buffer size data, addr = sock.recvfrom(1024) # buffer size
servers.append(json.loads(data)) servers.append(json.loads(data))
@ -240,6 +238,9 @@ class ConnectionManager(object):
LOG.info("Found Servers: %s", servers) LOG.info("Found Servers: %s", servers)
return servers return servers
except json.JSONDecodeError:
LOG.warning("Unable to decode %r from %r.", data, addr)
except Exception as e: except Exception as e:
LOG.error(traceback.format_exc()) LOG.error(traceback.format_exc())
LOG.exception("Error trying to find servers: %s", e) LOG.exception("Error trying to find servers: %s", e)