summaryrefslogtreecommitdiffstats
path: root/net/udp
diff options
context:
space:
mode:
authorikarienator@chromium.org <ikarienator@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-01 21:18:07 +0000
committerikarienator@chromium.org <ikarienator@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-01 21:18:07 +0000
commitbd2e3758a392e3480d976101007fb4285771cf38 (patch)
tree74973c11e57a6fb686f5a489b9575e98e3cae6d9 /net/udp
parent2562218e74d2a1d29c72ea4bbd372c0fcfc68205 (diff)
downloadchromium_src-bd2e3758a392e3480d976101007fb4285771cf38.zip
chromium_src-bd2e3758a392e3480d976101007fb4285771cf38.tar.gz
chromium_src-bd2e3758a392e3480d976101007fb4285771cf38.tar.bz2
Adding ERR_SOCKET_IS_CONNECTED.
BUG=235066 Review URL: https://chromiumcodereview.appspot.com/14666002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/udp')
-rw-r--r--net/udp/udp_socket_libevent.cc6
-rw-r--r--net/udp/udp_socket_win.cc6
2 files changed, 6 insertions, 6 deletions
diff --git a/net/udp/udp_socket_libevent.cc b/net/udp/udp_socket_libevent.cc
index f713786..4520c47 100644
--- a/net/udp/udp_socket_libevent.cc
+++ b/net/udp/udp_socket_libevent.cc
@@ -522,7 +522,7 @@ int UDPSocketLibevent::SetSocketOptions() {
int UDPSocketLibevent::DoBind(const IPEndPoint& address) {
SockaddrStorage storage;
if (!address.ToSockAddr(storage.addr, &storage.addr_len))
- return ERR_UNEXPECTED;
+ return ERR_ADDRESS_INVALID;
int rv = bind(socket_, storage.addr, storage.addr_len);
return rv < 0 ? MapSystemError(errno) : rv;
}
@@ -617,7 +617,7 @@ int UDPSocketLibevent::LeaveGroup(const IPAddressNumber& group_address) const {
int UDPSocketLibevent::SetMulticastTimeToLive(int time_to_live) {
DCHECK(CalledOnValidThread());
if (is_connected())
- return ERR_UNEXPECTED;
+ return ERR_SOCKET_IS_CONNECTED;
if (time_to_live < 0 || time_to_live > 255)
return ERR_INVALID_ARGUMENT;
@@ -628,7 +628,7 @@ int UDPSocketLibevent::SetMulticastTimeToLive(int time_to_live) {
int UDPSocketLibevent::SetMulticastLoopbackMode(bool loopback) {
DCHECK(CalledOnValidThread());
if (is_connected())
- return ERR_UNEXPECTED;
+ return ERR_SOCKET_IS_CONNECTED;
if (loopback)
socket_options_ |= SOCKET_OPTION_MULTICAST_LOOP;
diff --git a/net/udp/udp_socket_win.cc b/net/udp/udp_socket_win.cc
index b1c5846..c3fd561 100644
--- a/net/udp/udp_socket_win.cc
+++ b/net/udp/udp_socket_win.cc
@@ -615,7 +615,7 @@ int UDPSocketWin::SetSocketOptions() {
int UDPSocketWin::DoBind(const IPEndPoint& address) {
SockaddrStorage storage;
if (!address.ToSockAddr(storage.addr, &storage.addr_len))
- return ERR_UNEXPECTED;
+ return ERR_ADDRESS_INVALID;
int rv = bind(socket_, storage.addr, storage.addr_len);
return rv < 0 ? MapSystemError(WSAGetLastError()) : rv;
}
@@ -720,7 +720,7 @@ int UDPSocketWin::LeaveGroup(
int UDPSocketWin::SetMulticastTimeToLive(int time_to_live) {
DCHECK(CalledOnValidThread());
if (is_connected())
- return ERR_UNEXPECTED;
+ return ERR_SOCKET_IS_CONNECTED;
if (time_to_live < 0 || time_to_live > 255)
return ERR_INVALID_ARGUMENT;
@@ -731,7 +731,7 @@ int UDPSocketWin::SetMulticastTimeToLive(int time_to_live) {
int UDPSocketWin::SetMulticastLoopbackMode(bool loopback) {
DCHECK(CalledOnValidThread());
if (is_connected())
- return ERR_UNEXPECTED;
+ return ERR_SOCKET_IS_CONNECTED;
if (loopback)
socket_options_ |= SOCKET_OPTION_MULTICAST_LOOP;