citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

UDP socket bugfixes

This commit is contained in:
Peter Šurda 2017-05-27 20:43:27 +02:00
parent fa9ad537a5
commit 99e714c432
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/udp.py
View File

@ -100,7 +100,7 @@ class UDPSocket(BMProto):
decodedIP = protocol.checkIPAddress(ip) decodedIP = protocol.checkIPAddress(ip)
if stream not in state.streamsInWhichIAmParticipating: if stream not in state.streamsInWhichIAmParticipating:
continue continue
if seenTime < time.time() - BMProto.maxtimeOffset or seenTime > time.time() + BMProto.maxTimeOffset: if seenTime < time.time() - BMProto.maxTimeOffset or seenTime > time.time() + BMProto.maxTimeOffset:
continue continue
if decodedIP is False: if decodedIP is False:
# if the address isn't local, interpret it as the hosts' own announcement # if the address isn't local, interpret it as the hosts' own announcement
@ -109,7 +109,7 @@ class UDPSocket(BMProto):
return return
print "received peer discovery from %s:%i (port %i):" % (self.destination.host, self.destination.port, remoteport) print "received peer discovery from %s:%i (port %i):" % (self.destination.host, self.destination.port, remoteport)
if self.local: if self.local:
peerDiscoveryQueue.put(state.peer(self.destination.host, remoteport)) peerDiscoveryQueue.put(state.Peer(self.destination.host, remoteport))
return True return True
def bm_command_portcheck(self): def bm_command_portcheck(self):
@ -138,20 +138,21 @@ class UDPSocket(BMProto):
def handle_read(self): def handle_read(self):
try: try:
(addr, recdata) = self.socket.recvfrom(AdvancedDispatcher._buf_len) (recdata, addr) = self.socket.recvfrom(AdvancedDispatcher._buf_len)
except socket.error as e: except socket.error as e:
print "socket error: %s" % (str(e)) print "socket error: %s" % (str(e))
return return
self.destination = state.Peer(addr[0], addr[1]) self.destination = state.Peer(addr[0], addr[1])
encodedAddr = socket.inet_pton(self.socket.family, addr[0]) encodedAddr = protocol.encodeHost(addr[0])
if protocol.checkIPAddress(encodedAddr, True): if protocol.checkIPAddress(encodedAddr, True):
self.local = True self.local = True
else: else:
self.local = False self.local = False
print "read %ib" % (len(recdata)) print "read %ib" % (len(recdata))
# overwrite the old buffer to avoid mixing data and so that self.local works correctly # overwrite the old buffer to avoid mixing data and so that self.local works correctly
self.read_buf = data self.read_buf = recdata
self.bm_proto_reset()
self.process() self.process()
def handle_write(self): def handle_write(self):