drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev

Browse Source 
* commit 'ec4d5da6f99b70768ace085782cf5b24f8697025':
  Retry captiveportal check even if only one addr
This commit is contained in:
Robert Greenwalt
2013-10-15 17:37:05 -07:00
committed by Android Git Automerger
parent 67122f46be ec4d5da6f9
commit aa546ae977
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
services/java/com/android/server/ConnectivityService.java
View File

@ -4247,27 +4247,35 @@ public class ConnectivityService extends IConnectivityManager.Stub {
log("isMobileOk: linkHasIpv4=" + linkHasIpv4 log("isMobileOk: linkHasIpv4=" + linkHasIpv4
+ " linkHasIpv6=" + linkHasIpv6); + " linkHasIpv6=" + linkHasIpv6);
// Loop through at most 3 valid addresses or all of the address or until final ArrayList<InetAddress> validAddresses =
// we run out of time new ArrayList<InetAddress>(addresses.length);
int loops = Math.min(3, addresses.length);
for(int validAddr=0, addrTried=0;
(validAddr < loops) && (addrTried < addresses.length)
&& (SystemClock.elapsedRealtime() < endTime);
addrTried ++) {
// Choose the address at random but make sure its type is supported for (InetAddress addr : addresses) {
// TODO: This doesn't work 100% of the time, because we may end up if (((addr instanceof Inet4Address) && linkHasIpv4) ||
// trying the same invalid address more than once and ignoring one ((addr instanceof Inet6Address) && linkHasIpv6)) {
// of the valid addresses. validAddresses.add(addr);
InetAddress hostAddr = addresses[rand.nextInt(addresses.length)];
if (((hostAddr instanceof Inet4Address) && linkHasIpv4)
|| ((hostAddr instanceof Inet6Address) && linkHasIpv6)) {
// Valid address, so use it
validAddr += 1;
} else {
// Invalid address so try next address
continue;
} }
}
if (validAddresses.size() == 0) {
return CMP_RESULT_CODE_NO_CONNECTION;
}
int addrTried = 0;
while (true) {
// Loop through at most 3 valid addresses or until
// we run out of time
if (addrTried++ >= 3) {
log("too many loops tried - giving up");
break;
}
if (SystemClock.elapsedRealtime() >= endTime) {
log("spend too much time - giving up");
break;
}
InetAddress hostAddr = validAddresses.get(rand.nextInt(
validAddresses.size()));
// Make a route to host so we check the specific interface. // Make a route to host so we check the specific interface.
if (mCs.requestRouteToHostAddress(ConnectivityManager.TYPE_MOBILE_HIPRI, if (mCs.requestRouteToHostAddress(ConnectivityManager.TYPE_MOBILE_HIPRI,
@ -4283,8 +4291,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
// Rewrite the url to have numeric address to use the specific route. // Rewrite the url to have numeric address to use the specific route.
// Add a pointless random query param to fool proxies into not caching.
URL newUrl = new URL(orgUri.getScheme(), URL newUrl = new URL(orgUri.getScheme(),
hostAddr.getHostAddress(), orgUri.getPath()); hostAddr.getHostAddress(),
orgUri.getPath() + "?q=" + rand.nextInt(Integer.MAX_VALUE));
log("isMobileOk: newUrl=" + newUrl); log("isMobileOk: newUrl=" + newUrl);
HttpURLConnection urlConn = null; HttpURLConnection urlConn = null;
@ -4321,6 +4331,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// occasions where a server returned 200 even though // occasions where a server returned 200 even though
// the device didn't have a "warm" sim. // the device didn't have a "warm" sim.
log("isMobileOk: not expected responseCode=" + responseCode); log("isMobileOk: not expected responseCode=" + responseCode);
// TODO - it would be nice in the single-address case to do
// another DNS resolve here, but flushing the cache is a bit
// heavy-handed.
result = CMP_RESULT_CODE_REDIRECTED; result = CMP_RESULT_CODE_REDIRECTED;
} }
} catch (Exception e) { } catch (Exception e) {