summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author hepengtao <hept.hept.hept@gmail.com> 2021-10-19 17:25:50 +0800
committer Remi NGUYEN VAN <reminv@google.com> 2022-02-02 17:50:50 +0900
commit985da1992e8cfbfb2699d1625c8c5b316fba7983 (patch)
tree80004cf285ad97ffada5b6a16a8a76f900b34dbf
parent27c75f17a677a4cffd4e1a925e2ee910a0bae360 (diff)
NSD: Specify on what interface to getAddrInfo
When discover two different host with same host name from different network interface, specify on what interface to getAddrInfo. Bug: 203453164 Test: build & manual Signed-off-by: hepengtao <hept.hept.hept@gmail.com> Change-Id: Ifaccb7f3fac6b1dd789cc9ce7c8d964102754508
-rw-r--r--packages/ConnectivityT/service/src/com/android/server/NsdService.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/ConnectivityT/service/src/com/android/server/NsdService.java b/packages/ConnectivityT/service/src/com/android/server/NsdService.java
index 497107dbf989..eca4ccf680e5 100644
--- a/packages/ConnectivityT/service/src/com/android/server/NsdService.java
+++ b/packages/ConnectivityT/service/src/com/android/server/NsdService.java
@@ -488,7 +488,7 @@ public class NsdService extends INsdManager.Stub {
removeRequestMap(clientId, id, clientInfo);
int id2 = getUniqueId();
- if (getAddrInfo(id2, cooked[3])) {
+ if (getAddrInfo(id2, cooked[3], cooked[7])) {
storeRequestMap(clientId, id2, clientInfo, NsdManager.RESOLVE_SERVICE);
} else {
clientInfo.onResolveServiceFailed(
@@ -833,8 +833,8 @@ public class NsdService extends INsdManager.Stub {
return mDaemon.execute("stop-resolve", resolveId);
}
- private boolean getAddrInfo(int resolveId, String hostname) {
- return mDaemon.execute("getaddrinfo", resolveId, hostname);
+ private boolean getAddrInfo(int resolveId, String hostname, String interfaceName) {
+ return mDaemon.execute("getaddrinfo", resolveId, hostname, interfaceName);
}
private boolean stopGetAddrInfo(int resolveId) {