Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: net/socket/tcp_client_socket_libevent.cc

Issue 9147026: API for connection type (Ethernet/WIFI/WWAN ...) in NetworkChangeNotifier. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/tcp_client_socket.h" 5 #include "net/socket/tcp_client_socket.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <netdb.h> 9 #include <netdb.h>
10 #include <sys/socket.h> 10 #include <sys/socket.h>
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return ERR_NETWORK_ACCESS_DENIED; 101 return ERR_NETWORK_ACCESS_DENIED;
102 case ETIMEDOUT: 102 case ETIMEDOUT:
103 return ERR_CONNECTION_TIMED_OUT; 103 return ERR_CONNECTION_TIMED_OUT;
104 default: { 104 default: {
105 int net_error = MapSystemError(os_error); 105 int net_error = MapSystemError(os_error);
106 if (net_error == ERR_FAILED) 106 if (net_error == ERR_FAILED)
107 return ERR_CONNECTION_FAILED; // More specific than ERR_FAILED. 107 return ERR_CONNECTION_FAILED; // More specific than ERR_FAILED.
108 108
109 // Give a more specific error when the user is offline. 109 // Give a more specific error when the user is offline.
110 if (net_error == ERR_ADDRESS_UNREACHABLE && 110 if (net_error == ERR_ADDRESS_UNREACHABLE &&
111 NetworkChangeNotifier::IsOffline()) { 111 NetworkChangeNotifier::GetConnectionState() ==
112 NetworkChangeNotifier::NONE) {
112 return ERR_INTERNET_DISCONNECTED; 113 return ERR_INTERNET_DISCONNECTED;
113 } 114 }
114 return net_error; 115 return net_error;
115 } 116 }
116 } 117 }
117 } 118 }
118 119
119 } // namespace 120 } // namespace
120 121
121 //----------------------------------------------------------------------------- 122 //-----------------------------------------------------------------------------
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 728
728 int64 TCPClientSocketLibevent::NumBytesRead() const { 729 int64 TCPClientSocketLibevent::NumBytesRead() const {
729 return num_bytes_read_; 730 return num_bytes_read_;
730 } 731 }
731 732
732 base::TimeDelta TCPClientSocketLibevent::GetConnectTimeMicros() const { 733 base::TimeDelta TCPClientSocketLibevent::GetConnectTimeMicros() const {
733 return connect_time_micros_; 734 return connect_time_micros_;
734 } 735 }
735 736
736 } // namespace net 737 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698