mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prefer non expired DNS records

This commit is contained in:
M66B 2019-02-17 11:14:56 +00:00
parent 4bbd7a4910
commit be05d4c9d5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/netguard/DatabaseHelper.java
View File

@ -859,6 +859,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
} }
public String getQName(int uid, String ip) { public String getQName(int uid, String ip) {
long now = new Date().getTime();
lock.readLock().lock(); lock.readLock().lock();
try { try {
SQLiteDatabase db = this.getReadableDatabase(); SQLiteDatabase db = this.getReadableDatabase();
@ -869,7 +870,10 @@ public class DatabaseHelper extends SQLiteOpenHelper {
query += " LEFT JOIN access AS a"; query += " LEFT JOIN access AS a";
query += " ON a.daddr = d.qname AND a.uid = " + uid; query += " ON a.daddr = d.qname AND a.uid = " + uid;
query += " WHERE d.resource = '" + ip.replace("'", "''") + "'"; query += " WHERE d.resource = '" + ip.replace("'", "''") + "'";
query += " ORDER BY CASE a.daddr WHEN NULL THEN 1 ELSE 0 END, d.qname"; query += " ORDER BY";
query += " CASE WHEN a.daddr IS NULL THEN 1 ELSE 0 END";
query += ", CASE WHEN d.time + d.ttl < " + now + " THEN 1 ELSE 0 END";
query += ", d.qname";
query += " LIMIT 1"; query += " LIMIT 1";
return db.compileStatement(query).simpleQueryForString(); return db.compileStatement(query).simpleQueryForString();
} catch (SQLiteDoneException ignored) { } catch (SQLiteDoneException ignored) {