LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Minor changes to the async DNS query JAVA API" am: 06ef4a5bc4 am: 39c58a32d3

Browse Source 
am: 6005667ec0

Change-Id: I5ce24db3888c9ac4e05af254aa99aae3abcb7140
This commit is contained in:
Luke Huang
2019-03-09 04:33:13 -08:00
committed by android-build-merger
parent 17ab80fd9d 6005667ec0
commit a3acfe29a9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/net/DnsResolver.java
View File

@@ -43,6 +43,9 @@ import java.util.function.Consumer;
/** /**
* Dns resolver class for asynchronous dns querying * Dns resolver class for asynchronous dns querying
* *
* Note that if a client sends a query with more than 1 record in the question section but
* the remote dns server does not support this, it may not respond at all, leading to a timeout.
*
*/ */
public final class DnsResolver { public final class DnsResolver {
private static final String TAG = "DnsResolver"; private static final String TAG = "DnsResolver";
@@ -226,19 +229,19 @@ public final class DnsResolver {
if (mHeader.rcode != 0) { if (mHeader.rcode != 0) {
throw new ParseException("Response error, rcode:" + mHeader.rcode); throw new ParseException("Response error, rcode:" + mHeader.rcode);
} }
if (mHeader.getSectionCount(ANSECTION) == 0) { if (mHeader.getRecordCount(ANSECTION) == 0) {
throw new ParseException("No available answer"); throw new ParseException("No available answer");
} }
if (mHeader.getSectionCount(QDSECTION) == 0) { if (mHeader.getRecordCount(QDSECTION) == 0) {
throw new ParseException("No question found"); throw new ParseException("No question found");
} }
// Assume only one question per answer packet. (RFC1035) // Expect only one question in question section.
mQueryType = mSections[QDSECTION].get(0).nsType; mQueryType = mRecords[QDSECTION].get(0).nsType;
} }
public @NonNull List<InetAddress> getAddresses() { public @NonNull List<InetAddress> getAddresses() {
final List<InetAddress> results = new ArrayList<InetAddress>(); final List<InetAddress> results = new ArrayList<InetAddress>();
for (final DnsSection ansSec : mSections[ANSECTION]) { for (final DnsRecord ansSec : mRecords[ANSECTION]) {
// Only support A and AAAA, also ignore answers if query type != answer type. // Only support A and AAAA, also ignore answers if query type != answer type.
int nsType = ansSec.nsType; int nsType = ansSec.nsType;
if (nsType != mQueryType || (nsType != TYPE_A && nsType != TYPE_AAAA)) { if (nsType != mQueryType || (nsType != TYPE_A && nsType != TYPE_AAAA)) {