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

CLI peerPing command display connection encryption info only once

Browse source
This commit is contained in:
shortcutme 2019-08-15 03:09:53 +02:00
parent 8f491fe6e1
commit 429043f60c
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main.py
View file

@ -447,30 +447,24 @@ class Actions(object):
if not peer.connection: if not peer.connection:
print("Error: Can't connect to peer (connection error: %s)" % peer.connection_error) print("Error: Can't connect to peer (connection error: %s)" % peer.connection_error)
return False return False
if "shared_ciphers" in dir(peer.connection.sock):
print("Shared ciphers:", peer.connection.sock.shared_ciphers())
if "cipher" in dir(peer.connection.sock):
print("Cipher:", peer.connection.sock.cipher()[0])
if "version" in dir(peer.connection.sock):
print("TLS version:", peer.connection.sock.version())
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):
ping_delay = peer.ping() ping_delay = peer.ping()
if "cipher" in dir(peer.connection.sock): print("Response time: %.3fs" % ping_delay)
cipher = peer.connection.sock.cipher()[0]
tls_version = peer.connection.sock.version()
else:
cipher = peer.connection.crypt
tls_version = None
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):
ping_delay = peer.ping() ping_delay = peer.ping()
if "cipher" in dir(peer.connection.sock): print("Response time: %.3fs" % ping_delay)
cipher = peer.connection.sock.cipher()[0]
tls_version = peer.connection.sock.version()
else:
cipher = peer.connection.crypt
tls_version = None
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):