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

Use resolveInstanceName in NsdService

Browse Source 
For resolve requests, specify the resolveInstanceName in
MdnsSearchOptions.

This will cause discovery to send followup queries when TXT/SRV/A/AAAA
records are missing; for example if only a PTR record is returned
following the discovery probes, or if no discovery probe is sent at all.

Test: atest NsdServiceTest
Bug: 267570781
Change-Id: Ib18c3afbd1533ada7a78dd8ccac993adb439d014
This commit is contained in:
Remi NGUYEN VAN
2023-02-27 12:18:27 +09:00
parent 42b1042f36
commit bb62b1de50
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -763,6 +763,7 @@ public class NsdService extends INsdManager.Stub {
final MdnsSearchOptions options = MdnsSearchOptions.newBuilder() final MdnsSearchOptions options = MdnsSearchOptions.newBuilder()
.setNetwork(info.getNetwork()) .setNetwork(info.getNetwork())
.setIsPassiveMode(true) .setIsPassiveMode(true)
.setResolveInstanceName(info.getServiceName())
.build(); .build();
mMdnsDiscoveryManager.registerListener( mMdnsDiscoveryManager.registerListener(
resolveServiceType, listener, options); resolveServiceType, listener, options);
@@ -775,7 +776,7 @@ public class NsdService extends INsdManager.Stub {
} }
maybeStartDaemon(); maybeStartDaemon();
if (resolveService(id, args.serviceInfo)) { if (resolveService(id, info)) {
clientInfo.mResolvedService = new NsdServiceInfo(); clientInfo.mResolvedService = new NsdServiceInfo();
storeLegacyRequestMap(clientId, id, clientInfo, msg.what); storeLegacyRequestMap(clientId, id, clientInfo, msg.what);
} else { } else {

4
tests/unit/java/com/android/server/NsdServiceTest.java
View File

@@ -981,7 +981,9 @@ public class NsdServiceTest {
waitForIdle(); waitForIdle();
verify(mSocketProvider).startMonitoringSockets(); verify(mSocketProvider).startMonitoringSockets();
verify(mDiscoveryManager).registerListener(eq(constructedServiceType), verify(mDiscoveryManager).registerListener(eq(constructedServiceType),
listenerCaptor.capture(), argThat(options -> network.equals(options.getNetwork()))); listenerCaptor.capture(), argThat(options ->
network.equals(options.getNetwork())
&& SERVICE_NAME.equals(options.getResolveInstanceName())));
final MdnsServiceBrowserListener listener = listenerCaptor.getValue(); final MdnsServiceBrowserListener listener = listenerCaptor.getValue();
final MdnsServiceInfo mdnsServiceInfo = new MdnsServiceInfo( final MdnsServiceInfo mdnsServiceInfo = new MdnsServiceInfo(