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

Register service on the specified network

Browse Source 
Currently, NsdManager registers services on all interfaces when
one network was specified in NsdServiceInfo. It's unexpected
behavior. The service should be only advertised on specified
network. Thus, correct the behavior on NsdService and add cts
test to verify it.

Bug: 220070737
Test: atest CtsNetTestCases:android.net.cts.NsdManagerTest
Change-Id: Ief3bfa110bfa340c53edec561eb5376f6bd305e6
This commit is contained in:
Paul Hu
2022-04-26 11:14:14 +08:00
parent 76ff404153
commit 360a8e9e1b
2 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service-t/src/com/android/server/NsdService.java
View File

@@ -738,7 +738,13 @@ public class NsdService extends INsdManager.Stub {
String type = service.getServiceType();
int port = service.getPort();
byte[] textRecord = service.getTxtRecord();
return mMDnsManager.registerService(regId, name, type, port, textRecord, IFACE_IDX_ANY);
final Network network = service.getNetwork();
final int registerInterface = getNetworkInterfaceIndex(network);
if (network != null && registerInterface == IFACE_IDX_ANY) {
Log.e(TAG, "Interface to register service on not found");
return false;
}
return mMDnsManager.registerService(regId, name, type, port, textRecord, registerInterface);
}
private boolean unregisterService(int regId) {