0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

use select to check for network data

Browse source
This commit is contained in:
j 2016-01-08 16:56:35 +05:30
parent 11a20a5063
commit 165f9650ec
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
oml/localnodes.py
View file

@ -8,6 +8,7 @@ import struct
import _thread import _thread
from threading import Thread from threading import Thread
import time import time
import select
from utils import valid, get_public_ipv6, get_local_ipv4, get_interface from utils import valid, get_public_ipv6, get_local_ipv4, get_interface
from settings import preferences, server, USER_ID, sk from settings import preferences, server, USER_ID, sk
@ -51,7 +52,6 @@ class LocalNodesBase(Thread):
_PORT = 9851 _PORT = 9851
_TTL = 1 _TTL = 1
_TIMEOUT = 30
def __init__(self, nodes): def __init__(self, nodes):
self._socket = None self._socket = None
@ -85,12 +85,12 @@ class LocalNodesBase(Thread):
def receive(self): def receive(self):
last = time.mktime(time.localtime()) last = time.mktime(time.localtime())
s = self.get_socket()
s.bind(('', self._PORT))
while self._active: while self._active:
try: try:
s = self.get_socket() r, _, _ = select.select([s], [], [], 3)
s.settimeout(self._TIMEOUT) if r:
s.bind(('', self._PORT))
while self._active:
data, addr = s.recvfrom(1024) data, addr = s.recvfrom(1024)
if self._active: if self._active:
while data[-1] == 0: while data[-1] == 0:
@ -98,8 +98,6 @@ class LocalNodesBase(Thread):
data = self.verify(data) data = self.verify(data)
if data: if data:
self.update_node(data) self.update_node(data)
except socket.timeout:
pass
except OSError: # no local interface exists except OSError: # no local interface exists
self.wait(60) self.wait(60)
except: except: