D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/D4-project/d4-core

pull/23/head
Terrtia 2019-01-03 11:38:20 +01:00
parent 3937486e7c 236c8e99c8
commit fef4513ecc
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/server.py
View File

@ -30,7 +30,7 @@ redis_server = redis.StrictRedis(
class Echo(Protocol): class Echo(Protocol):
def __init__(self): def __init__(self):
self.buffer = '' self.buffer = b''
def dataReceived(self, data): def dataReceived(self, data):
self.process_header(data) self.process_header(data)
@ -69,22 +69,22 @@ class Echo(Protocol):
self.process_d4_data(data, data_header) self.process_d4_data(data, data_header)
# multiple d4 headers # multiple d4 headers
elif data_header['size'] < (len(data) - 62): elif data_header['size'] < (len(data) - 62):
next_data = data[:data_header['size'] + 62] next_data = data[data_header['size'] + 62:]
data = data[data_header['size'] + 62:] data = data[:data_header['size'] + 62]
print() #print('------------------------------------------------')
print('------------------------------------------------') #print(data)
print(data) #print()
print(next_data) #print(next_data)
self.process_d4_data(data, data_header) self.process_d4_data(data, data_header)
# process next d4 header # process next d4 header
self.process_header(next_data) self.process_header(next_data)
# data_header['size'] > (len(data) - 62) # data_header['size'] > (len(data) - 62)
# buffer the data # buffer the data
else: else:
print('**********************************************************') #print('**********************************************************')
print(data) #print(data)
print(data_header['size']) #print(data_header['size'])
print((len(data) - 62)) #print((len(data) - 62))
self.buffer += data self.buffer += data
else: else:
if len(data) < 62: if len(data) < 62:
@ -110,9 +110,15 @@ class Echo(Protocol):
# add previous data # add previous data
if len(data) < 62: if len(data) < 62:
data = self.buffer + data data = self.buffer + data
print(data)
print()
#todo check if valid header before adding ? #todo check if valid header before adding ?
else: else:
data = self.buffer + data data = self.buffer + data
#print('()()()()()()()()()')
#print(data)
#print()
self.buffer = b''
self.process_header(data) self.process_header(data)
def process_d4_data(self, data, data_header): def process_d4_data(self, data, data_header):