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 "[mdns] fix the logic of finding the existing service" into main

Browse source
This commit is contained in:
Handa Wang 2024-02-19 11:02:16 +00:00 • committed by Gerrit Code Review
commit 4c0b2f6c63
2 changed files with 51 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
service-t/src/com/android/server/connectivity/mdns/MdnsRecordRepository.java
View file

@ -388,7 +388,8 @@ public class MdnsRecordRepository {
"Service ID must not be reused across registrations: " + serviceId);
}
final int existing = getServiceByName(serviceInfo.getServiceName());
final int existing =
getServiceByNameAndType(serviceInfo.getServiceName(), serviceInfo.getServiceType());
// It's OK to re-add a service that is exiting
if (existing >= 0 && !mServices.get(existing).exiting) {
throw new NameConflictException(existing);
@ -405,16 +406,17 @@ public class MdnsRecordRepository {
}
/**
* @return The ID of the service identified by its name, or -1 if none.
* @return The ID of the service identified by its name and type, or -1 if none.
*/
private int getServiceByName(@Nullable String serviceName) {
if (TextUtils.isEmpty(serviceName)) {
private int getServiceByNameAndType(
@Nullable String serviceName, @Nullable String serviceType) {
if (TextUtils.isEmpty(serviceName) || TextUtils.isEmpty(serviceType)) {
return -1;
}
for (int i = 0; i < mServices.size(); i++) {
final ServiceRegistration registration = mServices.valueAt(i);
if (MdnsUtils.equalsIgnoreDnsCase(
serviceName, registration.serviceInfo.getServiceName())) {
final NsdServiceInfo info = mServices.valueAt(i).serviceInfo;
if (MdnsUtils.equalsIgnoreDnsCase(serviceName, info.getServiceName())
&& MdnsUtils.equalsIgnoreDnsCase(serviceType, info.getServiceType())) {
return mServices.keyAt(i);
}
}

42
tests/cts/net/src/android/net/cts/NsdManagerTest.kt
View file

@ -684,6 +684,48 @@ class NsdManagerTest {
}
}
@Test
fun testRegisterService_twoServicesWithSameNameButDifferentTypes_registeredAndDiscoverable() {
val si1 = NsdServiceInfo().also {
it.network = testNetwork1.network
it.serviceName = serviceName
it.serviceType = serviceType
it.port = TEST_PORT
}
val si2 = NsdServiceInfo().also {
it.network = testNetwork1.network
it.serviceName = serviceName
it.serviceType = serviceType2
it.port = TEST_PORT + 1
}
val registrationRecord1 = NsdRegistrationRecord()
val registrationRecord2 = NsdRegistrationRecord()
val discoveryRecord1 = NsdDiscoveryRecord()
val discoveryRecord2 = NsdDiscoveryRecord()
tryTest {
registerService(registrationRecord1, si1)
registerService(registrationRecord2, si2)
nsdManager.discoverServices(serviceType,
NsdManager.PROTOCOL_DNS_SD,
testNetwork1.network, Executor { it.run() }, discoveryRecord1)
nsdManager.discoverServices(serviceType2,
NsdManager.PROTOCOL_DNS_SD,
testNetwork1.network, Executor { it.run() }, discoveryRecord2)
discoveryRecord1.waitForServiceDiscovered(serviceName, serviceType,
testNetwork1.network)
discoveryRecord2.waitForServiceDiscovered(serviceName, serviceType2,
testNetwork1.network)
} cleanupStep {
nsdManager.stopServiceDiscovery(discoveryRecord1)
nsdManager.stopServiceDiscovery(discoveryRecord2)
} cleanup {
nsdManager.unregisterService(registrationRecord1)
nsdManager.unregisterService(registrationRecord2)
}
}
fun checkOffloadServiceInfo(serviceInfo: OffloadServiceInfo, si: NsdServiceInfo) {
val expectedServiceType = si.serviceType.split(",")[0]
assertEquals(si.serviceName, serviceInfo.key.serviceName)