NDT: Fix JSON encoding of extended login (ticket #2672)

Disable middlebox and firewall tests
Don't NPE if no middlebox test
Change version to match measurement-kit
Don't prefer IPv6, it is unreliable
Disable SSL by default, unreliable
Add 30s timeout to initial handshake to prevent long hangs on SSL
This commit is contained in:
zzz
2019-12-03 14:57:32 +00:00
parent f2f29d6a6c
commit 9289a6daa9
5 changed files with 56 additions and 9 deletions

View File

@@ -53,7 +53,8 @@ public class MLabRunner {
// use ndt_ssl for test over ssl
private static final String NS_URL_SSL_SSL = "https://mlab-ns.appspot.com/ndt_ssl?format=json";
private static final String PROP_SSL = "routerconsole.bwtest.useSSL";
private static final boolean DEFAULT_USE_SSL = true;
// SSL hangs far too often
private static final boolean DEFAULT_USE_SSL = false;
private static final long NS_TIMEOUT = 20*1000;
private final I2PAppContext _context;
private final Log _log;