| 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 3ac0bf3199b86d1451b7a8dad4181e18c0799b7f..0eb11858cbe36425eca78b844dd4af70f8902064 100644
|
| --- a/net/tools/quic/quic_socket_utils.cc
|
| +++ b/net/tools/quic/quic_socket_utils.cc
|
| @@ -23,7 +23,7 @@ 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 != nullptr;
|
| @@ -51,11 +51,10 @@ IPAddressNumber QuicSocketUtils::GetAddressFromMsghdr(struct msghdr *hdr) {
|
| }
|
|
|
| // static
|
| -bool QuicSocketUtils::GetOverflowFromMsghdr(
|
| - struct msghdr *hdr,
|
| - QuicPacketCount *dropped_packets) {
|
| +bool QuicSocketUtils::GetOverflowFromMsghdr(struct msghdr* hdr,
|
| + QuicPacketCount* dropped_packets) {
|
| if (hdr->msg_controllen > 0) {
|
| - struct cmsghdr *cmsg;
|
| + struct cmsghdr* cmsg;
|
| for (cmsg = CMSG_FIRSTHDR(hdr);
|
| cmsg != nullptr;
|
| cmsg = CMSG_NXTHDR(hdr, cmsg)) {
|
| @@ -103,7 +102,7 @@ int QuicSocketUtils::ReadPacket(int fd, char* buffer, size_t buf_len,
|
| QuicPacketCount* dropped_packets,
|
| IPAddressNumber* self_address,
|
| IPEndPoint* peer_address) {
|
| - CHECK(peer_address != nullptr);
|
| + DCHECK(peer_address != nullptr);
|
| const int kSpaceForOverflowAndIp =
|
| CMSG_SPACE(sizeof(int)) + CMSG_SPACE(sizeof(in6_pktinfo));
|
| char cbuf[kSpaceForOverflowAndIp];
|
| @@ -119,7 +118,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);
|
| @@ -209,7 +208,7 @@ WriteResult QuicSocketUtils::WritePacket(int fd,
|
| } else {
|
| hdr.msg_control = cbuf;
|
| hdr.msg_controllen = kSpaceForIp;
|
| - cmsghdr *cmsg = CMSG_FIRSTHDR(&hdr);
|
| + cmsghdr* cmsg = CMSG_FIRSTHDR(&hdr);
|
| SetIpInfoInCmsg(self_address, cmsg);
|
| hdr.msg_controllen = cmsg->cmsg_len;
|
| }
|
|
|