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

Rev3313, Remove local announcer binding to ip to make test pass on linux

Browse source
This commit is contained in:
shortcutme 2018-02-09 14:15:43 +01:00
parent 5c503203dc
commit 3028a8ebc9
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/AnnounceLocal/BroadcastServer.py
View file

@ -84,7 +84,7 @@ class BroadcastServer(object):
addr = ("255.255.255.255", port) addr = ("255.255.255.255", port)
message["sender"] = self.sender_info message["sender"] = self.sender_info
self.log.debug("Broadcast to ips %s on port %s: %s" % (my_ips, port, message["cmd"])) self.log.debug("Broadcast using ips %s on port %s: %s" % (my_ips, port, message["cmd"]))
for my_ip in my_ips: for my_ip in my_ips:
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)

2
plugins/AnnounceLocal/Test/TestAnnounce.py
View file

@ -13,7 +13,6 @@ def announcer(file_server, site):
file_server.sites[site.address] = site file_server.sites[site.address] = site
file_server.local_announcer.listen_port = 1100 file_server.local_announcer.listen_port = 1100
file_server.local_announcer.sender_info["broadcast_port"] = 1100 file_server.local_announcer.sender_info["broadcast_port"] = 1100
file_server.local_announcer.listen_ip = file_server.local_announcer.getMyIps()[0]
gevent.spawn(file_server.local_announcer.start) gevent.spawn(file_server.local_announcer.start)
time.sleep(0.3) time.sleep(0.3)
@ -26,7 +25,6 @@ def announcer_remote(site_temp):
file_server_remote.sites[site_temp.address] = site_temp file_server_remote.sites[site_temp.address] = site_temp
file_server_remote.local_announcer.listen_port = 1101 file_server_remote.local_announcer.listen_port = 1101
file_server_remote.local_announcer.sender_info["broadcast_port"] = 1101 file_server_remote.local_announcer.sender_info["broadcast_port"] = 1101
file_server_remote.local_announcer.listen_ip = file_server_remote.local_announcer.getMyIps()[0]
gevent.spawn(file_server_remote.local_announcer.start) gevent.spawn(file_server_remote.local_announcer.start)
time.sleep(0.3) time.sleep(0.3)

2
src/Config.py
View file

@ -10,7 +10,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.2" self.version = "0.6.2"
self.rev = 3312 self.rev = 3313
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"