Index: net/base/address_tracker_linux.cc |
diff --git a/net/base/address_tracker_linux.cc b/net/base/address_tracker_linux.cc |
index 367381366954f3280e9171f5d93405f05ed667d7..abcb96c1c6f8e6f24cd1a0438734e03adc16960b 100644 |
--- a/net/base/address_tracker_linux.cc |
+++ b/net/base/address_tracker_linux.cc |
@@ -59,7 +59,7 @@ bool GetAddress(const struct nlmsghdr* header, |
local = reinterpret_cast<unsigned char*>(RTA_DATA(attr)); |
break; |
case IFA_CACHEINFO: { |
- const struct ifa_cacheinfo *cache_info = |
+ const struct ifa_cacheinfo* cache_info = |
reinterpret_cast<const struct ifa_cacheinfo*>(RTA_DATA(attr)); |
if (really_deprecated) |
*really_deprecated = (cache_info->ifa_prefered == 0); |
@@ -129,11 +129,10 @@ void AddressTrackerLinux::Init() { |
addr.nl_family = AF_NETLINK; |
addr.nl_pid = getpid(); |
// TODO(szym): Track RTMGRP_LINK as well for ifi_type, http://crbug.com/113993 |
- addr.nl_groups = RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_NOTIFY | |
- RTMGRP_LINK; |
- int rv = bind(netlink_fd_, |
- reinterpret_cast<struct sockaddr*>(&addr), |
- sizeof(addr)); |
+ addr.nl_groups = |
+ RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_NOTIFY | RTMGRP_LINK; |
+ int rv = bind( |
+ netlink_fd_, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)); |
if (rv < 0) { |
PLOG(ERROR) << "Could not bind NETLINK socket"; |
AbortAndForceOnline(); |
@@ -155,8 +154,11 @@ void AddressTrackerLinux::Init() { |
request.header.nlmsg_pid = getpid(); |
request.msg.rtgen_family = AF_UNSPEC; |
- rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, |
- 0, reinterpret_cast<struct sockaddr*>(&peer), |
+ rv = HANDLE_EINTR(sendto(netlink_fd_, |
+ &request, |
+ request.header.nlmsg_len, |
+ 0, |
+ reinterpret_cast<struct sockaddr*>(&peer), |
sizeof(peer))); |
if (rv < 0) { |
PLOG(ERROR) << "Could not send NETLINK request"; |
@@ -174,7 +176,10 @@ void AddressTrackerLinux::Init() { |
// Request dump of link state |
request.header.nlmsg_type = RTM_GETLINK; |
- rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, 0, |
+ rv = HANDLE_EINTR(sendto(netlink_fd_, |
+ &request, |
+ request.header.nlmsg_len, |
+ 0, |
reinterpret_cast<struct sockaddr*>(&peer), |
sizeof(peer))); |
if (rv < 0) { |
@@ -224,8 +229,8 @@ AddressTrackerLinux::GetCurrentConnectionType() { |
} |
// TODO(droger): Return something more detailed than CONNECTION_UNKNOWN. |
// http://crbug.com/160537 |
- return is_offline_ ? NetworkChangeNotifier::CONNECTION_NONE : |
- NetworkChangeNotifier::CONNECTION_UNKNOWN; |
+ return is_offline_ ? NetworkChangeNotifier::CONNECTION_NONE |
+ : NetworkChangeNotifier::CONNECTION_UNKNOWN; |
} |
void AddressTrackerLinux::ReadMessages(bool* address_changed, |
@@ -277,7 +282,8 @@ void AddressTrackerLinux::HandleMessage(char* buffer, |
const struct nlmsgerr* msg = |
reinterpret_cast<struct nlmsgerr*>(NLMSG_DATA(header)); |
LOG(ERROR) << "Unexpected netlink error " << msg->error << "."; |
- } return; |
+ } |
+ return; |
case RTM_NEWADDR: { |
IPAddressNumber address; |
bool really_deprecated; |
@@ -361,7 +367,8 @@ void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { |
tunnel_callback_.Run(); |
} |
-void AddressTrackerLinux::OnFileCanWriteWithoutBlocking(int /* fd */) {} |
+void AddressTrackerLinux::OnFileCanWriteWithoutBlocking(int /* fd */) { |
+} |
void AddressTrackerLinux::CloseSocket() { |
if (netlink_fd_ >= 0 && IGNORE_EINTR(close(netlink_fd_)) < 0) |