Add SetMsgConfirm(bool) to udp_socket_posix and udp_socket_win

Bug: 818893
Change-Id: I58d04134464770368736cfb513a515d0debfead5
Reviewed-on: https://chromium-review.googlesource.com/956929Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Ryan Hamilton <rch@chromium.org>
Commit-Queue: Yixin Wang <wangyix@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543416}

content/browser/renderer_host/p2p/socket_host_udp_unittest.cc

@@ -126,6 +126,8 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket {
 
   int SetDoNotFragment() override { return net::OK; }
 
+  void SetMsgConfirm(bool confirm) override {}
+
   void ReceivePacket(const net::IPEndPoint& address, std::vector<char> data) {
     if (!recv_callback_.is_null()) {
       int size = std::min(recv_size_, static_cast<int>(data.size()));

net/dns/address_sorter_posix_unittest.cc

@@ -79,6 +79,7 @@ class TestUDPClientSocket : public DatagramClientSocket {
     return NetworkChangeNotifier::kInvalidNetworkHandle;
   }
   void ApplySocketTag(const SocketTag& tag) override {}
+  void SetMsgConfirm(bool confirm) override {}
 
   int Connect(const IPEndPoint& remote) override {
     if (connected_)

net/dns/mock_mdns_socket_factory.h

@@ -45,6 +45,7 @@ class MockMDnsDatagramServerSocket : public DatagramServerSocket {
   MOCK_METHOD1(SetReceiveBufferSize, int(int32_t size));
   MOCK_METHOD1(SetSendBufferSize, int(int32_t size));
   MOCK_METHOD0(SetDoNotFragment, int());
+  MOCK_METHOD1(SetMsgConfirm, void(bool confirm));
 
   MOCK_METHOD0(Close, void());
 

net/socket/datagram_socket.h

@@ -45,6 +45,10 @@ class NET_EXPORT_PRIVATE DatagramSocket {
   // return ERR_IO_PENDING.
   virtual int SetDoNotFragment() = 0;
 
+  // If |confirm| is true, then the MSG_CONFIRM flag will be passed to
+  // subsequent writes if it's supported by the platform.
+  virtual void SetMsgConfirm(bool confirm) = 0;
+
   // Gets the NetLog for this socket.
   virtual const NetLogWithSource& NetLog() const = 0;
 };

net/socket/fuzzed_datagram_client_socket.h

@@ -59,6 +59,7 @@ class FuzzedDatagramClientSocket : public DatagramClientSocket {
   int SetReceiveBufferSize(int32_t size) override;
   int SetSendBufferSize(int32_t size) override;
   int SetDoNotFragment() override;
+  void SetMsgConfirm(bool confirm) override {}
 
  private:
   void OnReadComplete(const net::CompletionCallback& callback, int result);

net/socket/socket_test_util.h

@@ -799,6 +799,7 @@ class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket {
   int ConnectUsingDefaultNetwork(const IPEndPoint& address) override;
   NetworkChangeNotifier::NetworkHandle GetBoundNetwork() const override;
   void ApplySocketTag(const SocketTag& tag) override;
+  void SetMsgConfirm(bool confirm) override {}
 
   // AsyncSocket implementation.
   void OnReadComplete(const MockRead& data) override;

net/socket/udp_client_socket.cc

@@ -119,6 +119,10 @@ int UDPClientSocket::SetDoNotFragment() {
   return socket_.SetDoNotFragment();
 }
 
+void UDPClientSocket::SetMsgConfirm(bool confirm) {
+  socket_.SetMsgConfirm(confirm);
+}
+
 const NetLogWithSource& UDPClientSocket::NetLog() const {
   return socket_.NetLog();
 }

net/socket/udp_client_socket.h

@@ -49,6 +49,7 @@ class NET_EXPORT_PRIVATE UDPClientSocket : public DatagramClientSocket {
   int SetReceiveBufferSize(int32_t size) override;
   int SetSendBufferSize(int32_t size) override;
   int SetDoNotFragment() override;
+  void SetMsgConfirm(bool confirm) override;
   const NetLogWithSource& NetLog() const override;
   void EnableRecvOptimization() override;
 

net/socket/udp_server_socket.cc

@@ -67,6 +67,10 @@ int UDPServerSocket::SetDoNotFragment() {
   return socket_.SetDoNotFragment();
 }
 
+void UDPServerSocket::SetMsgConfirm(bool confirm) {
+  return socket_.SetMsgConfirm(confirm);
+}
+
 void UDPServerSocket::Close() {
   socket_.Close();
 }

net/socket/udp_server_socket.h

@@ -39,6 +39,7 @@ class NET_EXPORT UDPServerSocket : public DatagramServerSocket {
   int SetReceiveBufferSize(int32_t size) override;
   int SetSendBufferSize(int32_t size) override;
   int SetDoNotFragment() override;
+  void SetMsgConfirm(bool confirm) override;
   void Close() override;
   int GetPeerAddress(IPEndPoint* address) const override;
   int GetLocalAddress(IPEndPoint* address) const override;

net/socket/udp_socket_posix.cc

@@ -199,6 +199,7 @@ UDPSocketPosix::UDPSocketPosix(DatagramSocket::BindType bind_type,
       addr_family_(0),
       is_connected_(false),
       socket_options_(SOCKET_OPTION_MULTICAST_LOOP),
+      sendto_flags_(0),
       multicast_interface_(0),
       multicast_time_to_live_(1),
       bind_type_(bind_type),
@@ -649,6 +650,16 @@ int UDPSocketPosix::SetDoNotFragment() {
 #endif
 }
 
+void UDPSocketPosix::SetMsgConfirm(bool confirm) {
+#if !defined(OS_MACOSX) && !defined(OS_IOS)
+  if (confirm) {
+    sendto_flags_ |= MSG_CONFIRM;
+  } else {
+    sendto_flags_ &= ~MSG_CONFIRM;
+  }
+#endif  // !defined(OS_MACOSX) && !defined(OS_IOS)
+}
+
 int UDPSocketPosix::AllowAddressReuse() {
   DCHECK_NE(socket_, kInvalidSocket);
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
@@ -867,12 +878,8 @@ int UDPSocketPosix::InternalSendTo(IOBuffer* buf,
     }
   }
 
-  int result = HANDLE_EINTR(sendto(socket_,
-                            buf->data(),
-                            buf_len,
-                            0,
-                            addr,
-                            storage.addr_len));
+  int result = HANDLE_EINTR(sendto(socket_, buf->data(), buf_len, sendto_flags_,
+                                   addr, storage.addr_len));
   if (result < 0)
     result = MapSystemError(errno);
   if (result != ERR_IO_PENDING)

net/socket/udp_socket_posix.h

@@ -177,6 +177,10 @@ class NET_EXPORT UDPSocketPosix {
   // return ERR_IO_PENDING.
   int SetDoNotFragment();
 
+  // If |confirm| is true, then the MSG_CONFIRM flag will be passed to
+  // subsequent writes if it's supported by the platform.
+  void SetMsgConfirm(bool confirm);
+
   // Returns true if the socket is already connected or bound.
   bool is_connected() const { return is_connected_; }
 
@@ -354,6 +358,9 @@ class NET_EXPORT UDPSocketPosix {
   // options that should be applied to |socket_| before Bind().
   int socket_options_;
 
+  // Flags passed to sendto().
+  int sendto_flags_;
+
   // Multicast interface.
   uint32_t multicast_interface_;
 

net/socket/udp_socket_win.cc

@@ -567,6 +567,8 @@ int UDPSocketWin::SetDoNotFragment() {
   return rv == 0 ? OK : MapSystemError(WSAGetLastError());
 }
 
+void UDPSocketWin::SetMsgConfirm(bool confirm) {}
+
 int UDPSocketWin::AllowAddressReuse() {
   DCHECK_NE(socket_, INVALID_SOCKET);
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);

net/socket/udp_socket_win.h

@@ -137,6 +137,9 @@ class NET_EXPORT UDPSocketWin : public base::win::ObjectWatcher::Delegate {
   // return ERR_IO_PENDING.
   int SetDoNotFragment();
 
+  // This is a no-op on Windows.
+  void SetMsgConfirm(bool confirm);
+
   // Returns true if the socket is already connected or bound.
   bool is_connected() const { return is_connected_; }