Morevna Changeset - d0161c81635b

Changeset - d0161c81635b

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Laman - 8 years ago 2017-06-20 13:57:34

server updates its hash tree

1 file changed with 20 insertions and 7 deletions:

src/server.py

0 comments (0 inline, 0 general)

src/server.py

➞

Show inline comments

 import socket
 import hashlib
 import socket
 import logging as log
 from hashtree import HashTree
 from networkers import NetworkReader,NetworkWriter
 import logging as log
 import config as conf
 class Connection:
 	def __init__(self,serverSocket):
 		self.socket, address = serverSocket.accept()
@@ @@ -23,18 +24,20 @@ class Connection: @@
 		self.socket.close()
 class Server:
 	def __init__(self,filename,treeFile=""):
 		self.filename=filename
 		self._treeFile=treeFile
 		if treeFile:
 			self.tree=HashTree.load(treeFile)
 		else:
 			self.tree=HashTree.fromFile(filename)
 		self._newLeaves=dict()
 		self.BLOCK_SIZE=self.tree.BLOCK_SIZE
 		self.ss = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		self.ss.bind(("",conf.port))
 		self.ss.listen(1)
@@ @@ -62,15 +65,13 @@ class Server: @@
 			outcoming.writeMsg(*self._requestHash(jsonData))
 		elif jsonData["command"]=="send" and jsonData["dataType"]=="data":
 			outcoming.writeMsg(*self._receiveData(jsonData,binData))
 		elif jsonData["command"]=="end":
 			log.info("closing session...")
 			if self.dataFile:
 				self.dataFile.close()
 			self._finalize()
 			return False
 		else:
 			assert False, jsonData["command"]
 		return True
@@ @@ -92,9 +93,21 @@ class Server: @@
 			self.dataFile=open(self.filename,mode="rb+")
 		i=jsonData["index"]
 		if self._lastWrite+1!=i:
 			self.dataFile.seek(i*self.BLOCK_SIZE)
 		self.dataFile.write(binData)
 		self._lastWrite=i
 		if self._treeFile:
 			self._newLeaves[i+self.tree.leafStart]=hashlib.sha256(binData).digest()[HashTree.HASH_LEN:]
 		return ({"command": "ack", "index": i},)
 		# never update the hash tree
 	def _finalize(self):
 		log.info("closing session...")
 		if self.dataFile:
 			self.dataFile.close()
 		if self._treeFile:
 			log.info("updating hash tree...")
 			for (k,v) in self._newLeaves:
 				self.tree.updateLeaf(k,v)
 			self.tree.save(self._treeFile)
 		log.info("done")

0 comments (0 inline, 0 general)