narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

permanently cache last resolver result

Browse source
This commit is contained in:
Daniel Gultsch 2018-01-21 20:41:30 +01:00
parent 3c4ba7e0ce
commit 78c5c508b3
3 changed files with 321 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View file

@ -52,6 +52,7 @@ import eu.siacs.conversations.entities.ServiceDiscoveryResult;
import eu.siacs.conversations.services.ShortcutService; import eu.siacs.conversations.services.ShortcutService;
import eu.siacs.conversations.utils.CryptoHelper; import eu.siacs.conversations.utils.CryptoHelper;
import eu.siacs.conversations.utils.MimeUtils; import eu.siacs.conversations.utils.MimeUtils;
import eu.siacs.conversations.utils.Resolver;
import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.xmpp.jid.InvalidJidException;
import eu.siacs.conversations.xmpp.jid.Jid; import eu.siacs.conversations.xmpp.jid.Jid;
import eu.siacs.conversations.xmpp.mam.MamReference; import eu.siacs.conversations.xmpp.mam.MamReference;
@ -61,7 +62,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
private static DatabaseBackend instance = null; private static DatabaseBackend instance = null;
private static final String DATABASE_NAME = "history"; private static final String DATABASE_NAME = "history";
private static final int DATABASE_VERSION = 38; private static final int DATABASE_VERSION = 39;
private static String CREATE_CONTATCS_STATEMENT = "create table " private static String CREATE_CONTATCS_STATEMENT = "create table "
+ Contact.TABLENAME + "(" + Contact.ACCOUNT + " TEXT, " + Contact.TABLENAME + "(" + Contact.ACCOUNT + " TEXT, "
@ -148,9 +149,18 @@ public class DatabaseBackend extends SQLiteOpenHelper {
+ ") ON CONFLICT IGNORE" + ") ON CONFLICT IGNORE"
+ ");"; + ");";
private static String START_TIMES_TABLE = "start_times"; private static String RESOLVER_RESULTS_TABLENAME = "resolver_results";
private static String CREATE_START_TIMES_TABLE = "create table "+START_TIMES_TABLE+" (timestamp NUMBER);"; private static String CREATE_RESOLVER_RESULTS_TABLE = "create table "+RESOLVER_RESULTS_TABLENAME+"("
+ Resolver.Result.DOMAIN + " TEXT,"
+ Resolver.Result.HOSTNAME + " TEXT,"
+ Resolver.Result.IP + " BLOB,"
+ Resolver.Result.PRIORITY + " NUMBER,"
+ Resolver.Result.DIRECT_TLS + " NUMBER,"
+ Resolver.Result.AUTHENTICATED + " NUMBER,"
+ Resolver.Result.PORT + " NUMBER,"
+ "UNIQUE("+Resolver.Result.DOMAIN+") ON CONFLICT REPLACE"
+ ");";
private static String CREATE_MESSAGE_TIME_INDEX = "create INDEX message_time_index ON "+Message.TABLENAME+"("+Message.TIME_SENT+")"; private static String CREATE_MESSAGE_TIME_INDEX = "create INDEX message_time_index ON "+Message.TABLENAME+"("+Message.TIME_SENT+")";
private static String CREATE_MESSAGE_CONVERSATION_INDEX = "create INDEX message_conversation_index ON "+Message.TABLENAME+"("+Message.CONVERSATION+")"; private static String CREATE_MESSAGE_CONVERSATION_INDEX = "create INDEX message_conversation_index ON "+Message.TABLENAME+"("+Message.CONVERSATION+")";
@ -213,7 +223,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
db.execSQL(CREATE_SIGNED_PREKEYS_STATEMENT); db.execSQL(CREATE_SIGNED_PREKEYS_STATEMENT);
db.execSQL(CREATE_IDENTITIES_STATEMENT); db.execSQL(CREATE_IDENTITIES_STATEMENT);
db.execSQL(CREATE_PRESENCE_TEMPLATES_STATEMENT); db.execSQL(CREATE_PRESENCE_TEMPLATES_STATEMENT);
db.execSQL(CREATE_START_TIMES_TABLE); db.execSQL(CREATE_RESOLVER_RESULTS_TABLE);
} }
@Override @Override
@ -369,9 +379,6 @@ public class DatabaseBackend extends SQLiteOpenHelper {
if (oldVersion < 29 && newVersion >= 29) { if (oldVersion < 29 && newVersion >= 29) {
db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.ERROR_MESSAGE + " TEXT"); db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.ERROR_MESSAGE + " TEXT");
} }
if (oldVersion < 30 && newVersion >= 30) {
db.execSQL(CREATE_START_TIMES_TABLE);
}
if (oldVersion >= 15 && oldVersion < 31 && newVersion >= 31) { if (oldVersion >= 15 && oldVersion < 31 && newVersion >= 31) {
db.execSQL("ALTER TABLE "+ SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN "+SQLiteAxolotlStore.TRUST + " TEXT"); db.execSQL("ALTER TABLE "+ SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN "+SQLiteAxolotlStore.TRUST + " TEXT");
db.execSQL("ALTER TABLE "+ SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN "+SQLiteAxolotlStore.ACTIVE + " NUMBER"); db.execSQL("ALTER TABLE "+ SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN "+SQLiteAxolotlStore.ACTIVE + " NUMBER");
@ -465,6 +472,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
if (oldVersion < 38 && newVersion >= 38) { if (oldVersion < 38 && newVersion >= 38) {
db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.MARKABLE + " NUMBER DEFAULT 0"); db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.MARKABLE + " NUMBER DEFAULT 0");
} }
if (oldVersion < 39 && newVersion >= 39) {
db.execSQL(CREATE_RESOLVER_RESULTS_TABLE);
}
} }
private static ContentValues createFingerprintStatusContentValues(FingerprintStatus.Trust trust, boolean active) { private static ContentValues createFingerprintStatusContentValues(FingerprintStatus.Trust trust, boolean active) {
@ -605,6 +616,28 @@ public class DatabaseBackend extends SQLiteOpenHelper {
return result; return result;
} }
public void saveResolverResult(String domain, Resolver.Result result) {
SQLiteDatabase db = this.getWritableDatabase();
ContentValues contentValues = result.toContentValues();
contentValues.put(Resolver.Result.DOMAIN,domain);
db.insert(RESOLVER_RESULTS_TABLENAME, null, contentValues);
}
public Resolver.Result findResolverResult(String domain) {
SQLiteDatabase db = this.getReadableDatabase();
String where = Resolver.Result.DOMAIN+"=?";
String[] whereArgs = {domain};
Cursor cursor = db.query(RESOLVER_RESULTS_TABLENAME,null,where,whereArgs,null,null,null);
Resolver.Result result = null;
if (cursor != null) {
if (cursor.moveToFirst()) {
result = Resolver.Result.fromCursor(cursor);
}
cursor.close();
}
return result;
}
public void insertPresenceTemplate(PresenceTemplate template) { public void insertPresenceTemplate(PresenceTemplate template) {
SQLiteDatabase db = this.getWritableDatabase(); SQLiteDatabase db = this.getWritableDatabase();
db.insert(PresenceTemplate.TABELNAME, null, template.getContentValues()); db.insert(PresenceTemplate.TABELNAME, null, template.getContentValues());

470
src/main/java/eu/siacs/conversations/utils/Resolver.java
View file

@ -1,12 +1,14 @@
package eu.siacs.conversations.utils; package eu.siacs.conversations.utils;
import android.content.Context; import android.content.ContentValues;
import android.database.Cursor;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.Log; import android.util.Log;
import java.io.IOException; import java.io.IOException;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
@ -34,231 +36,293 @@ import eu.siacs.conversations.services.XmppConnectionService;
public class Resolver { public class Resolver {
private static final String DIRECT_TLS_SERVICE = "_xmpps-client"; private static final String DIRECT_TLS_SERVICE = "_xmpps-client";
private static final String STARTTLS_SERICE = "_xmpp-client"; private static final String STARTTLS_SERICE = "_xmpp-client";
private static final String NETWORK_IS_UNREACHABLE = "Network is unreachable"; private static final String NETWORK_IS_UNREACHABLE = "Network is unreachable";
private static XmppConnectionService SERVICE = null; private static XmppConnectionService SERVICE = null;
public static void init(XmppConnectionService service) { public static void init(XmppConnectionService service) {
Resolver.SERVICE = service; Resolver.SERVICE = service;
DNSClient.removeDNSServerLookupMechanism(AndroidUsingExec.INSTANCE); DNSClient.removeDNSServerLookupMechanism(AndroidUsingExec.INSTANCE);
DNSClient.addDnsServerLookupMechanism(AndroidUsingExecLowPriority.INSTANCE); DNSClient.addDnsServerLookupMechanism(AndroidUsingExecLowPriority.INSTANCE);
DNSClient.addDnsServerLookupMechanism(new AndroidUsingLinkProperties(service)); DNSClient.addDnsServerLookupMechanism(new AndroidUsingLinkProperties(service));
} }
public static List<Result> resolve(String domain) throws NetworkIsUnreachableException { public static List<Result> resolve(String domain) throws NetworkIsUnreachableException {
List<Result> results = new ArrayList<>(); List<Result> results = new ArrayList<>();
HashSet<String> messages = new HashSet<>(); HashSet<String> messages = new HashSet<>();
try { try {
results.addAll(resolveSrv(domain, true)); results.addAll(resolveSrv(domain, true));
} catch (MultipleIoException e) { } catch (MultipleIoException e) {
messages.addAll(extractMessages(e)); messages.addAll(extractMessages(e));
} catch (Throwable throwable) { } catch (Throwable throwable) {
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": error resolving SRV record (direct TLS)",throwable); Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving SRV record (direct TLS)", throwable);
} }
try { try {
results.addAll(resolveSrv(domain, false)); results.addAll(resolveSrv(domain, false));
} catch (MultipleIoException e) { } catch (MultipleIoException e) {
messages.addAll(extractMessages(e)); messages.addAll(extractMessages(e));
} catch (Throwable throwable) { } catch (Throwable throwable) {
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": error resolving SRV record (STARTTLS)",throwable); Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving SRV record (STARTTLS)", throwable);
} }
if (results.size() == 0) { if (results.size() == 0) {
if (messages.size() == 1 && messages.contains(NETWORK_IS_UNREACHABLE)) { if (messages.size() == 1 && messages.contains(NETWORK_IS_UNREACHABLE)) {
throw new NetworkIsUnreachableException(); throw new NetworkIsUnreachableException();
} }
results.addAll(resolveNoSrvRecords(DNSName.from(domain),true)); results.addAll(resolveNoSrvRecords(DNSName.from(domain), true));
} }
Collections.sort(results); Collections.sort(results);
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": "+results.toString()); Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": " + results.toString());
return results; return results;
} }
private static HashSet<String> extractMessages(MultipleIoException e) { private static HashSet<String> extractMessages(MultipleIoException e) {
HashSet<String> messages = new HashSet<>(); HashSet<String> messages = new HashSet<>();
for(Exception inner : e.getExceptions()) { for (Exception inner : e.getExceptions()) {
if (inner instanceof MultipleIoException) { if (inner instanceof MultipleIoException) {
messages.addAll(extractMessages((MultipleIoException) inner)); messages.addAll(extractMessages((MultipleIoException) inner));
} else { } else {
messages.add(inner.getMessage()); messages.add(inner.getMessage());
} }
} }
return messages; return messages;
} }
private static List<Result> resolveSrv(String domain, final boolean directTls) throws IOException { private static List<Result> resolveSrv(String domain, final boolean directTls) throws IOException {
if (Thread.currentThread().isInterrupted()) { if (Thread.currentThread().isInterrupted()) {
return Collections.emptyList(); return Collections.emptyList();
} }
DNSName dnsName = DNSName.from((directTls ? DIRECT_TLS_SERVICE : STARTTLS_SERICE)+"._tcp."+domain); DNSName dnsName = DNSName.from((directTls ? DIRECT_TLS_SERVICE : STARTTLS_SERICE) + "._tcp." + domain);
ResolverResult<SRV> result = resolveWithFallback(dnsName,SRV.class); ResolverResult<SRV> result = resolveWithFallback(dnsName, SRV.class);
List<Result> results = new ArrayList<>(); List<Result> results = new ArrayList<>();
for(SRV record : result.getAnswersOrEmptySet()) { for (SRV record : result.getAnswersOrEmptySet()) {
final boolean addedIPv4 = results.addAll(resolveIp(record,A.class,result.isAuthenticData(),directTls)); final boolean addedIPv4 = results.addAll(resolveIp(record, A.class, result.isAuthenticData(), directTls));
results.addAll(resolveIp(record,AAAA.class,result.isAuthenticData(),directTls)); results.addAll(resolveIp(record, AAAA.class, result.isAuthenticData(), directTls));
if (!addedIPv4 && !Thread.currentThread().isInterrupted()) { if (!addedIPv4 && !Thread.currentThread().isInterrupted()) {
Result resolverResult = Result.fromRecord(record, directTls); Result resolverResult = Result.fromRecord(record, directTls);
resolverResult.authenticated = resolverResult.isAuthenticated(); resolverResult.authenticated = resolverResult.isAuthenticated();
results.add(resolverResult); results.add(resolverResult);
} }
} }
return results; return results;
} }
private static <D extends InternetAddressRR> List<Result> resolveIp(SRV srv, Class<D> type, boolean authenticated, boolean directTls) { private static <D extends InternetAddressRR> List<Result> resolveIp(SRV srv, Class<D> type, boolean authenticated, boolean directTls) {
if (Thread.currentThread().isInterrupted()) { if (Thread.currentThread().isInterrupted()) {
return Collections.emptyList(); return Collections.emptyList();
} }
List<Result> list = new ArrayList<>(); List<Result> list = new ArrayList<>();
try { try {
ResolverResult<D> results = resolveWithFallback(srv.name,type, authenticated); ResolverResult<D> results = resolveWithFallback(srv.name, type, authenticated);
for (D record : results.getAnswersOrEmptySet()) { for (D record : results.getAnswersOrEmptySet()) {
Result resolverResult = Result.fromRecord(srv, directTls); Result resolverResult = Result.fromRecord(srv, directTls);
resolverResult.authenticated = results.isAuthenticData() && authenticated; resolverResult.authenticated = results.isAuthenticData() && authenticated;
resolverResult.ip = record.getInetAddress(); resolverResult.ip = record.getInetAddress();
list.add(resolverResult); list.add(resolverResult);
} }
} catch (Throwable t) { } catch (Throwable t) {
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": error resolving "+type.getSimpleName()+" "+t.getMessage()); Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " " + t.getMessage());
} }
return list; return list;
} }
private static List<Result> resolveNoSrvRecords(DNSName dnsName, boolean withCnames) { private static List<Result> resolveNoSrvRecords(DNSName dnsName, boolean withCnames) {
List<Result> results = new ArrayList<>(); List<Result> results = new ArrayList<>();
try { try {
for(A a : resolveWithFallback(dnsName,A.class,false).getAnswersOrEmptySet()) { for (A a : resolveWithFallback(dnsName, A.class, false).getAnswersOrEmptySet()) {
results.add(Result.createDefault(dnsName,a.getInetAddress())); results.add(Result.createDefault(dnsName, a.getInetAddress()));
} }
for(AAAA aaaa : resolveWithFallback(dnsName,AAAA.class,false).getAnswersOrEmptySet()) { for (AAAA aaaa : resolveWithFallback(dnsName, AAAA.class, false).getAnswersOrEmptySet()) {
results.add(Result.createDefault(dnsName,aaaa.getInetAddress())); results.add(Result.createDefault(dnsName, aaaa.getInetAddress()));
} }
if (results.size() == 0 && withCnames) { if (results.size() == 0 && withCnames) {
for (CNAME cname : resolveWithFallback(dnsName, CNAME.class, false).getAnswersOrEmptySet()) { for (CNAME cname : resolveWithFallback(dnsName, CNAME.class, false).getAnswersOrEmptySet()) {
results.addAll(resolveNoSrvRecords(cname.name, false)); results.addAll(resolveNoSrvRecords(cname.name, false));
} }
} }
} catch (Throwable throwable) { } catch (Throwable throwable) {
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + "error resolving fallback records",throwable); Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + "error resolving fallback records", throwable);
} }
results.add(Result.createDefault(dnsName)); results.add(Result.createDefault(dnsName));
return results; return results;
} }
private static <D extends Data> ResolverResult<D> resolveWithFallback(DNSName dnsName, Class<D> type) throws IOException { private static <D extends Data> ResolverResult<D> resolveWithFallback(DNSName dnsName, Class<D> type) throws IOException {
return resolveWithFallback(dnsName,type,validateHostname()); return resolveWithFallback(dnsName, type, validateHostname());
} }
private static <D extends Data> ResolverResult<D> resolveWithFallback(DNSName dnsName, Class<D> type, boolean validateHostname) throws IOException { private static <D extends Data> ResolverResult<D> resolveWithFallback(DNSName dnsName, Class<D> type, boolean validateHostname) throws IOException {
final Question question = new Question(dnsName, Record.TYPE.getType(type)); final Question question = new Question(dnsName, Record.TYPE.getType(type));
if (!validateHostname) { if (!validateHostname) {
return ResolverApi.INSTANCE.resolve(question); return ResolverApi.INSTANCE.resolve(question);
} }
try { try {
return DnssecResolverApi.INSTANCE.resolveDnssecReliable(question); return DnssecResolverApi.INSTANCE.resolveDnssecReliable(question);
} catch (DNSSECResultNotAuthenticException e) { } catch (DNSSECResultNotAuthenticException e) {
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", e); Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", e);
} catch (IOException e) { } catch (IOException e) {
throw e; throw e;
} catch (Throwable throwable) { } catch (Throwable throwable) {
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", throwable); Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", throwable);
} }
return ResolverApi.INSTANCE.resolve(question); return ResolverApi.INSTANCE.resolve(question);
} }
private static boolean validateHostname() { private static boolean validateHostname() {
return SERVICE != null && SERVICE.getBooleanPreference("validate_hostname", R.bool.validate_hostname); return SERVICE != null && SERVICE.getBooleanPreference("validate_hostname", R.bool.validate_hostname);
} }
public static class Result implements Comparable<Result> { public static class Result implements Comparable<Result> {
private InetAddress ip; @Override
private DNSName hostname; public boolean equals(Object o) {
private int port = 5222; if (this == o) return true;
private boolean directTls = false; if (o == null || getClass() != o.getClass()) return false;
private boolean authenticated =false;
private int priority;
public InetAddress getIp() { Result result = (Result) o;
return ip;
}
public int getPort() { if (port != result.port) return false;
return port; if (directTls != result.directTls) return false;
} if (authenticated != result.authenticated) return false;
if (priority != result.priority) return false;
if (ip != null ? !ip.equals(result.ip) : result.ip != null) return false;
return hostname != null ? hostname.equals(result.hostname) : result.hostname == null;
}
public DNSName getHostname() { @Override
return hostname; public int hashCode() {
} int result = ip != null ? ip.hashCode() : 0;
result = 31 * result + (hostname != null ? hostname.hashCode() : 0);
result = 31 * result + port;
result = 31 * result + (directTls ? 1 : 0);
result = 31 * result + (authenticated ? 1 : 0);
result = 31 * result + priority;
return result;
}
public boolean isDirectTls() { public static final String DOMAIN = "domain";
return directTls;
}
public boolean isAuthenticated() { public static final String IP = "ip";
return authenticated; public static final String HOSTNAME = "hostname";
} public static final String PORT = "port";
public static final String PRIORITY = "priority";
public static final String DIRECT_TLS = "directTls";
public static final String AUTHENTICATED = "authenticated";
@Override private InetAddress ip;
public String toString() { private DNSName hostname;
return "Result{" + private int port = 5222;
"ip='" + (ip==null?null:ip.getHostAddress()) + '\'' + private boolean directTls = false;
", hostame='" + hostname.toString() + '\'' + private boolean authenticated = false;
", port=" + port + private int priority;
", directTls=" + directTls +
", authenticated=" + authenticated +
", priority=" + priority +
'}';
}
@Override public InetAddress getIp() {
public int compareTo(@NonNull Result result) { return ip;
if (result.priority == priority) { }
if (directTls == result.directTls) {
if (ip == null && result.ip == null) {
return 0;
} else if (ip != null && result.ip != null) {
if (ip instanceof Inet4Address && result.ip instanceof Inet4Address) {
return 0;
} else {
return ip instanceof Inet4Address ? -1 : 1;
}
} else {
return ip != null ? -1 : 1;
}
} else {
return directTls ? -1 : 1;
}
} else {
return priority - result.priority;
}
}
public static Result fromRecord(SRV srv, boolean directTls) { public int getPort() {
Result result = new Result(); return port;
result.port = srv.port; }
result.hostname = srv.name;
result.directTls = directTls;
result.priority = srv.priority;
return result;
}
public static Result createDefault(DNSName hostname, InetAddress ip) { public DNSName getHostname() {
Result result = new Result(); return hostname;
result.port = 5222; }
result.hostname = hostname;
result.ip = ip;
return result;
}
public static Result createDefault(DNSName hostname) { public boolean isDirectTls() {
return createDefault(hostname,null); return directTls;
} }
}
public static class NetworkIsUnreachableException extends Exception {
} public boolean isAuthenticated() {
return authenticated;
}
@Override
public String toString() {
return "Result{" +
"ip='" + (ip == null ? null : ip.getHostAddress()) + '\'' +
", hostame='" + hostname.toString() + '\'' +
", port=" + port +
", directTls=" + directTls +
", authenticated=" + authenticated +
", priority=" + priority +
'}';
}
@Override
public int compareTo(@NonNull Result result) {
if (result.priority == priority) {
if (directTls == result.directTls) {
if (ip == null && result.ip == null) {
return 0;
} else if (ip != null && result.ip != null) {
if (ip instanceof Inet4Address && result.ip instanceof Inet4Address) {
return 0;
} else {
return ip instanceof Inet4Address ? -1 : 1;
}
} else {
return ip != null ? -1 : 1;
}
} else {
return directTls ? -1 : 1;
}
} else {
return priority - result.priority;
}
}
public static Result fromRecord(SRV srv, boolean directTls) {
Result result = new Result();
result.port = srv.port;
result.hostname = srv.name;
result.directTls = directTls;
result.priority = srv.priority;
return result;
}
public static Result createDefault(DNSName hostname, InetAddress ip) {
Result result = new Result();
result.port = 5222;
result.hostname = hostname;
result.ip = ip;
return result;
}
public static Result createDefault(DNSName hostname) {
return createDefault(hostname, null);
}
public static Result fromCursor(Cursor cursor) {
final Result result = new Result();
try {
result.ip = InetAddress.getByAddress(cursor.getBlob(cursor.getColumnIndex(IP)));
} catch (UnknownHostException e) {
result.ip = null;
}
result.hostname = DNSName.from(cursor.getString(cursor.getColumnIndex(HOSTNAME)));
result.port = cursor.getInt(cursor.getColumnIndex(PORT));
result.priority = cursor.getInt(cursor.getColumnIndex(PRIORITY));
result.authenticated = cursor.getInt(cursor.getColumnIndex(AUTHENTICATED)) > 0;
result.directTls = cursor.getInt(cursor.getColumnIndex(DIRECT_TLS)) > 0;
return result;
}
public ContentValues toContentValues() {
final ContentValues contentValues = new ContentValues();
contentValues.put(IP, ip.getAddress());
contentValues.put(HOSTNAME, hostname.toString());
contentValues.put(PORT, port);
contentValues.put(PRIORITY, priority);
contentValues.put(DIRECT_TLS, directTls ? 1 : 0);
contentValues.put(AUTHENTICATED, authenticated ? 1 : 0);
return contentValues;
}
}
public static class NetworkIsUnreachableException extends Exception {
}
} }

14
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -351,7 +351,18 @@ public class XmppConnection implements Runnable {
throw new IOException(e.getMessage()); throw new IOException(e.getMessage());
} }
} else { } else {
final String domain = account.getJid().getDomainpart();
List<Resolver.Result> results = Resolver.resolve(account.getJid().getDomainpart()); List<Resolver.Result> results = Resolver.resolve(account.getJid().getDomainpart());
Resolver.Result storedBackupResult;
if (!Thread.currentThread().isInterrupted()) {
storedBackupResult = mXmppConnectionService.databaseBackend.findResolverResult(domain);
if (storedBackupResult != null && !results.contains(storedBackupResult)) {
results.add(storedBackupResult);
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": loaded backup resolver result from db: " + storedBackupResult);
}
} else {
storedBackupResult = null;
}
for (Iterator<Resolver.Result> iterator = results.iterator(); iterator.hasNext(); ) { for (Iterator<Resolver.Result> iterator = results.iterator(); iterator.hasNext(); ) {
final Resolver.Result result = iterator.next(); final Resolver.Result result = iterator.next();
if (Thread.currentThread().isInterrupted()) { if (Thread.currentThread().isInterrupted()) {
@ -400,6 +411,9 @@ public class XmppConnection implements Runnable {
} }
} }
if (startXmpp(localSocket)) { if (startXmpp(localSocket)) {
if (!result.equals(storedBackupResult)) {
mXmppConnectionService.databaseBackend.saveResolverResult(domain, result);
}
break; // successfully connected to server that speaks xmpp break; // successfully connected to server that speaks xmpp
} else { } else {
localSocket.close(); localSocket.close();