Land Recent QUIC changes.

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 <string.h>
 #include <sys/socket.h>
@@ skipping 131 matching lines @@
   hdr.msg_name = &raw_address;
   hdr.msg_namelen = sizeof(raw_address);
   hdr.msg_iov = &iov;
   hdr.msg_iovlen = 1;
 
   const int kSpaceForIp = CMSG_SPACE(sizeof(in6_pktinfo));
   char cbuf[kSpaceForIp];
   if (self_address.empty()) {
     hdr.msg_control = 0;
     hdr.msg_controllen = 0;
-  } else if (self_address.size() == sizeof(sockaddr_in)) {
+  } else if (GetAddressFamily(self_address) == ADDRESS_FAMILY_IPV4) {
     cmsghdr *cmsg = reinterpret_cast<cmsghdr*>(cbuf);
     hdr.msg_control = cmsg;
     hdr.msg_controllen = CMSG_SPACE(sizeof(in_pktinfo));
 
     cmsg->cmsg_len = CMSG_LEN(sizeof(in_pktinfo));
     cmsg->cmsg_level = IPPROTO_IP;
     cmsg->cmsg_type = IP_PKTINFO;
     in_pktinfo* pktinfo = reinterpret_cast<in_pktinfo*>(CMSG_DATA(cmsg));
     memset(pktinfo, 0, sizeof(in_pktinfo));
     pktinfo->ipi_ifindex = 0;
@@ skipping 11 matching lines @@
     memcpy(&pktinfo->ipi6_addr, &self_address[0], self_address.size());
   }
 
   int rc = sendmsg(fd, &hdr, 0);
   *error = (rc >= 0) ? 0 : errno;
   return rc;
 }
 
 }  // namespace tools
 }  // namespace net