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

Add flags for allowlisting types for new NSD impl

Browse Source 
The flags allow enabling MdnsDiscoveryManager or MdnsAdvertiser for
specific service types only. For example:

  mdns_type_allowlist_flags = "_type1._tcp:flag1,_type2._tcp:flag2"
  mdns_discovery_manager_allowlist_flag1_version = 1234
  mdns_advertiser_allowlist_flag2_version = 2345

will enable MdnsDiscoveryManager when discovering/resolving services of
type _type1._tcp, and MdnsAdvertiser when advertising services of type
_type2._tcp.

Test: atest NsdServiceTest
Bug: 270885892
Change-Id: I75c31a28472210bf8777409ea7aff1e3d8bf0a0d
This commit is contained in:
Remi NGUYEN VAN
2023-03-03 17:50:50 +09:00
parent de5adc4f1f
commit 151d0a5528
2 changed files with 142 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1056,6 +1056,54 @@ public class NsdServiceTest {
verify(mAdvertiser).removeService(serviceIdCaptor.getValue());
}
@Test
public void testTypeSpecificFeatureFlagging() {
doReturn("_type1._tcp:flag1,_type2._tcp:flag2").when(mDeps).getTypeAllowlistFlags();
doReturn(true).when(mDeps).isFeatureEnabled(any(),
eq("mdns_discovery_manager_allowlist_flag1_version"));
doReturn(true).when(mDeps).isFeatureEnabled(any(),
eq("mdns_advertiser_allowlist_flag2_version"));
final NsdManager client = connectClient(mService);
final NsdServiceInfo service1 = new NsdServiceInfo(SERVICE_NAME, "_type1._tcp");
service1.setHostAddresses(List.of(parseNumericAddress("2001:db8::123")));
service1.setPort(1234);
final NsdServiceInfo service2 = new NsdServiceInfo(SERVICE_NAME, "_type2._tcp");
service2.setHostAddresses(List.of(parseNumericAddress("2001:db8::123")));
service2.setPort(1234);
client.discoverServices(service1.getServiceType(),
NsdManager.PROTOCOL_DNS_SD, mock(DiscoveryListener.class));
client.discoverServices(service2.getServiceType(),
NsdManager.PROTOCOL_DNS_SD, mock(DiscoveryListener.class));
waitForIdle();
// The DiscoveryManager is enabled for _type1 but not _type2
verify(mDiscoveryManager).registerListener(eq("_type1._tcp.local"), any(), any());
verify(mDiscoveryManager, never()).registerListener(
eq("_type2._tcp.local"), any(), any());
client.resolveService(service1, mock(ResolveListener.class));
client.resolveService(service2, mock(ResolveListener.class));
waitForIdle();
// Same behavior for resolve
verify(mDiscoveryManager, times(2)).registerListener(
eq("_type1._tcp.local"), any(), any());
verify(mDiscoveryManager, never()).registerListener(
eq("_type2._tcp.local"), any(), any());
client.registerService(service1, NsdManager.PROTOCOL_DNS_SD,
mock(RegistrationListener.class));
client.registerService(service2, NsdManager.PROTOCOL_DNS_SD,
mock(RegistrationListener.class));
waitForIdle();
// The advertiser is enabled for _type2 but not _type1
verify(mAdvertiser, never()).addService(anyInt(), argThat(info -> matches(info, service1)));
verify(mAdvertiser).addService(anyInt(), argThat(info -> matches(info, service2)));
}
@Test
public void testAdvertiseWithMdnsAdvertiser() {
setMdnsAdvertiserEnabled();