Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: net/tools/quic/quic_socket_utils.cc

Issue 329223003: Changed SetIpInfoInCmsg to return the length of the packet info (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/quic/quic_socket_utils.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 87d16ac1b114f53dc267a63e56c4198787e0f207..3202150917bbb55c9d21a5b1d0ab94e7d6bef29c 100644
--- a/net/tools/quic/quic_socket_utils.cc
+++ b/net/tools/quic/quic_socket_utils.cc
@@ -154,8 +154,8 @@ int QuicSocketUtils::ReadPacket(int fd, char* buffer, size_t buf_len,
return bytes_read;
}
-void QuicSocketUtils::SetIpInfoInCmsg(const IPAddressNumber& self_address,
- cmsghdr* cmsg) {
+size_t QuicSocketUtils::SetIpInfoInCmsg(const IPAddressNumber& self_address,
+ cmsghdr* cmsg) {
if (GetAddressFamily(self_address) == ADDRESS_FAMILY_IPV4) {
cmsg->cmsg_len = CMSG_LEN(sizeof(in_pktinfo));
cmsg->cmsg_level = IPPROTO_IP;
@@ -164,6 +164,7 @@ void QuicSocketUtils::SetIpInfoInCmsg(const IPAddressNumber& self_address,
memset(pktinfo, 0, sizeof(in_pktinfo));
pktinfo->ipi_ifindex = 0;
memcpy(&pktinfo->ipi_spec_dst, &self_address[0], self_address.size());
+ return sizeof(in_pktinfo);
} else {
cmsg->cmsg_len = CMSG_LEN(sizeof(in6_pktinfo));
cmsg->cmsg_level = IPPROTO_IPV6;
@@ -171,6 +172,7 @@ void QuicSocketUtils::SetIpInfoInCmsg(const IPAddressNumber& self_address,
in6_pktinfo* pktinfo = reinterpret_cast<in6_pktinfo*>(CMSG_DATA(cmsg));
memset(pktinfo, 0, sizeof(in6_pktinfo));
memcpy(&pktinfo->ipi6_addr, &self_address[0], self_address.size());
+ return sizeof(in6_pktinfo);
}
}
« no previous file with comments | « net/tools/quic/quic_socket_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698