Skip to content

Commit

Permalink
fixed dns resolve speed
Browse files Browse the repository at this point in the history
  • Loading branch information
@mariotaku
mariotaku committed Dec 29, 2015
1 parent 2505b42 commit 70dce6f
Show file tree
Hide file tree
Showing 6 changed files with 150 additions and 51 deletions.
9 changes: 8 additions & 1 deletion ...onent.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/OAuthAuthorization.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;

import okio.ByteString;

/**
* Created by mariotaku on 15/2/4.
*/
Expand Down Expand Up @@ -208,7 +210,12 @@ private static String encode(final String value) {
private String generateOAuthNonce() {
final byte[] input = new byte[32];
secureRandom.nextBytes(input);
return Base64.encodeToString(input, Base64.NO_WRAP).replaceAll("[^\\w\\d]", "");
final ByteString byteString = ByteString.of(input);
final String encodedString = byteString.base64Url();
if (encodedString == null) {
throw new IllegalStateException("Bad nonce " + byteString.hex());
}
return encodedString.replaceAll("[^\\w\\d]", "");
}

}
2 changes: 1 addition & 1 deletion ...ponent.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public interface SharedPreferenceConstants {
String KEY_COMPOSE_ACCOUNTS = "compose_accounts";
@Preference(type = BOOLEAN, hasDefault = true, defaultBoolean = false)
String KEY_TCP_DNS_QUERY = "tcp_dns_query";
@Preference(type = STRING, hasDefault = true, defaultString = "8.8.8.8")
@Preference(type = STRING, hasDefault = true, defaultString = "")
String KEY_DNS_SERVER = "dns_server";
String KEY_CONNECTION_TIMEOUT = "connection_timeout";
@Preference(type = BOOLEAN, hasDefault = true, defaultBoolean = true)
Expand Down
13 changes: 13 additions & 0 deletions twidere/src/main/java/org/mariotaku/twidere/app/TwidereApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

import com.nostra13.universalimageloader.cache.disc.DiskCache;
import com.nostra13.universalimageloader.cache.disc.impl.ext.LruDiskCache;
import com.squareup.okhttp.Dns;

import org.acra.annotation.ReportsCrashes;
import org.apache.commons.lang3.ArrayUtils;
Expand All @@ -57,6 +58,7 @@
import org.mariotaku.twidere.util.dagger.ApplicationModule;
import org.mariotaku.twidere.util.imageloader.ReadOnlyDiskLRUNameCache;
import org.mariotaku.twidere.util.imageloader.URLFileNameGenerator;
import org.mariotaku.twidere.util.net.TwidereDns;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -237,6 +239,10 @@ public void onSharedPreferenceChanged(final SharedPreferences preferences, final
case KEY_PROXY_PORT:
reloadConnectivitySettings();
break;
case KEY_DNS_SERVER:
case KEY_TCP_DNS_QUERY:
reloadDnsSettings();
break;
case KEY_CONSUMER_KEY:
case KEY_CONSUMER_SECRET:
case KEY_API_URL_FORMAT:
Expand All @@ -255,6 +261,13 @@ public void onSharedPreferenceChanged(final SharedPreferences preferences, final
}
}

private void reloadDnsSettings() {
final Dns dns = getApplicationModule().getDns();
if (dns instanceof TwidereDns) {
((TwidereDns) dns).reloadDnsSettings();
}
}

public void reloadConnectivitySettings() {
getApplicationModule().reloadConnectivitySettings();
}
Expand Down
173 changes: 125 additions & 48 deletions twidere/src/main/java/org/mariotaku/twidere/util/net/TwidereDns.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@

import android.content.Context;
import android.content.SharedPreferences;
import android.os.SystemClock;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.util.SimpleArrayMap;
import android.util.Log;
import android.util.LruCache;
import android.util.TimingLogger;
Expand Down Expand Up @@ -52,91 +54,122 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;

public class TwidereDns implements Constants, Dns {

private static final String RESOLVER_LOGTAG = "TwidereDns";

private static final String DEFAULT_DNS_SERVER_ADDRESS = "8.8.8.8";

private final SharedPreferences mHostMapping, mPreferences;
private final LruCache<String, InetAddress[]> mHostCache = new LruCache<>(512);
private final String mDnsAddress;
private final HostCache mHostCache = new HostCache(512);
private final SystemHosts mSystemHosts;

private Resolver mDns;
private Resolver mResolver;
private TimingLogger mLogger;

public TwidereDns(final Context context) {
mLogger = new TimingLogger(RESOLVER_LOGTAG, "resolve");
mHostMapping = SharedPreferencesWrapper.getInstance(context, HOST_MAPPING_PREFERENCES_NAME, Context.MODE_PRIVATE);
mPreferences = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
final String address = mPreferences.getString(KEY_DNS_SERVER, DEFAULT_DNS_SERVER_ADDRESS);
mDnsAddress = isValidIpAddress(address) ? address : DEFAULT_DNS_SERVER_ADDRESS;
mSystemHosts = new SystemHosts();
}

private static boolean hostMatches(final String host, final String rule) {
if (rule == null || host == null) return false;
if (rule.startsWith(".")) return StringUtils.endsWithIgnoreCase(host, rule);
return host.equalsIgnoreCase(rule);
}

private static boolean isValidIpAddress(final String address) {
return InetAddressUtils.getInetAddressType(address) != 0;
}

@SuppressWarnings("unused")
public synchronized void removeCachedHost(final String host) {
mHostCache.remove(host);
}


@NonNull
private InetAddress[] resolveInternal(String originalHost, String host) throws IOException {
mLogger.reset();
private InetAddress[] resolveInternal(String originalHost, String host, int depth) throws IOException {
resetLog(originalHost);
// Return if host is an address
final InetAddress[] fromAddressString = fromAddressString(originalHost, host);
if (fromAddressString != null) {
if (BuildConfig.DEBUG) {
mLogger.dumpToLog();
addLogSplit(originalHost, host, "valid ip address", depth);
dumpLog();
}
return fromAddressString;
}
// Find from cache
final InetAddress[] fromCache = getCached(host);
if (fromCache != null) {
if (BuildConfig.DEBUG) {
mLogger.dumpToLog();
addLogSplit(originalHost, host, "hit cache", depth);
dumpLog();
}
return fromCache;
}
// Load from custom mapping
mLogger.addSplit("start custom mappong resolve");
addLogSplit(originalHost, host, "start custom mapping resolve", depth);
final InetAddress[] fromMapping = getFromMapping(host);
mLogger.addSplit("end custom mappong resolve");
addLogSplit(originalHost, host, "end custom mapping resolve", depth);
if (fromMapping != null) {
putCache(originalHost, fromMapping);
putCache(originalHost, fromMapping, -1, TimeUnit.SECONDS);
if (BuildConfig.DEBUG) {
mLogger.dumpToLog();
dumpLog();
}
return fromMapping;
}
// Load from /etc/hosts
mLogger.addSplit("start /etc/hosts resolve");
addLogSplit(originalHost, host, "start /etc/hosts resolve", depth);
final InetAddress[] fromSystemHosts = fromSystemHosts(host);
mLogger.addSplit("end /etc/hosts resolve");
addLogSplit(originalHost, host, "end /etc/hosts resolve", depth);
if (fromSystemHosts != null) {
putCache(originalHost, fromSystemHosts);
putCache(originalHost, fromSystemHosts, 60, TimeUnit.SECONDS);
if (BuildConfig.DEBUG) {
mLogger.dumpToLog();
dumpLog();
}
return fromSystemHosts;
}
// Use TCP DNS Query if enabled.
// final Resolver dns = getResolver();
// if (dns != null && mPreferences.getBoolean(KEY_TCP_DNS_QUERY, false)) {
// final InetAddress[] hostAddr = resolveDns(originalHost, host, dns);
// if (hostAddr != null) return hostAddr;
// }
mLogger.addSplit("start system default resolve");
final InetAddress[] defaultAddresses = InetAddress.getAllByName(host);
mLogger.addSplit("end system default resolve");
putCache(host, defaultAddresses);
addLogSplit(originalHost, host, "start resolver resolve", depth);
final InetAddress[] fromResolver = fromResolver(originalHost, host, depth);
addLogSplit(originalHost, host, "end resolver resolve", depth);
if (fromResolver != null) {
if (BuildConfig.DEBUG) {
dumpLog();
}
return fromResolver;
}
addLogSplit(originalHost, host, "start system default resolve", depth);
final InetAddress[] fromDefault = InetAddress.getAllByName(host);
addLogSplit(originalHost, host, "end system default resolve", depth);
putCache(host, fromDefault, 0, TimeUnit.SECONDS);
if (BuildConfig.DEBUG) {
mLogger.dumpToLog();
dumpLog();
}
return fromDefault;
}

private void dumpLog() {
mLogger.dumpToLog();
}

private void resetLog(String originalHost) {
mLogger.reset(RESOLVER_LOGTAG, originalHost);
}

private void addLogSplit(String originalHost, String host, String message, int depth) {
final StringBuilder sb = new StringBuilder();
for (int i = 0; i < depth; i++) {
sb.append(">");
}
return defaultAddresses;
sb.append(" ");
sb.append(host);
sb.append(": ");
sb.append(message);
mLogger.addSplit(sb.toString());
}

private InetAddress[] fromSystemHosts(String host) {
Expand All @@ -148,10 +181,11 @@ private InetAddress[] fromSystemHosts(String host) {
}

private InetAddress[] getCached(String host) {
return mHostCache.get(host);
return mHostCache.getValid(host);
}

private InetAddress[] resolveDns(String originalHost, String host, Resolver dns) throws IOException {
private InetAddress[] fromResolver(String originalHost, String host, int depth) throws IOException {
final Resolver dns = getResolver();
final Lookup lookup = new Lookup(new Name(host), Type.A, DClass.IN);
final Record[] records;
lookup.setResolver(dns);
Expand All @@ -163,7 +197,11 @@ private InetAddress[] resolveDns(String originalHost, String host, Resolver dns)
records = lookup.getAnswers();
final ArrayList<InetAddress> resolvedAddresses = new ArrayList<>();
// Test each IP address resolved.
long ttl = -1;
for (final Record record : records) {
if (ttl == -1) {
ttl = record.getTTL();
}
if (record instanceof ARecord) {
final InetAddress ipv4Addr = ((ARecord) record).getAddress();
resolvedAddresses.add(InetAddress.getByAddress(originalHost, ipv4Addr.getAddress()));
Expand All @@ -174,7 +212,7 @@ private InetAddress[] resolveDns(String originalHost, String host, Resolver dns)
}
if (!resolvedAddresses.isEmpty()) {
final InetAddress[] hostAddr = resolvedAddresses.toArray(new InetAddress[resolvedAddresses.size()]);
putCache(originalHost, hostAddr);
putCache(originalHost, hostAddr, ttl, TimeUnit.SECONDS);
if (BuildConfig.DEBUG) {
Log.v(RESOLVER_LOGTAG, "Resolved " + Arrays.toString(hostAddr));
}
Expand All @@ -184,14 +222,15 @@ private InetAddress[] resolveDns(String originalHost, String host, Resolver dns)

for (final Record record : records) {
if (record instanceof CNAMERecord)
return resolveInternal(originalHost, ((CNAMERecord) record).getTarget().toString());
return resolveInternal(originalHost, ((CNAMERecord) record).getTarget().toString(),
+1);
}
return null;
}

private void putCache(String host, InetAddress[] addresses) {
private void putCache(String host, InetAddress[] addresses, long ttl, TimeUnit unit) {
if (ArrayUtils.isEmpty(addresses) || ArrayUtils.contains(addresses, null)) return;
mHostCache.put(host, addresses);
mHostCache.put(host, addresses, ttl, unit);
}

private InetAddress[] fromAddressString(String host, String address) throws UnknownHostException {
Expand Down Expand Up @@ -225,28 +264,66 @@ private InetAddress[] getFromMappingInternal(String host, String origHost, boole
return null;
}

@NonNull
private Resolver getResolver() throws IOException {
if (mDns != null) return mDns;
return mDns = new SimpleResolver(mDnsAddress);
}

private static boolean hostMatches(final String host, final String rule) {
if (rule == null || host == null) return false;
if (rule.startsWith(".")) return StringUtils.endsWithIgnoreCase(host, rule);
return host.equalsIgnoreCase(rule);
if (mResolver != null) return mResolver;
final boolean tcp = mPreferences.getBoolean(KEY_TCP_DNS_QUERY, false);
final String address = mPreferences.getString(KEY_DNS_SERVER, null);
final SimpleResolver resolver;
if (isValidIpAddress(address)) {
resolver = new SimpleResolver(address);
} else {
resolver = new SimpleResolver();
}
resolver.setTCP(tcp);
return mResolver = resolver;
}

private static boolean isValidIpAddress(final String address) {
return InetAddressUtils.getInetAddressType(address) != 0;
public void reloadDnsSettings() {
mResolver = null;
}

@Override
public List<InetAddress> lookup(String hostname) throws UnknownHostException {
try {
return Arrays.asList(resolveInternal(hostname, hostname));
return Arrays.asList(resolveInternal(hostname, hostname, 0));
} catch (IOException e) {
if (e instanceof UnknownHostException) throw (UnknownHostException) e;
throw new UnknownHostException("Unable to resolve address " + e.getMessage());
}
}

private static class HostCache extends LruCache<String, InetAddress[]> {

private SimpleArrayMap<String, Long> ttlMap = new SimpleArrayMap<>();

public HostCache(int maxSize) {
super(maxSize);
}

public synchronized void put(String host, InetAddress[] addresses, long ttl, TimeUnit unit) {
// Don't cache this entry if ttl == 0
if (ttl == 0) return;
put(host, addresses);
// ttl < 0 means permanent entry
if (ttl > 0) {
ttlMap.put(host, SystemClock.elapsedRealtime() + unit.toMillis(ttl));
}
}

public InetAddress[] getValid(String host) {
cleanExpired();
return get(host);
}


private synchronized void cleanExpired() {
for (int i = ttlMap.size() - 1; i >= 0; i--) {
if (ttlMap.valueAt(i) < SystemClock.elapsedRealtime()) {
remove(ttlMap.keyAt(i));
ttlMap.removeAt(i);
}
}
}
}
}
3 changes: 3 additions & 0 deletions twidere/src/main/jni/inetaddressutils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
JNIEXPORT jint JNICALL
Java_org_mariotaku_twidere_util_net_InetAddressUtils_getInetAddressType(JNIEnv *env, jclass type,
jstring input_) {
if (input_ == NULL) return AF_UNSPEC;
const char *input = (*env)->GetStringUTFChars(env, input_, 0);

struct sockaddr addr;
Expand All @@ -23,6 +24,8 @@ JNIEXPORT jobject JNICALL
Java_org_mariotaku_twidere_util_net_InetAddressUtils_getResolvedIPAddress(JNIEnv *env, jclass type,
jstring host_,
jstring address_) {
if (address_ == NULL) return NULL;

const char *address = (*env)->GetStringUTFChars(env, address_, 0);

jclass addressClass = (*env)->FindClass(env, "java/net/InetAddress");
Expand Down
1 change: 0 additions & 1 deletion twidere/src/main/res/xml/preferences_advanced_network.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
android:title="@string/tcp_dns_query"/>

<org.mariotaku.twidere.preference.SummaryEditTextPreference
android:defaultValue="8.8.8.8"
android:dialogTitle="@string/dns_server"
android:inputType="textVisiblePassword"
android:key="dns_server"
Expand Down

0 comments on commit 70dce6f

Please sign in to comment.