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

Merge changes from topic "st02"

Browse Source 
* changes:
  [ST02.2] Use the getters of DnsHeader
  [ST02.1] Add TYPE_CNAME constant to DnsResolver
This commit is contained in:
Junyu Lai
2022-09-07 02:25:41 +00:00
committed by Gerrit Code Review
parent 4f062b3f62 ec2b24784f
commit 7119e9cf5e
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View File

@@ -1518,7 +1518,7 @@ public class EthernetTetheringTest {
final TestDnsPacket dnsQuery = TestDnsPacket.getTestDnsPacket(buf);
assertNotNull(dnsQuery);
Log.d(TAG, "Forwarded UDP source port: " + udpHeader.srcPort + ", DNS query id: "
+ dnsQuery.getHeader().id);
+ dnsQuery.getHeader().getId());
// [2] Send DNS reply.
// DNS server --> upstream --> dnsmasq forwarding --> downstream --> tethered device
@@ -1528,7 +1528,7 @@ public class EthernetTetheringTest {
final Inet4Address remoteIp = (Inet4Address) TEST_IP4_DNS;
final Inet4Address tetheringUpstreamIp = (Inet4Address) TEST_IP4_ADDR.getAddress();
sendDownloadPacketDnsV4(remoteIp, tetheringUpstreamIp, DNS_PORT,
(short) udpHeader.srcPort, (short) dnsQuery.getHeader().id, tester);
(short) udpHeader.srcPort, (short) dnsQuery.getHeader().getId(), tester);
}
private <T> List<T> toList(T... array) {