Merge "Reset connections on all stacked interfaces." into jb-mr2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
31453e5a2b
@ -119,6 +119,15 @@ public class LinkProperties implements Parcelable {
|
||||
return mIfaceName;
|
||||
}
|
||||
|
||||
public Collection<String> getAllInterfaceNames() {
|
||||
Collection interfaceNames = new ArrayList<String>(mStackedLinks.size() + 1);
|
||||
interfaceNames.add(new String(mIfaceName));
|
||||
for (LinkProperties stacked: mStackedLinks.values()) {
|
||||
interfaceNames.addAll(stacked.getAllInterfaceNames());
|
||||
}
|
||||
return interfaceNames;
|
||||
}
|
||||
|
||||
public Collection<InetAddress> getAddresses() {
|
||||
Collection<InetAddress> addresses = new ArrayList<InetAddress>();
|
||||
for (LinkAddress linkAddress : mLinkAddresses) {
|
||||
|
@ -2256,26 +2256,27 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
||||
if (resetMask != 0 || resetDns) {
|
||||
LinkProperties linkProperties = mNetTrackers[netType].getLinkProperties();
|
||||
if (linkProperties != null) {
|
||||
String iface = linkProperties.getInterfaceName();
|
||||
if (TextUtils.isEmpty(iface) == false) {
|
||||
if (resetMask != 0) {
|
||||
if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")");
|
||||
NetworkUtils.resetConnections(iface, resetMask);
|
||||
for (String iface : linkProperties.getAllInterfaceNames()) {
|
||||
if (TextUtils.isEmpty(iface) == false) {
|
||||
if (resetMask != 0) {
|
||||
if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")");
|
||||
NetworkUtils.resetConnections(iface, resetMask);
|
||||
|
||||
// Tell VPN the interface is down. It is a temporary
|
||||
// but effective fix to make VPN aware of the change.
|
||||
if ((resetMask & NetworkUtils.RESET_IPV4_ADDRESSES) != 0) {
|
||||
mVpn.interfaceStatusChanged(iface, false);
|
||||
// Tell VPN the interface is down. It is a temporary
|
||||
// but effective fix to make VPN aware of the change.
|
||||
if ((resetMask & NetworkUtils.RESET_IPV4_ADDRESSES) != 0) {
|
||||
mVpn.interfaceStatusChanged(iface, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (resetDns) {
|
||||
flushVmDnsCache();
|
||||
if (VDBG) log("resetting DNS cache for " + iface);
|
||||
try {
|
||||
mNetd.flushInterfaceDnsCache(iface);
|
||||
} catch (Exception e) {
|
||||
// never crash - catch them all
|
||||
if (DBG) loge("Exception resetting dns cache: " + e);
|
||||
if (resetDns) {
|
||||
flushVmDnsCache();
|
||||
if (VDBG) log("resetting DNS cache for " + iface);
|
||||
try {
|
||||
mNetd.flushInterfaceDnsCache(iface);
|
||||
} catch (Exception e) {
|
||||
// never crash - catch them all
|
||||
if (DBG) loge("Exception resetting dns cache: " + e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user