diff --git a/src/morevna.py b/src/morevna.py --- a/src/morevna.py +++ b/src/morevna.py @@ -7,7 +7,7 @@ from util import spawnDaemon, splitHost import config as conf import stats from hashtree import HashTree -from client import Client, Connection as ClientConnection, FailedConnection +from client import Client, Connection as ClientConnection, FailedConnection, DeniedConnection from server import Miniserver @@ -43,12 +43,15 @@ def push(args): try: with ClientConnection(*host) as con: c.setConnection(con) + c.init("push") blocksToTransfer=c.negotiate() c.sendData(blocksToTransfer) print() print(stats.report()) print() - except FailedConnection: continue + except FailedConnection: pass + except DeniedConnection: + print("Server {0}:{1} denied connection.".format(*host)) def pull(args): _checkFile(args.datafile) @@ -62,11 +65,14 @@ def pull(args): try: with ClientConnection(*host) as con: c.setConnection(con) + c.init("pull") blocksToTransfer=c.negotiate() c.pullData(blocksToTransfer) print() print(stats.report()) except FailedConnection: pass + except DeniedConnection: + print("Server {0}:{1} denied connection.".format(*host)) def serve(args): _checkFile(args.datafile)