From: Yusuke Sato <yusukes@google.com>
Date: Thu, 27 Aug 2015 20:21:54 +0000 (+0000)
Subject: am 916188db: am 56cc45f1: (-s ours) am f2fed764: Make iptables -L and -S calls wait... 
X-Git-Tag: android-x86-7.1-r1~111
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b423516ba77020e56abb4cf43b1a1ec2ff52314;hp=916188db012f458aeab7c6857db2dc1618a98a26;p=android-x86%2Fsystem-netd.git

am 916188db: am 56cc45f1: (-s ours) am f2fed764: Make iptables -L and -S calls wait for xtables lock

* commit '916188db012f458aeab7c6857db2dc1618a98a26':
---

diff --git a/server/DnsProxyListener.cpp b/server/DnsProxyListener.cpp
index 6c71c5b..5b47a43 100644
--- a/server/DnsProxyListener.cpp
+++ b/server/DnsProxyListener.cpp
@@ -238,13 +238,6 @@ int DnsProxyListener::GetAddrInfoCmd::runCommand(SocketClient *cli,
         hints->ai_family = ai_family;
         hints->ai_socktype = ai_socktype;
         hints->ai_protocol = ai_protocol;
-
-        // Only implement AI_ADDRCONFIG if application is using default network since our
-        // implementation only works on the default network.
-        if ((hints->ai_flags & AI_ADDRCONFIG) &&
-                netcontext.dns_netid != mDnsProxyListener->mNetCtrl->getDefaultNetwork()) {
-            hints->ai_flags &= ~AI_ADDRCONFIG;
-        }
     }
 
     if (DBG) {