From cf93c8c719932eeaf90cada7e3f57ac79de966cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 10 Feb 2011 18:13:15 +0000 Subject: [PATCH] * FindAddress(), and FindFirstAddress() now return -1 on failure. * FindFirstAddress() did actually not specify the family to find, so that the stack did not have the opportunity to find anything else but the first address. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40421 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/network/libnetapi/NetworkInterface.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kits/network/libnetapi/NetworkInterface.cpp b/src/kits/network/libnetapi/NetworkInterface.cpp index 0a5bf43108..2fa4cffee6 100644 --- a/src/kits/network/libnetapi/NetworkInterface.cpp +++ b/src/kits/network/libnetapi/NetworkInterface.cpp @@ -389,7 +389,7 @@ BNetworkInterface::FindAddress(const BNetworkAddress& address) { int socket = ::socket(address.Family(), SOCK_DGRAM, 0); if (socket < 0) - return errno; + return -1; FileDescriptorCloser closer(socket); @@ -402,7 +402,7 @@ BNetworkInterface::FindAddress(const BNetworkAddress& address) if (ioctl(socket, B_SOCKET_GET_ALIAS, &request, sizeof(struct ifaliasreq)) < 0) - return errno; + return -1; return request.ifra_index; } @@ -413,7 +413,7 @@ BNetworkInterface::FindFirstAddress(int family) { int socket = ::socket(family, SOCK_DGRAM, 0); if (socket < 0) - return errno; + return -1; FileDescriptorCloser closer(socket); @@ -422,11 +422,11 @@ BNetworkInterface::FindFirstAddress(int family) strlcpy(request.ifra_name, Name(), IF_NAMESIZE); request.ifra_index = -1; - request.ifra_addr.ss_family = AF_UNSPEC; + request.ifra_addr.ss_family = family; if (ioctl(socket, B_SOCKET_GET_ALIAS, &request, sizeof(struct ifaliasreq)) < 0) - return errno; + return -1; return request.ifra_index; }