Index: net/udp/udp_socket_win.h |
diff --git a/net/udp/udp_socket_win.h b/net/udp/udp_socket_win.h |
index bc97d5683655a0fc773d36eadbd535e18c096706..9b0bcf2a22711846ba50821f697e490c600ccc79 100644 |
--- a/net/udp/udp_socket_win.h |
+++ b/net/udp/udp_socket_win.h |
@@ -30,6 +30,10 @@ class NET_EXPORT UDPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
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); |
@@ -104,7 +108,7 @@ class NET_EXPORT UDPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
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_; } |
@@ -114,9 +118,8 @@ class NET_EXPORT UDPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
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 |
@@ -170,8 +173,7 @@ class NET_EXPORT UDPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
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; |
@@ -187,7 +189,7 @@ class NET_EXPORT UDPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
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 |
@@ -215,6 +217,7 @@ class NET_EXPORT UDPSocketWin : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
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(). |