oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show crypto cipher on peerPing command

Browse source
This commit is contained in:
shortcutme 2019-03-27 03:09:28 +01:00
parent de303bf453
commit 9050f1a039
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main.py
View file

@ -432,13 +432,27 @@ class Actions(object):
print("Connection time: %.3fs (connection error: %s)" % (time.time() - s, peer.connection_error)) print("Connection time: %.3fs (connection error: %s)" % (time.time() - s, peer.connection_error))
for i in range(5): for i in range(5):
print("Response time: %.3fs (crypt: %s)" % (peer.ping(), peer.connection.crypt)) ping_delay = peer.ping()
if "cipher" in dir(peer.connection.sock):
cipher = peer.connection.sock.cipher()[0]
tls_version = peer.connection.sock.version()
else:
cipher = peer.connection.crypt
tls_version = ""
print("Response time: %.3fs (crypt: %s %s %s)" % (ping_delay, peer.connection.crypt, cipher, tls_version))
time.sleep(1) time.sleep(1)
peer.remove() peer.remove()
print("Reconnect test...") print("Reconnect test...")
peer = Peer(peer_ip, peer_port) peer = Peer(peer_ip, peer_port)
for i in range(5): for i in range(5):
print("Response time: %.3fs (crypt: %s)" % (peer.ping(), peer.connection.crypt)) ping_delay = peer.ping()
if "cipher" in dir(peer.connection.sock):
cipher = peer.connection.sock.cipher()[0]
tls_version = peer.connection.sock.version()
else:
cipher = peer.connection.crypt
tls_version = ""
print("Response time: %.3fs (crypt: %s %s %s)" % (ping_delay, peer.connection.crypt, cipher, tls_version))
time.sleep(1) time.sleep(1)
def peerGetFile(self, peer_ip, peer_port, site, filename, benchmark=False): def peerGetFile(self, peer_ip, peer_port, site, filename, benchmark=False):