Browse Source

on sl error: print exception inside for loop, and do not continue the loop

master
ThomasV 12 years ago
parent
commit
cff8515e3c
  1. 9
      lib/interface.py

9
lib/interface.py

@ -326,12 +326,12 @@ class Interface(threading.Thread):
try: try:
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv3, cert_reqs=ssl.CERT_NONE, ca_certs=None) s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv3, cert_reqs=ssl.CERT_NONE, ca_certs=None)
except ssl.SSLError, e: except ssl.SSLError, e:
print_error("SSL error retrieving SSL certificate:", self.host, e)
s = None s = None
continue
break break
if s == None: if s is None:
print_error("SSL error retrieving SSL certificate:", self.host, e)
return return
dercert = s.getpeercert(True) dercert = s.getpeercert(True)
@ -351,14 +351,13 @@ class Interface(threading.Thread):
s = socket.socket( res[0], socket.SOCK_STREAM ) s = socket.socket( res[0], socket.SOCK_STREAM )
s.settimeout(2) s.settimeout(2)
s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
s.connect(res[4]) s.connect(res[4])
except: except:
s = None s = None
continue continue
break break
if s == None: if s is None:
print_error("failed to connect", self.host, self.port) print_error("failed to connect", self.host, self.port)
return return

Loading…
Cancel
Save