joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "[Thread] tell ot-daemon about the DNS servers on the infra link" into main

Browse source
This commit is contained in:
Handa Wang 2024-10-28 14:16:44 +00:00 • committed by Gerrit Code Review
commit c8653e771a
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
View file

@ -145,11 +145,13 @@ import libcore.util.HexEncoding;
import java.io.IOException;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.security.SecureRandom;
import java.time.Clock;
import java.time.DateTimeException;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -1342,6 +1344,7 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
}
setInfraLinkInterfaceName(newInfraLinkState.interfaceName);
setInfraLinkNat64Prefix(newInfraLinkState.nat64Prefix);
setInfraLinkDnsServers(newInfraLinkState.dnsServers);
mInfraLinkState = newInfraLinkState;
}
@ -1375,6 +1378,16 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
}
}
private void setInfraLinkDnsServers(List<String> newDnsServers) {
try {
getOtDaemon()
.setInfraLinkDnsServers(
newDnsServers, new LoggingOtStatusReceiver("setInfraLinkDnsServers"));
} catch (RemoteException | ThreadNetworkException e) {
LOG.e("Failed to set infra link DNS servers " + newDnsServers, e);
}
}
private void handleThreadInterfaceStateChanged(boolean isUp) {
try {
mTunIfController.setInterfaceUp(isUp);
@ -1520,7 +1533,17 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
}
return new InfraLinkState.Builder()
.setInterfaceName(linkProperties.getInterfaceName())
.setNat64Prefix(nat64Prefix);
.setNat64Prefix(nat64Prefix)
.setDnsServers(addressesToStrings(linkProperties.getDnsServers()));
}
private static List<String> addressesToStrings(List<InetAddress> addresses) {
List<String> strings = new ArrayList<>();
for (InetAddress address : addresses) {
strings.add(address.getHostAddress());
}
return strings;
}
private static final class CallbackMetadata {