OSDN Git Service

am 916188db: am 56cc45f1: (-s ours) am f2fed764: Make iptables -L and -S calls wait...
authorYusuke Sato <yusukes@google.com>
Thu, 27 Aug 2015 20:21:54 +0000 (20:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:21:54 +0000 (20:21 +0000)
* commit '916188db012f458aeab7c6857db2dc1618a98a26':

server/DnsProxyListener.cpp

index 6c71c5b..5b47a43 100644 (file)
@@ -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) {