home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Hex map capabilities.
[plomrogue2-experiments]
/
new2
/
plomrogue
/
io_tcp.py
diff --git
a/new2/plomrogue/io_tcp.py
b/new2/plomrogue/io_tcp.py
index 203021cd06b9b7c34e2eab8efa8749c1e6188155..f0a49a97dad632fa4f3dc10770432f424ba90155 100644
(file)
--- a/
new2/plomrogue/io_tcp.py
+++ b/
new2/plomrogue/io_tcp.py
@@
-46,6
+46,7
@@
class PlomSocket:
try:
sent = self.socket.send(data[totalsent:])
socket_broken = sent == 0
try:
sent = self.socket.send(data[totalsent:])
socket_broken = sent == 0
+ totalsent = totalsent + sent
except OSError as err:
if err.errno == 9: # "Bad file descriptor", when connection broken
socket_broken = True
except OSError as err:
if err.errno == 9: # "Bad file descriptor", when connection broken
socket_broken = True
@@
-53,7
+54,6
@@
class PlomSocket:
raise err
if socket_broken and not silent_connection_break:
raise BrokenSocketConnection
raise err
if socket_broken and not silent_connection_break:
raise BrokenSocketConnection
- totalsent = totalsent + sent
def recv(self):
"""Get full send()-prepared message from self.socket.
def recv(self):
"""Get full send()-prepared message from self.socket.
@@
-77,12
+77,10
@@
class PlomSocket:
data = b''
msg = b''
while True:
data = b''
msg = b''
while True:
- data
+
= self.socket.recv(1024)
+ data = self.socket.recv(1024)
if 0 == len(data):
if 0 == len(data):
- return
- cut_off = 0
+ break
for c in data:
for c in data:
- cut_off += 1
if esc:
msg += bytes([c])
esc = False
if esc:
msg += bytes([c])
esc = False
@@
-93,7
+91,6
@@
class PlomSocket:
yield msg.decode()
except UnicodeDecodeError:
yield None
yield msg.decode()
except UnicodeDecodeError:
yield None
- data = data[cut_off:]
msg = b''
else:
msg += bytes([c])
msg = b''
else:
msg += bytes([c])