Remove timing limitation to set Broadcast, ReceiveBuffer, and SendBuffer options from UDPSocket.

net/udp/udp_socket_win.h

 // 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.
 
 #ifndef NET_UDP_UDP_SOCKET_WIN_H_
 #define NET_UDP_UDP_SOCKET_WIN_H_
 
 #include <qos2.h>
 #include <winsock2.h>
 
@@ skipping 12 matching lines @@
 namespace net {
 
 class NET_EXPORT UDPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   UDPSocketWin(DatagramSocket::BindType bind_type,
                const RandIntCallback& rand_int_cb,
                net::NetLog* net_log,
                const net::NetLog::Source& source);
   virtual ~UDPSocketWin();
 
+  // Opens the socket.
+  // Returns a net error code.
+  int Open(AddressFamily address_family);

[rvargas (doing something else), 2014/12/02 23:28:10]

#include "net/base/address_family.h"

[hidehiko, 2014/12/03 17:33:28]

Done.

+
   // Connect the socket to connect with a certain |address|.
   // Returns a net error code.
   int Connect(const IPEndPoint& address);
 
   // Bind the address/port for this socket to |address|.  This is generally
   // only used on a server.
   // Returns a net error code.
   int Bind(const IPEndPoint& address);
 
   // Close the socket.

[rvargas (doing something else), 2014/12/02 23:28:10]

I'd like to document that this object cannot be Open()'d  again. We may not add
code to DCHECK for that, but it should at least be documented.

[hidehiko, 2014/12/03 17:33:28]

+1, but, unfortunately, I found that extensions/browser/api/socket/udp_socket.cc
relies on that behavior.
We probably have two options;
1) Move back to allow Bind()->Close()->Bind() patterns.
2) Edit extensions/.../udp_socket.cc to recreate socket.
Which do you prefer?
If latter case, I think I can make a change for it, but it needs to touch the
code a bit more, so I'd like to separate it from this CL, and working on it in a
following CL.

WDYT?

[rvargas (doing something else), 2014/12/03 21:00:16]

The current version is still broken for that use case (and it's broken on ToT).
I think it is fine to fix it in a dedicated CL, but I still don't think that is
a use case we should support (it would be Open - Bind - Close - Open - Bind,
that doesn't really make sense to me).

[hidehiko, 2014/12/04 04:03:36]

OK, let's discuss it separately, considering it is not a regression of this CL.
I'm fine to drop it as long as extensions/ team, who is the only user of it for
now in Chrome, agrees.
Added TODO.

   void Close();
 
   // Copy the remote udp address into |address| and return a network error code.
   int GetPeerAddress(IPEndPoint* address) const;
 
   // Copy the local udp address into |address| and return a network error code.
   // (similar to getsockname)
   int GetLocalAddress(IPEndPoint* address) const;
 
   // IO:
@@ skipping 44 matching lines @@
 
   // Set the receive buffer size (in bytes) for the socket.
   // Returns a net error code.
   int SetReceiveBufferSize(int32 size);
 
   // Set the send buffer size (in bytes) for the socket.
   // Returns a net error code.
   int SetSendBufferSize(int32 size);
 
   // Returns true if the socket is already connected or bound.
-  bool is_connected() const { return socket_ != INVALID_SOCKET; }
+  bool is_connected() const { return is_connected_; }
 
   const BoundNetLog& NetLog() const { return net_log_; }
 
   // Sets corresponding flags in |socket_options_| to allow the socket
   // to share the local address to which the socket will be bound with
   // other processes. Should be called before Bind().
   void AllowAddressReuse();
 
   // Sets corresponding flags in |socket_options_| to allow sending
-  // and receiving packets to and from broadcast addresses. Should be
-  // called before Bind().
-  void AllowBroadcast();
+  // and receiving packets to and from broadcast addresses.
+  int SetBroadcast(bool broadcast);
 
   // Join the multicast group.
   // |group_address| is the group address to join, could be either
   // an IPv4 or IPv6 address.
   // Return a network error code.
   int JoinGroup(const IPAddressNumber& group_address) const;
 
   // Leave the multicast group.
   // |group_address| is the group address to leave, could be either
   // an IPv4 or IPv6 address. If the socket hasn't joined the group,
@@ skipping 33 matching lines @@
   // Set the differentiated services flags on outgoing packets. May not
   // do anything on some platforms.
   int SetDiffServCodePoint(DiffServCodePoint dscp);
 
   // Resets the thread to be used for thread-safety checks.
   void DetachFromThread();
 
  private:
   enum SocketOptions {
     SOCKET_OPTION_REUSE_ADDRESS  = 1 << 0,
-    SOCKET_OPTION_BROADCAST      = 1 << 1,
-    SOCKET_OPTION_MULTICAST_LOOP = 1 << 2
+    SOCKET_OPTION_MULTICAST_LOOP = 1 << 1
   };
 
   class Core;
 
   void DoReadCallback(int rv);
   void DoWriteCallback(int rv);
   void DidCompleteRead();
   void DidCompleteWrite();
 
   // Handles stats and logging. |result| is the number of bytes transferred, on
   // success, or the net error code on failure. LogRead retrieves the address
   // from |recv_addr_storage_|, while LogWrite takes it as an optional argument.
   void LogRead(int result, const char* bytes) const;
   void LogWrite(int result, const char* bytes, const IPEndPoint* address) const;
 
-  // Returns the OS error code (or 0 on success).
+  // Returns a net error code.
   int CreateSocket(int addr_family);
 
   // Same as SendTo(), except that address is passed by pointer
   // instead of by reference. It is called from Write() with |address|
   // set to NULL.
   int SendToOrWrite(IOBuffer* buf,
                     int buf_len,
                     const IPEndPoint* address,
                     const CompletionCallback& callback);
 
   int InternalConnect(const IPEndPoint& address);
   int InternalRecvFrom(IOBuffer* buf, int buf_len, IPEndPoint* address);
   int InternalSendTo(IOBuffer* buf, int buf_len, const IPEndPoint* address);
 
   // Applies |socket_options_| to |socket_|. Should be called before
   // Bind().
   int SetSocketOptions();
   int DoBind(const IPEndPoint& address);
   // Binds to a random port on |address|.
   int RandomBind(const IPAddressNumber& address);
 
   // Attempts to convert the data in |recv_addr_storage_| and |recv_addr_len_|
   // to an IPEndPoint and writes it to |address|. Returns true on success.
   bool ReceiveAddressToIPEndpoint(IPEndPoint* address) const;
 
   SOCKET socket_;
   int addr_family_;
+  bool is_connected_;
 
   // Bitwise-or'd combination of SocketOptions. Specifies the set of
   // options that should be applied to |socket_| before Bind().
   int socket_options_;
 
   // Multicast interface.
   uint32 multicast_interface_;
 
   // Multicast socket options cached for SetSocketOption.
   // Cannot be used after Bind().
@@ skipping 90 matching lines @@
   SetFlowFn set_flow_func_;
 
   FRIEND_TEST_ALL_PREFIXES(UDPSocketTest, SetDSCPFake);
   DISALLOW_COPY_AND_ASSIGN(QwaveAPI);
 };
 
 
 }  // namespace net
 
 #endif  // NET_UDP_UDP_SOCKET_WIN_H_