oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure that we close UDP sockets of local peer discovery

Browse source
This commit is contained in:
shortcutme 2018-04-18 13:11:50 +02:00
parent aa68e69a18
commit e51788ac05
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/AnnounceLocal/BroadcastServer.py
View file

@ -1,6 +1,7 @@
import socket import socket
import logging import logging
import time import time
from contextlib import closing
import msgpack import msgpack
@ -90,8 +91,9 @@ class BroadcastServer(object):
message_part["sender"] = self.sender_info message_part["sender"] = self.sender_info
self.log.debug("Send to %s: %s" % (addr, message_part["cmd"])) self.log.debug("Send to %s: %s" % (addr, message_part["cmd"]))
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) with closing(socket.socket(socket.AF_INET, socket.SOCK_DGRAM)) as sock:
sock.sendto(msgpack.packb(message_part), addr) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock.sendto(msgpack.packb(message_part), addr)
def getMyIps(self): def getMyIps(self):
return UpnpPunch._get_local_ips() return UpnpPunch._get_local_ips()
@ -108,10 +110,11 @@ class BroadcastServer(object):
for my_ip in my_ips: for my_ip in my_ips:
try: try:
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) with closing(socket.socket(socket.AF_INET, socket.SOCK_DGRAM)) as sock:
sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock.bind((my_ip, 0)) sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
sock.sendto(msgpack.packb(message), addr) sock.bind((my_ip, 0))
sock.sendto(msgpack.packb(message), addr)
except Exception as err: except Exception as err:
self.log.warning("Error sending broadcast using ip %s: %s" % (my_ip, err)) self.log.warning("Error sending broadcast using ip %s: %s" % (my_ip, err))