diff --git a/src/client.py b/src/client.py --- a/src/client.py +++ b/src/client.py @@ -7,11 +7,12 @@ import config as conf from networkers import NetworkReader,NetworkWriter +filename=sys.argv[1] + + def connect(): - HOST = conf.hosts[0] # The remote host - PORT = conf.port # The same port as used by the server s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((HOST, PORT)) + s.connect((conf.hosts[0], conf.port)) fr=s.makefile(mode='rb') fw=s.makefile(mode='wb') @@ -27,7 +28,7 @@ def connect(): def negotiate(incoming,outcoming): - localTree=HashTree.fromFile(open("clientFile.txt",mode="rb")) + localTree=HashTree.fromFile(open(filename,mode="rb")) blocksToTransfer=[] nodeStack=collections.deque([0]) # root @@ -56,7 +57,7 @@ def negotiate(incoming,outcoming): def sendData(outcoming,blocksToTransfer): print(blocksToTransfer) - dataFile=open("clientFile.txt",mode="rb") + dataFile=open(filename,mode="rb") for i in blocksToTransfer: jsonData={"command":"send", "index":i, "dataType":"data"}