LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix captive portal detection on IPv6 networks." into klp-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2013-10-09 02:14:42 +00:00
committed by Android (Google) Code Review
parent e83f730778 9405beeea0
commit cabdbf9fec
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4247,6 +4247,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
addrTried ++) { addrTried ++) {
// Choose the address at random but make sure its type is supported // Choose the address at random but make sure its type is supported
// TODO: This doesn't work 100% of the time, because we may end up
// trying the same invalid address more than once and ignoring one
// of the valid addresses.
InetAddress hostAddr = addresses[rand.nextInt(addresses.length)]; InetAddress hostAddr = addresses[rand.nextInt(addresses.length)];
if (((hostAddr instanceof Inet4Address) && linkHasIpv4) if (((hostAddr instanceof Inet4Address) && linkHasIpv4)
|| ((hostAddr instanceof Inet6Address) && linkHasIpv6)) { || ((hostAddr instanceof Inet6Address) && linkHasIpv6)) {
@@ -4271,10 +4274,8 @@ 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.
// I also set the "Connection" to "Close" as by default "Keep-Alive" URL newUrl = new URL(orgUri.getScheme(),
// is used which is useless in this case. hostAddr.getHostAddress(), orgUri.getPath());
URL newUrl = new URL(orgUri.getScheme() + "://"
+ hostAddr.getHostAddress() + orgUri.getPath());
log("isMobileOk: newUrl=" + newUrl); log("isMobileOk: newUrl=" + newUrl);
HttpURLConnection urlConn = null; HttpURLConnection urlConn = null;
@@ -4287,6 +4288,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
urlConn.setReadTimeout(SOCKET_TIMEOUT_MS); urlConn.setReadTimeout(SOCKET_TIMEOUT_MS);
urlConn.setUseCaches(false); urlConn.setUseCaches(false);
urlConn.setAllowUserInteraction(false); urlConn.setAllowUserInteraction(false);
// Set the "Connection" to "Close" as by default "Keep-Alive"
// is used which is useless in this case.
urlConn.setRequestProperty("Connection", "close"); urlConn.setRequestProperty("Connection", "close");
int responseCode = urlConn.getResponseCode(); int responseCode = urlConn.getResponseCode();