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

Side by Side Diff: net/base/net_util_linux.cc

Issue 739983005: Determine connection type in NetworkChangeNotifierLinux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from patch set 3 Created 5 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) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/base/net_util_linux.h" 5 #include "net/base/net_util_linux.h"
6 6
7 #include <net/if.h> 7 #include <linux/if.h>
8 #include <netinet/in.h> 8 #include <linux/wireless.h>
9 #include <set> 9 #include <set>
10 #include <sys/ioctl.h>
10 #include <sys/types.h> 11 #include <sys/types.h>
11 12
12 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
13 #include "base/logging.h" 14 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
15 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_tokenizer.h" 17 #include "base/strings/string_tokenizer.h"
17 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
18 #include "base/threading/thread_restrictions.h" 19 #include "base/threading/thread_restrictions.h"
19 #include "net/base/address_tracker_linux.h" 20 #include "net/base/address_tracker_linux.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 namespace internal { 63 namespace internal {
63 64
64 inline const unsigned char* GetIPAddressData(const IPAddressNumber& ip) { 65 inline const unsigned char* GetIPAddressData(const IPAddressNumber& ip) {
65 #if defined(OS_ANDROID) 66 #if defined(OS_ANDROID)
66 return ip.begin(); 67 return ip.begin();
67 #else 68 #else
68 return ip.data(); 69 return ip.data();
69 #endif 70 #endif
70 } 71 }
71 72
73 char* GetInterfaceName(unsigned int interface_index, char* buf) {
74 memset(buf, 0, IFNAMSIZ);
75 int ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0);
76 if (ioctl_socket < 0)
77 return buf;
78
79 static struct ifreq ifr;
80 memset(&ifr, 0, sizeof(ifr));
81 ifr.ifr_ifindex = interface_index;
82 int rv = ioctl(ioctl_socket, SIOCGIFNAME, &ifr);
83 close(ioctl_socket);
84 if (rv != 0)
85 return buf;
86
87 strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1);
88 return buf;
89 }
90
91 NetworkChangeNotifier::ConnectionType GetInterfaceConnectionType(
92 const std::string& ifname) {
93 NetworkChangeNotifier::ConnectionType type =
94 NetworkChangeNotifier::CONNECTION_UNKNOWN;
95
96 int s = socket(AF_INET, SOCK_STREAM, 0);
97 if (s == -1) {
98 return type;
99 }
100
101 struct iwreq pwrq;
102 memset(&pwrq, 0, sizeof(pwrq));
103 strncpy(pwrq.ifr_name, ifname.c_str(), IFNAMSIZ);
104
105 if (ioctl(s, SIOCGIWNAME, &pwrq) != -1) {
106 type = NetworkChangeNotifier::CONNECTION_WIFI;
107 } else {
108 type = NetworkChangeNotifier::CONNECTION_UNKNOWN;
109 }
110
111 close(s);
112 return type;
113 }
114
72 bool GetNetworkListImpl( 115 bool GetNetworkListImpl(
73 NetworkInterfaceList* networks, 116 NetworkInterfaceList* networks,
74 int policy, 117 int policy,
75 const base::hash_set<int>& online_links, 118 const base::hash_set<int>& online_links,
76 const internal::AddressTrackerLinux::AddressMap& address_map, 119 const internal::AddressTrackerLinux::AddressMap& address_map,
77 GetInterfaceNameFunction get_interface_name) { 120 GetInterfaceNameFunction get_interface_name) {
78 std::map<int, std::string> ifnames; 121 std::map<int, std::string> ifnames;
79 122
80 for (internal::AddressTrackerLinux::AddressMap::const_iterator it = 123 for (internal::AddressTrackerLinux::AddressMap::const_iterator it =
81 address_map.begin(); 124 address_map.begin();
(...skipping 23 matching lines...) Expand all
105 if (!TryConvertNativeToNetIPAttributes(it->second.ifa_flags, 148 if (!TryConvertNativeToNetIPAttributes(it->second.ifa_flags,
106 &ip_attributes)) 149 &ip_attributes))
107 continue; 150 continue;
108 } 151 }
109 152
110 // Find the name of this link. 153 // Find the name of this link.
111 std::map<int, std::string>::const_iterator itname = 154 std::map<int, std::string>::const_iterator itname =
112 ifnames.find(it->second.ifa_index); 155 ifnames.find(it->second.ifa_index);
113 std::string ifname; 156 std::string ifname;
114 if (itname == ifnames.end()) { 157 if (itname == ifnames.end()) {
115 char buffer[IF_NAMESIZE] = {0}; 158 char buffer[IFNAMSIZ] = {0};
116 if (get_interface_name(it->second.ifa_index, buffer)) { 159 if (get_interface_name(it->second.ifa_index, buffer)) {
117 ifname = ifnames[it->second.ifa_index] = buffer; 160 ifname = ifnames[it->second.ifa_index] = buffer;
118 } else { 161 } else {
119 // Ignore addresses whose interface name can't be retrieved. 162 // Ignore addresses whose interface name can't be retrieved.
120 continue; 163 continue;
121 } 164 }
122 } else { 165 } else {
123 ifname = itname->second; 166 ifname = itname->second;
124 } 167 }
125 168
126 // Based on the interface name and policy, determine whether we 169 // Based on the interface name and policy, determine whether we
127 // should ignore it. 170 // should ignore it.
128 if (ShouldIgnoreInterface(ifname, policy)) 171 if (ShouldIgnoreInterface(ifname, policy))
129 continue; 172 continue;
130 173
174 NetworkChangeNotifier::ConnectionType type =
175 GetInterfaceConnectionType(ifname);
176
131 networks->push_back( 177 networks->push_back(
132 NetworkInterface(ifname, ifname, it->second.ifa_index, 178 NetworkInterface(ifname, ifname, it->second.ifa_index, type, it->first,
133 NetworkChangeNotifier::CONNECTION_UNKNOWN, it->first,
134 it->second.ifa_prefixlen, ip_attributes)); 179 it->second.ifa_prefixlen, ip_attributes));
135 } 180 }
136 181
137 return true; 182 return true;
138 } 183 }
139 184
140 } // namespace internal 185 } // namespace internal
141 186
142 bool GetNetworkList(NetworkInterfaceList* networks, int policy) { 187 bool GetNetworkList(NetworkInterfaceList* networks, int policy) {
143 if (networks == NULL) 188 if (networks == NULL)
144 return false; 189 return false;
145 190
146 internal::AddressTrackerLinux tracker; 191 internal::AddressTrackerLinux tracker;
147 tracker.Init(); 192 tracker.Init();
148 193
149 return internal::GetNetworkListImpl(networks, policy, 194 return internal::GetNetworkListImpl(
150 tracker.GetOnlineLinks(), 195 networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(),
151 tracker.GetAddressMap(), &if_indextoname); 196 &internal::GetInterfaceName);
152 } 197 }
153 198
154 } // namespace net 199 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698