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] refine border routing logging" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-01-31 13:27:26 +00:00 • committed by Gerrit Code Review
commit 7f7135e29e
1 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -365,25 +365,31 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
@Override
public void onAvailable(@NonNull Network network) {
checkOnHandlerThread();
Log.i(TAG, "onAvailable: " + network);
Log.i(TAG, "Upstream network available: " + network);
}
@Override
public void onLost(@NonNull Network network) {
checkOnHandlerThread();
Log.i(TAG, "onLost: " + network);
Log.i(TAG, "Upstream network lost: " + network);
// TODO: disable border routing when upsteam network disconnected
}
@Override
public void onLinkPropertiesChanged(
@NonNull Network network, @NonNull LinkProperties linkProperties) {
checkOnHandlerThread();
Log.i(
TAG,
String.format(
"onLinkPropertiesChanged: {network: %s, interface: %s}",
network, linkProperties.getInterfaceName()));
mNetworkToInterface.put(network, linkProperties.getInterfaceName());
String existingIfName = mNetworkToInterface.get(network);
String newIfName = linkProperties.getInterfaceName();
if (Objects.equals(existingIfName, newIfName)) {
return;
}
Log.i(TAG, "Upstream network changed: " + existingIfName + " -> " + newIfName);
mNetworkToInterface.put(network, newIfName);
// TODO: disable border routing if netIfName is null
if (network.equals(mUpstreamNetwork)) {
enableBorderRouting(mNetworkToInterface.get(mUpstreamNetwork));
}
@ -394,14 +400,20 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
@Override
public void onAvailable(@NonNull Network network) {
checkOnHandlerThread();
Log.i(TAG, "onAvailable: Thread network Available");
Log.i(TAG, "Thread network available: " + network);
}
@Override
public void onLocalNetworkInfoChanged(
@NonNull Network network, @NonNull LocalNetworkInfo localNetworkInfo) {
checkOnHandlerThread();
Log.i(TAG, "onLocalNetworkInfoChanged: " + localNetworkInfo);
Log.i(
TAG,
"LocalNetworkInfo of Thread network changed: {threadNetwork: "
+ network
+ ", localNetworkInfo: "
+ localNetworkInfo
+ "}");
if (localNetworkInfo.getUpstreamNetwork() == null) {
mUpstreamNetwork = null;
return;
@ -829,7 +841,7 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
&& infraIfName.equals(mBorderRouterConfig.infraInterfaceName)) {
return;
}
Log.i(TAG, "enableBorderRouting on AIL: " + infraIfName);
Log.i(TAG, "Enable border routing on AIL: " + infraIfName);
try {
mBorderRouterConfig.infraInterfaceName = infraIfName;
mBorderRouterConfig.infraInterfaceIcmp6Socket =
@ -915,6 +927,9 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
if (isMulticastForwardingEnabled() == isEnabled) {
return;
}
Log.i(TAG, "Multicast forwaring is " + (isEnabled ? "enabled" : "disabled"));
if (isEnabled) {
// When multicast forwarding is enabled, setup upstream forwarding to any address
// with minimal scope 4
@ -930,10 +945,6 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
mDownstreamMulticastRoutingConfig = CONFIG_FORWARD_NONE;
}
sendLocalNetworkConfig();
Log.d(
TAG,
"Sent updated localNetworkConfig with multicast forwarding "
+ (isEnabled ? "enabled" : "disabled"));
}
private void handleMulticastForwardingAddressChanged(byte[] addressBytes, boolean isAdded) {