Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NetworkMonitor: improve captive portal validation logs"

Browse Source
This commit is contained in:
Treehugger Robot
2017-04-07 02:48:55 +00:00
committed by Gerrit Code Review
parent b8dc7fbc6d d9ac87ed65
commit d6933a6c14
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/core/java/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -301,6 +301,11 @@ public class NetworkMonitor extends StateMachine {
if (DBG) Log.d(TAG + "/" + mNetworkAgentInfo.name(), s);
}
private void validationLog(int probeType, Object url, String msg) {
String probeName = ValidationProbeEvent.getProbeName(probeType);
validationLog(String.format("%s %s %s", probeName, url, msg));
}
private void validationLog(String s) {
if (DBG) log(s);
validationLogs.log(s);
@@ -752,20 +757,19 @@ public class NetworkMonitor extends StateMachine {
String connectInfo;
try {
InetAddress[] addresses = mNetworkAgentInfo.network.getAllByName(host);
result = ValidationProbeEvent.DNS_SUCCESS;
StringBuffer buffer = new StringBuffer(host).append("=");
StringBuffer buffer = new StringBuffer();
for (InetAddress address : addresses) {
buffer.append(address.getHostAddress());
if (address != addresses[addresses.length-1]) buffer.append(",");
buffer.append(',').append(address.getHostAddress());
}
connectInfo = buffer.toString();
result = ValidationProbeEvent.DNS_SUCCESS;
connectInfo = "OK " + buffer.substring(1);
} catch (UnknownHostException e) {
result = ValidationProbeEvent.DNS_FAILURE;
connectInfo = host;
connectInfo = "FAIL";
}
final long latency = watch.stop();
String resultString = (ValidationProbeEvent.DNS_SUCCESS == result) ? "OK" : "FAIL";
validationLog(String.format("%s %s %dms, %s", name, resultString, latency, connectInfo));
validationLog(ValidationProbeEvent.PROBE_DNS, host,
String.format("%dms %s", latency, connectInfo));
logValidationProbe(latency, ValidationProbeEvent.PROBE_DNS, result);
}
@@ -787,7 +791,7 @@ public class NetworkMonitor extends StateMachine {
urlConnection.setUseCaches(false);
final String userAgent = getCaptivePortalUserAgent(mContext);
if (userAgent != null) {
urlConnection.setRequestProperty("User-Agent", userAgent);
urlConnection.setRequestProperty("User-Agent", userAgent);
}
// cannot read request header after connection
String requestHeader = urlConnection.getRequestProperties().toString();
@@ -801,8 +805,7 @@ public class NetworkMonitor extends StateMachine {
// Time how long it takes to get a response to our request
long responseTimestamp = SystemClock.elapsedRealtime();
validationLog(ValidationProbeEvent.getProbeName(probeType) + " " + url +
" time=" + (responseTimestamp - requestTimestamp) + "ms" +
validationLog(probeType, url, "time=" + (responseTimestamp - requestTimestamp) + "ms" +
" ret=" + httpResponseCode +
" request=" + requestHeader +
" headers=" + urlConnection.getHeaderFields());
@@ -814,27 +817,29 @@ public class NetworkMonitor extends StateMachine {
// proxy server.
if (httpResponseCode == 200) {
if (probeType == ValidationProbeEvent.PROBE_PAC) {
validationLog("PAC fetch 200 response interpreted as 204 response.");
validationLog(
probeType, url, "PAC fetch 200 response interpreted as 204 response.");
httpResponseCode = 204;
} else if (urlConnection.getContentLengthLong() == 0) {
// Consider 200 response with "Content-length=0" to not be a captive portal.
// There's no point in considering this a captive portal as the user cannot
// sign-in to an empty page. Probably the result of a broken transparent proxy.
// See http://b/9972012.
validationLog(
validationLog(probeType, url,
"200 response with Content-length=0 interpreted as 204 response.");
httpResponseCode = 204;
} else if (urlConnection.getContentLengthLong() == -1) {
// When no Content-length (default value == -1), attempt to read a byte from the
// response. Do not use available() as it is unreliable. See http://b/33498325.
if (urlConnection.getInputStream().read() == -1) {
validationLog("Empty 200 response interpreted as 204 response.");
validationLog(
probeType, url, "Empty 200 response interpreted as 204 response.");
httpResponseCode = 204;
}
}
}
} catch (IOException e) {
validationLog("Probably not a portal: exception " + e);
validationLog(probeType, url, "Probably not a portal: exception " + e);
if (httpResponseCode == 599) {
// TODO: Ping gateway and DNS server and log results.
}