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

net/udp/udp_socket_libevent.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_LIBEVENT_H_
 #define NET_UDP_UDP_SOCKET_LIBEVENT_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 10 matching lines @@
 namespace net {
 
 class NET_EXPORT UDPSocketLibevent : public base::NonThreadSafe {
  public:
   UDPSocketLibevent(DatagramSocket::BindType bind_type,
                     const RandIntCallback& rand_int_cb,
                     net::NetLog* net_log,
                     const net::NetLog::Source& source);
   virtual ~UDPSocketLibevent();
 
+  // Opens the socket.
+  // Returns a net error code.
+  int Open(AddressFamily address_family);
+
   // Connect the socket to connect with a certain |address|.
+  // Should be called after Open().

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

The comments should be the same for both implementations. (and elsewhere)

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

Done.

   // 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.
+  // only used on a server. Should be called after Open().
   // Returns a net error code.
   int Bind(const IPEndPoint& address);
 
   // Close the socket.
   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.
@@ skipping 40 matching lines @@
   // |callback| is the user callback function to call on complete.
   // Returns a net error code, or ERR_IO_PENDING if the IO is in progress.
   // If ERR_IO_PENDING is returned, the caller must keep |buf| and |address|
   // alive until the callback is called.
   int SendTo(IOBuffer* buf,
              int buf_len,
              const IPEndPoint& address,
              const CompletionCallback& callback);
 
   // Set the receive buffer size (in bytes) for the socket.
+  // Returns a network error code.
   int SetReceiveBufferSize(int32 size);
 
   // Set the send buffer size (in bytes) for the socket.
+  // Returns a network error code.
   int SetSendBufferSize(int32 size);
 
   // Returns true if the socket is already connected or bound.
-  bool is_connected() const { return socket_ != kInvalidSocket; }
+  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();
+  // Sets corresponding flags in |socket_options_| to allow or disallow sending
+  // and receiving packets to and from broadcast addresses.
+  // Returns a network error code.
+  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 36 matching lines @@
   // do anything on some platforms.
   // Return a network error code.
   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 ReadWatcher : public base::MessageLoopForIO::Watcher {
    public:
     explicit ReadWatcher(UDPSocketLibevent* socket) : socket_(socket) {}
 
     // MessageLoopForIO::Watcher methods
 
     void OnFileCanReadWithoutBlocking(int /* fd */) override;
 
@@ skipping 27 matching lines @@
   void DidCompleteWrite();
 
   // Handles stats and logging. |result| is the number of bytes transferred, on
   // success, or the net error code on failure. On success, LogRead takes in a
   // sockaddr and its length, which are mandatory, while LogWrite takes in an
   // optional IPEndPoint.
   void LogRead(int result, const char* bytes, socklen_t addr_len,
                const sockaddr* addr) const;
   void LogWrite(int result, const char* bytes, const IPEndPoint* address) const;
 
-  // Returns the OS error code (or 0 on success).
+  // Returns a network error code.

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

nit: network -> net

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

Done.

   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);
 
   int 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 36 matching lines @@
   CompletionCallback write_callback_;
 
   BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(UDPSocketLibevent);
 };
 
 }  // namespace net
 
 #endif  // NET_UDP_UDP_SOCKET_LIBEVENT_H_