Index: net/socket/transport_client_socket_pool.cc |
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc |
index eac2868bde74156109d028baa8f7c696c69cfae7..0daa1b701e3f324adc6e0a1c0a99815610c45964 100644 |
--- a/net/socket/transport_client_socket_pool.cc |
+++ b/net/socket/transport_client_socket_pool.cc |
@@ -201,10 +201,14 @@ TransportConnectJob::TransportConnectJob( |
HostResolver* host_resolver, |
Delegate* delegate, |
NetLog* net_log) |
- : ConnectJob(group_name, timeout_duration, priority, delegate, |
+ : ConnectJob(group_name, |
+ timeout_duration, |
+ priority, |
+ delegate, |
BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)), |
helper_(params, client_socket_factory, host_resolver, &connect_timing_), |
- interval_between_connects_(CONNECT_INTERVAL_GT_20MS) { |
+ interval_between_connects_(CONNECT_INTERVAL_GT_20MS), |
+ connect_result_(OK) { |
helper_.SetOnIOComplete(this); |
} |
@@ -228,6 +232,20 @@ LoadState TransportConnectJob::GetLoadState() const { |
return LOAD_STATE_IDLE; |
} |
+void TransportConnectJob::GetAdditionalErrorState(ClientSocketHandle* handle) { |
+ if (connect_result_ == OK) |
+ return; |
+ |
+ // If the actual socket Connect call failed, record the result and the last |
+ // address attempted. |
+ // TODO(ttuttle): Plumb into the socket layer and record *all* attempts. |
+ DCHECK_LT(0u, helper_.addresses().size()); |
+ ConnectionAttempts attempts; |
+ attempts.push_back( |
+ ConnectionAttempt(helper_.addresses().back(), connect_result_)); |
+ handle->set_connection_attempts(attempts); |
+} |
+ |
// static |
void TransportConnectJob::MakeAddressListStartWithIPv4(AddressList* list) { |
for (AddressList::iterator i = list->begin(); i != list->end(); ++i) { |
@@ -360,6 +378,8 @@ int TransportConnectJob::DoTransportConnectComplete(int result) { |
fallback_addresses_.reset(); |
} |
+ connect_result_ = result; |
+ |
return result; |
} |