n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release v1.9.0 & Improved DNSTest

Browse Source
This commit is contained in:
PeratX 2017-06-12 20:40:24 +08:00
parent 0afb7553a9
commit 1a3eb4a376
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
applicationId "org.itxtech.daedalus" applicationId "org.itxtech.daedalus"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 8 versionCode 9
versionName "1.8.0" versionName "1.9.0"
buildConfigField "String", "BUILD_TIME", "\"${System.currentTimeMillis()}\"" buildConfigField "String", "BUILD_TIME", "\"${System.currentTimeMillis()}\""
buildConfigField "String", "GIT_COMMIT", "\"${gitCommit}\"" buildConfigField "String", "GIT_COMMIT", "\"${gitCommit}\""

28
app/src/main/java/org/itxtech/daedalus/fragment/DnsTestFragment.java
View File

@ -22,7 +22,6 @@ import org.itxtech.daedalus.util.server.DNSServerHelper;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Random; import java.util.Random;
/** /**
@ -110,16 +109,29 @@ public class DnsTestFragment extends ToolbarFragment {
testDomain = Daedalus.DEFAULT_TEST_DOMAINS[0]; testDomain = Daedalus.DEFAULT_TEST_DOMAINS[0];
} }
StringBuilder testText = new StringBuilder(); StringBuilder testText = new StringBuilder();
ArrayList<String> dnsServers = new ArrayList<String>() {{ ArrayList<AbstractDNSServer> dnsServers = new ArrayList<AbstractDNSServer>() {{
add(((AbstractDNSServer) spinnerServerChoice.getSelectedItem()).getAddress()); add(((AbstractDNSServer) spinnerServerChoice.getSelectedItem()));
String servers = Daedalus.getPrefs().getString("dns_test_servers", ""); String servers = Daedalus.getPrefs().getString("dns_test_servers", "");
if (!servers.equals("")) { if (!servers.equals("")) {
addAll(Arrays.asList(servers.split(","))); for (String server : servers.split(",")) {
if (server.contains(":")) {
String[] pieces = servers.split(":");
int port = AbstractDNSServer.DNS_SERVER_DEFAULT_PORT;
try {
port = Integer.parseInt(pieces[1]);
} catch (Exception e) {
Logger.logException(e);
}
add(new AbstractDNSServer(pieces[0], port));
} else {
add(new AbstractDNSServer(server, AbstractDNSServer.DNS_SERVER_DEFAULT_PORT));
}
}
} }
}}; }};
DNSQuery dnsQuery = new DNSQuery(); DNSQuery dnsQuery = new DNSQuery();
Record.TYPE type = ((Type) spinnerType.getSelectedItem()).getType(); Record.TYPE type = ((Type) spinnerType.getSelectedItem()).getType();
for (String dnsServer : dnsServers) { for (AbstractDNSServer dnsServer : dnsServers) {
testText = testServer(dnsQuery, type, dnsServer, testDomain, testText); testText = testServer(dnsQuery, type, dnsServer, testDomain, testText);
} }
mHandler.obtainMessage(DnsTestHandler.MSG_TEST_DONE).sendToTarget(); mHandler.obtainMessage(DnsTestHandler.MSG_TEST_DONE).sendToTarget();
@ -129,9 +141,9 @@ public class DnsTestFragment extends ToolbarFragment {
} }
private StringBuilder testServer(DNSQuery dnsQuery, Record.TYPE type, String server, String domain, StringBuilder testText) { private StringBuilder testServer(DNSQuery dnsQuery, Record.TYPE type, AbstractDNSServer server, String domain, StringBuilder testText) {
Logger.debug("Testing DNS server " + server); Logger.debug("Testing DNS server " + server);
testText.append(getString(R.string.test_domain)).append(" ").append(domain).append("\n").append(getString(R.string.test_dns_server)).append(" ").append(server); testText.append(getString(R.string.test_domain)).append(" ").append(domain).append("\n").append(getString(R.string.test_dns_server)).append(" ").append(server.getAddress()).append(":").append(server.getPort());
mHandler.obtainMessage(DnsTestHandler.MSG_DISPLAY_STATUS, testText.toString()).sendToTarget(); mHandler.obtainMessage(DnsTestHandler.MSG_DISPLAY_STATUS, testText.toString()).sendToTarget();
@ -143,7 +155,7 @@ public class DnsTestFragment extends ToolbarFragment {
message.getEdnsBuilder().setUdpPayloadSize(1024).setDnssecOk(false); message.getEdnsBuilder().setUdpPayloadSize(1024).setDnssecOk(false);
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
DNSMessage response = dnsQuery.query(message.build(), InetAddress.getByName(server), 53); DNSMessage response = dnsQuery.query(message.build(), InetAddress.getByName(server.getAddress()), server.getPort());
long endTime = System.currentTimeMillis(); long endTime = System.currentTimeMillis();
if (response.answerSection.size() > 0) { if (response.answerSection.size() > 0) {

6
app/src/main/java/org/itxtech/daedalus/util/server/AbstractDNSServer.java
View File

@ -11,7 +11,7 @@ package org.itxtech.daedalus.util.server;
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
*/ */
abstract public class AbstractDNSServer { public class AbstractDNSServer {
public static final int DNS_SERVER_DEFAULT_PORT = 53; public static final int DNS_SERVER_DEFAULT_PORT = 53;
protected String address; protected String address;
@ -38,7 +38,9 @@ abstract public class AbstractDNSServer {
return port; return port;
} }
public abstract String getName(); public String getName() {
return "";
}
@Override @Override
public String toString() { public String toString() {