summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 08:13:10 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 08:13:10 +0000
commit8edc52cb4737bebd5f95b64ccd3d9c90354f55bd (patch)
treebffbebb6b5df36e4d20b42bc3fa3b2fbe06d542f /net
parentbe730632fbb8b146dd8e806292de32ee6a1ed1cc (diff)
downloadchromium_src-8edc52cb4737bebd5f95b64ccd3d9c90354f55bd.zip
chromium_src-8edc52cb4737bebd5f95b64ccd3d9c90354f55bd.tar.gz
chromium_src-8edc52cb4737bebd5f95b64ccd3d9c90354f55bd.tar.bz2
Fix error checking and error reporting in GetIPv4AddressFromIndex.
R=vitalybuka@chromium.org BUG=none TEST=none Review URL: https://codereview.chromium.org/185403013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/udp/udp_socket_libevent.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/udp/udp_socket_libevent.cc b/net/udp/udp_socket_libevent.cc
index a51567d..d794e3b 100644
--- a/net/udp/udp_socket_libevent.cc
+++ b/net/udp/udp_socket_libevent.cc
@@ -47,10 +47,10 @@ int GetIPv4AddressFromIndex(int socket, uint32 index, uint32* address){
ifreq ifr;
ifr.ifr_addr.sa_family = AF_INET;
if (!if_indextoname(index, ifr.ifr_name))
- return ERR_FAILED;
+ return MapSystemError(errno);
int rv = ioctl(socket, SIOCGIFADDR, &ifr);
- if (!rv)
- return MapSystemError(rv);
+ if (rv == -1)
+ return MapSystemError(errno);
*address = reinterpret_cast<sockaddr_in*>(&ifr.ifr_addr)->sin_addr.s_addr;
return OK;
}