Landing Recent QUIC changes until 9/2/2015 17:00 UTC.

net/tools/quic/quic_socket_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_socket_utils.h"
 
 #include <errno.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ skipping 98 matching lines @@
   iovec iov = {buffer, buf_len};
   struct sockaddr_storage raw_address;
   msghdr hdr;
 
   hdr.msg_name = &raw_address;
   hdr.msg_namelen = sizeof(sockaddr_storage);
   hdr.msg_iov = &iov;
   hdr.msg_iovlen = 1;
   hdr.msg_flags = 0;
 
-  struct cmsghdr* cmsg = (struct cmsghdr*)cbuf;
+  struct cmsghdr* cmsg = reinterpret_cast<struct cmsghdr*>(cbuf);
   cmsg->cmsg_len = arraysize(cbuf);
   hdr.msg_control = cmsg;
   hdr.msg_controllen = arraysize(cbuf);
 
   int bytes_read = recvmsg(fd, &hdr, 0);
 
   // Return before setting dropped packets: if we get EAGAIN, it will
   // be 0.
   if (bytes_read < 0 && errno != 0) {
     if (errno != EAGAIN) {
@@ skipping 84 matching lines @@
   int rc = sendmsg(fd, &hdr, 0);
   if (rc >= 0) {
     return WriteResult(WRITE_STATUS_OK, rc);
   }
   return WriteResult((errno == EAGAIN || errno == EWOULDBLOCK) ?
       WRITE_STATUS_BLOCKED : WRITE_STATUS_ERROR, errno);
 }
 
 }  // namespace tools
 }  // namespace net