Commit 1c44e165 authored by Alexandre's avatar Alexandre
Browse files

[DoT] Better output

parent e11fddc7
......@@ -478,6 +478,7 @@ class ConnectionDoT(Connection):
self.success = True
break
if self.verbose and self.connect_to is None:
print("Could not connect to %s" % addrinfo[0][0])
print("Trying another IP address")
# we could not establish a connection
......@@ -502,7 +503,8 @@ class ConnectionDoT(Connection):
self.sock = socket.socket(sock_family, socket.SOCK_STREAM)
if self.verbose:
print("Connecting to %s ..." % str(addr))
print("Connecting to %s ..." % addr[0])
# With typical DoT servers, we *must* use TLS 1.2 (otherwise,
# do_handshake fails with "OpenSSL.SSL.SysCallError: (-1, 'Unexpected
# EOF')" Typical HTTP servers are more lax.
......
......@@ -175,7 +175,7 @@ tests:
- '--dot'
- 'dot.bortzmeyer.fr'
- 'www.afnic.fr'
partstdout: "on 193.70.85.11 ...\nConnecting to ('193.70.85.11', 853) ..."
partstdout: "on 193.70.85.11 ...\nConnecting to 193.70.85.11 ..."
- exe: './homer.py'
name: '[doh][check] Test that all the resolved IPs are tried, try another IP'
......@@ -188,7 +188,7 @@ tests:
- '--dot'
- 'dot.bortzmeyer.fr'
- 'www.afnic.fr'
partstdout: "on 2001:41d0:302:2200::180 ...\nConnecting to ('2001:41d0:302:2200::180', 853, 0, 0) ..."
partstdout: "on 2001:41d0:302:2200::180 ...\nConnecting to 2001:41d0:302:2200::180 ..."
- exe: './homer.py'
name: '[dot][check] Test all the IPs, force IPv4'
......@@ -203,7 +203,7 @@ tests:
- '--dot'
- 'dns.google'
- 'framagit.org'
partstdout: "on 8.8.8.8 ...\nConnecting to ('8.8.8.8', 853) ..."
partstdout: "on 8.8.8.8 ...\nConnecting to 8.8.8.8 ..."
- exe: './homer.py'
name: '[dot][check] Test all the IPs, force IPv4, check another IP'
......@@ -218,7 +218,7 @@ tests:
- '--dot'
- 'dns.google'
- 'framagit.org'
partstdout: "on 8.8.4.4 ...\nConnecting to ('8.8.4.4', 853) ..."
partstdout: "on 8.8.4.4 ...\nConnecting to 8.8.4.4 ..."
- exe: './homer.py'
name: '[dot][check] Test all the IPs, force IPv6'
......@@ -233,7 +233,7 @@ tests:
- '--dot'
- 'dns.google'
- 'framagit.org'
partstdout: "on 2001:4860:4860::8844 ...\nConnecting to ('2001:4860:4860::8844', 853, 0, 0) ..."
partstdout: "on 2001:4860:4860::8844 ...\nConnecting to 2001:4860:4860::8844 ..."
- exe: './homer.py'
name: '[dot][check] Test all the IPs, force IPv6, check another IP'
......@@ -248,7 +248,7 @@ tests:
- '--dot'
- 'dns.google'
- 'framagit.org'
partstdout: "on 2001:4860:4860::8888 ...\nConnecting to ('2001:4860:4860::8888', 853, 0, 0) ..."
partstdout: "on 2001:4860:4860::8888 ...\nConnecting to 2001:4860:4860::8888 ..."
- exe: './homer.py'
name: '[doh][check] Test all the IPs, force IPv4'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment