removed shared directory for clarity. changed setup.py
This commit is contained in:
parent
cb6ef661da
commit
843b37f9c6
|
@ -1,32 +0,0 @@
|
||||||
|
|
||||||
HEADER_SIZE = 4
|
|
||||||
|
|
||||||
|
|
||||||
# this module is for sending discree messages over TCP
|
|
||||||
# this is achieved by prefixing all messages with their length
|
|
||||||
# calls to send and recv will also keep attempting to send all data unless this proves impossible
|
|
||||||
|
|
||||||
|
|
||||||
def send(sock, msg):
|
|
||||||
length = len(msg)
|
|
||||||
header = length.to_bytes(4, byteorder="big")
|
|
||||||
totalmsg = header + msg
|
|
||||||
sock.sendall(totalmsg)
|
|
||||||
|
|
||||||
def receive(sock):
|
|
||||||
header = recvall(sock, 4) #sock.recv(4)
|
|
||||||
length = int.from_bytes(header, byteorder="big")
|
|
||||||
return recvall(sock, length)
|
|
||||||
|
|
||||||
def recvall(sock, length):
|
|
||||||
chunks = []
|
|
||||||
bytes_recd = 0
|
|
||||||
while bytes_recd < length:
|
|
||||||
chunk = sock.recv(min(length - bytes_recd, 4096))
|
|
||||||
if chunk == b'':
|
|
||||||
break
|
|
||||||
#raise RuntimeError("socket connection broken")
|
|
||||||
chunks.append(chunk)
|
|
||||||
bytes_recd = bytes_recd + len(chunk)
|
|
||||||
return b''.join(chunks)
|
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -15,8 +15,8 @@ setup(
|
||||||
],
|
],
|
||||||
entry_points={
|
entry_points={
|
||||||
'console_scripts': [
|
'console_scripts': [
|
||||||
'asciifarm = asciifarm.client:main',
|
'asciifarm = asciifarm.client.main:main',
|
||||||
'hostfarms = asciifarm.server:main',
|
'hostfarms = asciifarm.server.main:main',
|
||||||
# TODO: troido, if you want just one asciifarm command, change
|
# TODO: troido, if you want just one asciifarm command, change
|
||||||
# this to asccifarm and remove the previous two lines -wangofett, 2017-10-27
|
# this to asccifarm and remove the previous two lines -wangofett, 2017-10-27
|
||||||
'testasciifarm = asciifarm.__main__:main',
|
'testasciifarm = asciifarm.__main__:main',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user