| Index: net/tools/quic/quic_socket_utils.cc
|
| diff --git a/net/tools/quic/quic_socket_utils.cc b/net/tools/quic/quic_socket_utils.cc
|
| index 7b97de38fe189d243cc494b47012d6086a647e40..12db7ad3a3d60994de662a6a28e805876416a1dd 100644
|
| --- a/net/tools/quic/quic_socket_utils.cc
|
| +++ b/net/tools/quic/quic_socket_utils.cc
|
| @@ -23,20 +23,19 @@ namespace net {
|
| namespace tools {
|
|
|
| // static
|
| -IPAddressNumber QuicSocketUtils::GetAddressFromMsghdr(struct msghdr *hdr) {
|
| +IPAddressNumber QuicSocketUtils::GetAddressFromMsghdr(struct msghdr* hdr) {
|
| if (hdr->msg_controllen > 0) {
|
| - for (cmsghdr* cmsg = CMSG_FIRSTHDR(hdr);
|
| - cmsg != NULL;
|
| + for (cmsghdr* cmsg = CMSG_FIRSTHDR(hdr); cmsg != NULL;
|
| cmsg = CMSG_NXTHDR(hdr, cmsg)) {
|
| const uint8* addr_data = NULL;
|
| int len = 0;
|
| if (cmsg->cmsg_type == IPV6_PKTINFO) {
|
| - in6_pktinfo* info = reinterpret_cast<in6_pktinfo*>CMSG_DATA(cmsg);
|
| + in6_pktinfo* info = reinterpret_cast<in6_pktinfo*> CMSG_DATA(cmsg);
|
| in6_addr addr = info->ipi6_addr;
|
| addr_data = reinterpret_cast<const uint8*>(&addr);
|
| len = sizeof(addr);
|
| } else if (cmsg->cmsg_type == IP_PKTINFO) {
|
| - in_pktinfo* info = reinterpret_cast<in_pktinfo*>CMSG_DATA(cmsg);
|
| + in_pktinfo* info = reinterpret_cast<in_pktinfo*> CMSG_DATA(cmsg);
|
| in_addr addr = info->ipi_addr;
|
| addr_data = reinterpret_cast<const uint8*>(&addr);
|
| len = sizeof(addr);
|
| @@ -51,15 +50,14 @@ IPAddressNumber QuicSocketUtils::GetAddressFromMsghdr(struct msghdr *hdr) {
|
| }
|
|
|
| // static
|
| -bool QuicSocketUtils::GetOverflowFromMsghdr(struct msghdr *hdr,
|
| - uint32 *dropped_packets) {
|
| +bool QuicSocketUtils::GetOverflowFromMsghdr(struct msghdr* hdr,
|
| + uint32* dropped_packets) {
|
| if (hdr->msg_controllen > 0) {
|
| - struct cmsghdr *cmsg;
|
| - for (cmsg = CMSG_FIRSTHDR(hdr);
|
| - cmsg != NULL;
|
| + struct cmsghdr* cmsg;
|
| + for (cmsg = CMSG_FIRSTHDR(hdr); cmsg != NULL;
|
| cmsg = CMSG_NXTHDR(hdr, cmsg)) {
|
| if (cmsg->cmsg_type == SO_RXQ_OVFL) {
|
| - *dropped_packets = *(reinterpret_cast<int*>CMSG_DATA(cmsg));
|
| + *dropped_packets = *(reinterpret_cast<int*> CMSG_DATA(cmsg));
|
| return true;
|
| }
|
| }
|
| @@ -71,11 +69,14 @@ bool QuicSocketUtils::GetOverflowFromMsghdr(struct msghdr *hdr,
|
| int QuicSocketUtils::SetGetAddressInfo(int fd, int address_family) {
|
| int get_local_ip = 1;
|
| if (address_family == AF_INET) {
|
| - return setsockopt(fd, IPPROTO_IP, IP_PKTINFO,
|
| - &get_local_ip, sizeof(get_local_ip));
|
| + return setsockopt(
|
| + fd, IPPROTO_IP, IP_PKTINFO, &get_local_ip, sizeof(get_local_ip));
|
| } else {
|
| - return setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
|
| - &get_local_ip, sizeof(get_local_ip));
|
| + return setsockopt(fd,
|
| + IPPROTO_IPV6,
|
| + IPV6_RECVPKTINFO,
|
| + &get_local_ip,
|
| + sizeof(get_local_ip));
|
| }
|
| }
|
|
|
| @@ -98,7 +99,9 @@ bool QuicSocketUtils::SetReceiveBufferSize(int fd, size_t size) {
|
| }
|
|
|
| // static
|
| -int QuicSocketUtils::ReadPacket(int fd, char* buffer, size_t buf_len,
|
| +int QuicSocketUtils::ReadPacket(int fd,
|
| + char* buffer,
|
| + size_t buf_len,
|
| uint32* dropped_packets,
|
| IPAddressNumber* self_address,
|
| IPEndPoint* peer_address) {
|
| @@ -118,7 +121,7 @@ int QuicSocketUtils::ReadPacket(int fd, char* buffer, size_t buf_len,
|
| hdr.msg_iovlen = 1;
|
| hdr.msg_flags = 0;
|
|
|
| - struct cmsghdr *cmsg = (struct cmsghdr *) cbuf;
|
| + struct cmsghdr* cmsg = (struct cmsghdr*)cbuf;
|
| cmsg->cmsg_len = arraysize(cbuf);
|
| hdr.msg_control = cmsg;
|
| hdr.msg_controllen = arraysize(cbuf);
|
| @@ -163,8 +166,7 @@ WriteResult QuicSocketUtils::WritePacket(int fd,
|
| sockaddr_storage raw_address;
|
| socklen_t address_len = sizeof(raw_address);
|
| CHECK(peer_address.ToSockAddr(
|
| - reinterpret_cast<struct sockaddr*>(&raw_address),
|
| - &address_len));
|
| + reinterpret_cast<struct sockaddr*>(&raw_address), &address_len));
|
| iovec iov = {const_cast<char*>(buffer), buf_len};
|
|
|
| msghdr hdr;
|
| @@ -214,8 +216,10 @@ WriteResult QuicSocketUtils::WritePacket(int fd,
|
| if (rc >= 0) {
|
| return WriteResult(WRITE_STATUS_OK, rc);
|
| }
|
| - return WriteResult((errno == EAGAIN || errno == EWOULDBLOCK) ?
|
| - WRITE_STATUS_BLOCKED : WRITE_STATUS_ERROR, errno);
|
| + return WriteResult((errno == EAGAIN || errno == EWOULDBLOCK)
|
| + ? WRITE_STATUS_BLOCKED
|
| + : WRITE_STATUS_ERROR,
|
| + errno);
|
| }
|
|
|
| } // namespace tools
|
|
|