[haiku-commits] haiku: hrev48705 - src/kits/network src/kits/network/libnetapi headers/os/net src/servers/net src/bin/network/ifconfig
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 21 Jan 2015 10:05:58 +0100 (CET)
hrev48705 adds 1 changeset to branch 'master'
old head: a66de90c4925689363cf8a6acb0d16953b574ee5
new head: 31ea76548a64b232ed10cb444bf84ca1f7e40b0f
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=31ea76548a64+%5Ea66de90c4925
----------------------------------------------------------------------------
31ea76548a64: Move getifaddrs to libnetwork again.
* BNetworkInterfaceAddress is moved to libnetwork. It is modified to not
use BNetworkAddress (which is in libbnetapi) and instead use sockaddr
and sockaddr_storage directly. All callers are adjusted to this.
* Some support code is shared between BNetworkInterface and
BNetworkInterfaceAddress, move it to libnetwork but in the BPrivate
namespace.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48705
Commit: 31ea76548a64b232ed10cb444bf84ca1f7e40b0f
URL: http://cgit.haiku-os.org/haiku/commit/?id=31ea76548a64
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Tue Jan 20 13:30:24 2015 UTC
----------------------------------------------------------------------------
17 files changed, 346 insertions(+), 278 deletions(-)
headers/os/net/NetworkAddress.h | 2 -
headers/os/net/NetworkInterface.h | 35 +++--
src/apps/networkstatus/NetworkStatusView.cpp | 9 +-
src/bin/network/ifconfig/ifconfig.cpp | 16 ++-
src/kits/network/Jamfile | 5 +
src/kits/network/NetworkInterfaceAddress.cpp | 135 ++++++++++++++++++
src/kits/network/getifaddrs.cpp | 141 +++++++++++++++++++
src/kits/network/libnetapi/AbstractSocket.cpp | 2 +-
src/kits/network/libnetapi/DatagramSocket.cpp | 7 +-
src/kits/network/libnetapi/Jamfile | 1 -
src/kits/network/libnetapi/NetworkAddress.cpp | 12 --
src/kits/network/libnetapi/NetworkInterface.cpp | 128 ++---------------
src/kits/network/libnetapi/getifaddrs.cpp | 103 --------------
.../network/InterfacesAddOn/NetworkSettings.cpp | 8 +-
src/servers/net/DHCPClient.cpp | 2 +-
src/servers/net/NetServer.cpp | 14 +-
src/servers/net/Services.cpp | 4 +-
----------------------------------------------------------------------------
diff --git a/headers/os/net/NetworkAddress.h b/headers/os/net/NetworkAddress.h
index 865ed73..207e9cf 100644
--- a/headers/os/net/NetworkAddress.h
+++ b/headers/os/net/NetworkAddress.h
@@ -138,9 +138,7 @@ public:
operator const
sockaddr*() const;
operator const
sockaddr&() const;
- operator const
sockaddr*();
operator
sockaddr*();
- operator const
sockaddr&();
operator
sockaddr&();
private:
diff --git a/headers/os/net/NetworkInterface.h
b/headers/os/net/NetworkInterface.h
index 9e46cdb..a059774 100644
--- a/headers/os/net/NetworkInterface.h
+++ b/headers/os/net/NetworkInterface.h
@@ -8,11 +8,12 @@
#include <net/if.h>
#include <net/if_types.h>
+#include <sys/socket.h>
#include <ObjectList.h>
-#include <NetworkAddress.h>
+class BNetworkAddress;
class BNetworkInterface;
@@ -21,24 +22,20 @@ public:
BNetworkInterfaceAddress();
~BNetworkInterfaceAddress();
- status_t SetTo(const
BNetworkInterface& interface,
+ status_t SetTo(const char*
interfaceName,
int32
index);
- void SetAddress(const
BNetworkAddress& address);
- void SetMask(const
BNetworkAddress& mask);
- void SetBroadcast(const
BNetworkAddress& broadcast);
- void SetDestination(
- const
BNetworkAddress& destination);
+ void SetAddress(const
sockaddr& address);
+ void SetMask(const sockaddr&
mask);
+ void SetBroadcast(const
sockaddr& broadcast);
+ void SetDestination(const
sockaddr& destination);
- BNetworkAddress& Address() { return fAddress; }
- BNetworkAddress& Mask() { return fMask; }
- BNetworkAddress& Broadcast() { return
fBroadcast; }
- BNetworkAddress& Destination() { return
fBroadcast; }
-
- const BNetworkAddress& Address() const { return
fAddress; }
- const BNetworkAddress& Mask() const { return fMask; }
- const BNetworkAddress& Broadcast() const { return
fBroadcast; }
- const BNetworkAddress& Destination() const { return
fBroadcast; }
+ const sockaddr& Address() const { return
(sockaddr&)fAddress; }
+ const sockaddr& Mask() const { return
(sockaddr&)fMask; }
+ const sockaddr& Broadcast() const
+ {
return (sockaddr&)fBroadcast; }
+ const sockaddr& Destination() const
+ {
return (sockaddr&)fBroadcast; }
void SetFlags(uint32 flags);
uint32 Flags() const { return
fFlags; }
@@ -47,9 +44,9 @@ public:
private:
int32 fIndex;
- BNetworkAddress fAddress;
- BNetworkAddress fMask;
- BNetworkAddress fBroadcast;
+ sockaddr_storage fAddress;
+ sockaddr_storage fMask;
+ sockaddr_storage fBroadcast;
uint32 fFlags;
};
diff --git a/src/apps/networkstatus/NetworkStatusView.cpp
b/src/apps/networkstatus/NetworkStatusView.cpp
index c678fd4..52691c5 100644
--- a/src/apps/networkstatus/NetworkStatusView.cpp
+++ b/src/apps/networkstatus/NetworkStatusView.cpp
@@ -357,9 +357,12 @@ NetworkStatusView::_ShowConfiguration(BMessage* message)
size_t boldLength = text.Length();
- text << "\n" << B_TRANSLATE("Address") << ": " <<
address.Address().ToString();
- text << "\n" << B_TRANSLATE("Broadcast") << ": " <<
address.Broadcast().ToString();
- text << "\n" << B_TRANSLATE("Netmask") << ": " <<
address.Mask().ToString();
+ text << "\n" << B_TRANSLATE("Address") << ": "
+ << BNetworkAddress(address.Address()).ToString();
+ text << "\n" << B_TRANSLATE("Broadcast") << ": "
+ << BNetworkAddress(address.Broadcast()).ToString();
+ text << "\n" << B_TRANSLATE("Netmask") << ": "
+ << BNetworkAddress(address.Mask()).ToString();
BAlert* alert = new BAlert(name, text.String(), B_TRANSLATE("OK"));
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
diff --git a/src/bin/network/ifconfig/ifconfig.cpp
b/src/bin/network/ifconfig/ifconfig.cpp
index b9c481d..a0815d9 100644
--- a/src/bin/network/ifconfig/ifconfig.cpp
+++ b/src/bin/network/ifconfig/ifconfig.cpp
@@ -474,20 +474,24 @@ list_interface_addresses(BNetworkInterface& interface,
uint32 flags)
break;
const address_family* family
- = address_family_for(address.Address().Family());
+ = address_family_for(address.Address().sa_family);
printf("\t%s addr: %s", family->name,
- address.Address().ToString().String());
+ BNetworkAddress(address.Address()).ToString().String());
- if ((flags & IFF_BROADCAST) != 0)
- printf(", Bcast: %s",
address.Broadcast().ToString().String());
+ if ((flags & IFF_BROADCAST) != 0) {
+ printf(", Bcast: %s",
+
BNetworkAddress(address.Broadcast()).ToString().String());
+ }
switch (family->preferred_format) {
case PREFER_OUTPUT_MASK:
- printf(", Mask: %s",
address.Mask().ToString().String());
+ printf(", Mask: %s",
+
BNetworkAddress(address.Mask()).ToString().String());
break;
case PREFER_OUTPUT_PREFIX_LENGTH:
- printf(", Prefix Length: %zu",
address.Mask().PrefixLength());
+ printf(", Prefix Length: %zu",
+
BNetworkAddress(address.Mask()).PrefixLength());
break;
}
diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile
index c57bdd8..15e78cc 100644
--- a/src/kits/network/Jamfile
+++ b/src/kits/network/Jamfile
@@ -11,13 +11,18 @@ for architectureObject in [ MultiArchSubDirSetup ] {
local architecture = $(TARGET_PACKAGING_ARCH) ;
UsePrivateSystemHeaders ;
+ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ]
: true ;
local libnetwork = [ MultiArchDefaultGristFiles libnetwork.so ]
;
SharedLibrary $(libnetwork) :
+ getifaddrs.cpp
init.cpp
interfaces.cpp
socket.cpp
r5_compatibility.cpp
+
+ NetworkInterfaceAddress.cpp
+
:
<libbind!$(architecture)>libbind.o
[ TargetLibsupc++ ]
diff --git a/src/kits/network/NetworkInterfaceAddress.cpp
b/src/kits/network/NetworkInterfaceAddress.cpp
new file mode 100644
index 0000000..8620f47
--- /dev/null
+++ b/src/kits/network/NetworkInterfaceAddress.cpp
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2010, Axel Dörfler, axeld@xxxxxxxxxxxxxxxx.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <NetworkInterface.h>
+
+#include <errno.h>
+#include <string.h>
+#include <sys/sockio.h>
+
+#include <AutoDeleter.h>
+
+
+namespace BPrivate {
+
+int
+family_from_interface_address(const BNetworkInterfaceAddress& address)
+{
+ if (address.Address().sa_family != AF_UNSPEC)
+ return address.Address().sa_family;
+ if (address.Mask().sa_family != AF_UNSPEC)
+ return address.Mask().sa_family;
+ if (address.Destination().sa_family != AF_UNSPEC)
+ return address.Destination().sa_family;
+
+ return AF_INET;
+}
+
+
+status_t
+do_ifaliasreq(const char* name, int32 option, BNetworkInterfaceAddress&
address,
+ bool readBack = false)
+{
+ int family = AF_INET;
+ if (!readBack)
+ family = family_from_interface_address(address);
+
+ int socket = ::socket(family, SOCK_DGRAM, 0);
+ if (socket < 0)
+ return errno;
+
+ FileDescriptorCloser closer(socket);
+
+ ifaliasreq request;
+ strlcpy(request.ifra_name, name, IF_NAMESIZE);
+ request.ifra_index = address.Index();
+ request.ifra_flags = address.Flags();
+
+ memcpy(&request.ifra_addr, &address.Address(),
+ address.Address().sa_len);
+ memcpy(&request.ifra_mask, &address.Mask(),
+ address.Mask().sa_len);
+ memcpy(&request.ifra_broadaddr, &address.Broadcast(),
+ address.Broadcast().sa_len);
+
+ if (ioctl(socket, option, &request, sizeof(struct ifaliasreq)) < 0)
+ return errno;
+
+ if (readBack) {
+ address.SetFlags(request.ifra_flags);
+ address.SetAddress((sockaddr&)request.ifra_addr);
+ address.SetMask((sockaddr&)request.ifra_mask);
+ address.SetBroadcast((sockaddr&)request.ifra_broadaddr);
+ }
+
+ return B_OK;
+}
+
+};
+
+using namespace BPrivate;
+
+
+// #pragma mark -
+
+
+BNetworkInterfaceAddress::BNetworkInterfaceAddress()
+ :
+ fIndex(-1),
+ fFlags(0)
+{
+}
+
+
+BNetworkInterfaceAddress::~BNetworkInterfaceAddress()
+{
+}
+
+
+status_t
+BNetworkInterfaceAddress::SetTo(const char* name, int32 index)
+{
+ fIndex = index;
+ return do_ifaliasreq(name, B_SOCKET_GET_ALIAS, *this, true);
+}
+
+
+void
+BNetworkInterfaceAddress::SetAddress(const sockaddr& address)
+{
+ memcpy(&fAddress, &address, address.sa_len);
+}
+
+
+void
+BNetworkInterfaceAddress::SetMask(const sockaddr& mask)
+{
+ memcpy(&fMask, &mask, mask.sa_len);
+}
+
+
+void
+BNetworkInterfaceAddress::SetBroadcast(const sockaddr& broadcast)
+{
+ memcpy(&fBroadcast, &broadcast, broadcast.sa_len);
+}
+
+
+void
+BNetworkInterfaceAddress::SetDestination(const sockaddr& destination)
+{
+ memcpy(&fBroadcast, &destination, destination.sa_len);
+}
+
+
+void
+BNetworkInterfaceAddress::SetFlags(uint32 flags)
+{
+ fFlags = flags;
+}
+
+
+
diff --git a/src/kits/network/getifaddrs.cpp b/src/kits/network/getifaddrs.cpp
new file mode 100644
index 0000000..436ab2f
--- /dev/null
+++ b/src/kits/network/getifaddrs.cpp
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2015, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Adrien Destugues, pulkomandy@xxxxxxxxxxxxx
+ */
+
+
+#include <ifaddrs.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/sockio.h>
+#include <unistd.h>
+
+#include <AutoDeleter.h>
+#include <NetworkAddress.h>
+#include <NetworkInterface.h>
+#include <NetworkRoster.h>
+
+
+// This structure has an ifaddrs and all the information it refers to. We can
+// allocate this in a single call to the allocator instead of allocating each
+// address, the name, and the ifaddr struct itself separately. This simplifies
+// the error handling and the freeing of the structure, and reduces the stress
+// on the memory allocator.
+struct IfaddrContainer {
+ ifaddrs header;
+
+ sockaddr_storage address;
+ sockaddr_storage mask;
+ sockaddr_storage destination;
+ char name[0];
+};
+
+
+int
+getifaddrs(struct ifaddrs **ifap)
+{
+ if (ifap == NULL) {
+ errno = B_BAD_VALUE;
+ return -1;
+ }
+
+ // get a list of all interfaces
+ int socket = ::socket(AF_INET, SOCK_DGRAM, 0);
+ if (socket < 0)
+ return -1;
+
+ FileDescriptorCloser closer(socket);
+
+ ifconf config;
+ config.ifc_len = sizeof(config.ifc_value);
+ if (ioctl(socket, SIOCGIFCOUNT, &config, sizeof(struct ifconf)) < 0)
+ return -1;
+
+ size_t count = (size_t)config.ifc_value;
+ if (count == 0) {
+ errno = B_BAD_VALUE;
+ return -1;
+ }
+
+ char* buffer = (char*)malloc(count * sizeof(struct ifreq));
+ if (buffer == NULL) {
+ errno = B_NO_MEMORY;
+ return -1;
+ }
+
+ MemoryDeleter deleter(buffer);
+
+ config.ifc_len = count * sizeof(struct ifreq);
+ config.ifc_buf = buffer;
+ if (ioctl(socket, SIOCGIFCONF, &config, sizeof(struct ifconf)) < 0)
+ return -1;
+
+ ifreq* interfaces = (ifreq*)buffer;
+ ifreq* end = (ifreq*)(buffer + config.ifc_len);
+
+ struct ifaddrs* previous = NULL;
+ struct ifaddrs* current = NULL;
+
+ for (uint32 i = 0; interfaces < end; i++) {
+ BNetworkInterfaceAddress address;
+ int32 j = 0;
+
+ while (address.SetTo(interfaces->ifr_name, j++) == B_OK) {
+ IfaddrContainer* container = (IfaddrContainer*)malloc(
+ sizeof(IfaddrContainer) +
strlen(interfaces->ifr_name) + 1);
+ if (container == NULL) {
+ freeifaddrs(previous);
+ errno = B_NO_MEMORY;
+ return -1;
+ }
+
+ current = &container->header;
+
+ strcpy(container->name, interfaces->ifr_name);
+ current->ifa_name = container->name;
+ current->ifa_flags = address.Flags();
+
+ memcpy(&container->address, &address.Address(),
+ address.Address().sa_len);
+ current->ifa_addr = (sockaddr*)&container->address;
+
+ memcpy(&container->mask, &address.Mask(),
address.Mask().sa_len);
+ current->ifa_netmask = (sockaddr*)&container->mask;
+
+ memcpy(&container->destination, &address.Destination(),
+ address.Destination().sa_len);
+ current->ifa_dstaddr =
(sockaddr*)&container->destination;
+
+ current->ifa_data = NULL;
+ // Could point to extra information, if we have
something to
+ // add.
+
+ // Chain this interface with the next one
+ current->ifa_next = previous;
+ previous = current;
+ }
+ }
+
+ *ifap = current;
+ return B_OK;
+}
+
+
+void
+freeifaddrs(struct ifaddrs *ifa)
+{
+ // Since each item was allocated as a single chunk using the
IfaddrContainer,
+ // all we need to do is free that.
+ struct ifaddrs* next;
+ while (ifa != NULL) {
+ next = ifa->ifa_next;
+ free(ifa);
+ ifa = next;
+ }
+}
+
diff --git a/src/kits/network/libnetapi/AbstractSocket.cpp
b/src/kits/network/libnetapi/AbstractSocket.cpp
index b42b4af..7d20a5d 100644
--- a/src/kits/network/libnetapi/AbstractSocket.cpp
+++ b/src/kits/network/libnetapi/AbstractSocket.cpp
@@ -197,7 +197,7 @@ BAbstractSocket::Connect(const BNetworkAddress& peer, int
type,
return fInitStatus;
BNetworkAddress normalized = peer;
- if (connect(fSocket, normalized, normalized.Length()) != 0) {
+ if (connect(fSocket, &normalized.SockAddr(), normalized.Length()) != 0)
{
TRACE("%p: connecting to %s: %s\n", this,
normalized.ToString().c_str(), strerror(errno));
return fInitStatus = errno;
diff --git a/src/kits/network/libnetapi/DatagramSocket.cpp
b/src/kits/network/libnetapi/DatagramSocket.cpp
index 23f59ab..4228b0f 100644
--- a/src/kits/network/libnetapi/DatagramSocket.cpp
+++ b/src/kits/network/libnetapi/DatagramSocket.cpp
@@ -127,9 +127,10 @@ BDatagramSocket::Write(const void* buffer, size_t size)
{
ssize_t bytesSent;
- if (!fIsConnected)
- bytesSent = sendto(Socket(), buffer, size, 0, fPeer,
fPeer.Length());
- else
+ if (!fIsConnected) {
+ bytesSent = sendto(Socket(), buffer, size, 0, &fPeer.SockAddr(),
+ fPeer.Length());
+ } else
bytesSent = send(Socket(), buffer, size, 0);
if (bytesSent < 0) {
diff --git a/src/kits/network/libnetapi/Jamfile
b/src/kits/network/libnetapi/Jamfile
index 066ceb4..643840b 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -79,7 +79,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
HttpResult.cpp
HttpTime.cpp
- getifaddrs.cpp
notifications.cpp
$(md5Sources)
diff --git a/src/kits/network/libnetapi/NetworkAddress.cpp
b/src/kits/network/libnetapi/NetworkAddress.cpp
index d8b1e80..00e24d3 100644
--- a/src/kits/network/libnetapi/NetworkAddress.cpp
+++ b/src/kits/network/libnetapi/NetworkAddress.cpp
@@ -1188,24 +1188,12 @@ BNetworkAddress::operator sockaddr*()
}
-BNetworkAddress::operator const sockaddr*()
-{
- return (sockaddr*)&fAddress;
-}
-
-
BNetworkAddress::operator sockaddr&()
{
return (sockaddr&)fAddress;
}
-BNetworkAddress::operator const sockaddr&()
-{
- return (sockaddr&)fAddress;
-}
-
-
// #pragma mark - private
diff --git a/src/kits/network/libnetapi/NetworkInterface.cpp
b/src/kits/network/libnetapi/NetworkInterface.cpp
index fcb0413..3636609 100644
--- a/src/kits/network/libnetapi/NetworkInterface.cpp
+++ b/src/kits/network/libnetapi/NetworkInterface.cpp
@@ -8,25 +8,25 @@
#include <errno.h>
#include <net/if.h>
+#include <string.h>
#include <sys/sockio.h>
#include <AutoDeleter.h>
#include <Messenger.h>
#include <NetServer.h>
+#include <NetworkAddress.h>
#include <RouteSupport.h>
-static int
-family_from_interface_address(const BNetworkInterfaceAddress& address)
-{
- if (address.Address().Family() != AF_UNSPEC)
- return address.Address().Family();
- if (address.Mask().Family() != AF_UNSPEC)
- return address.Mask().Family();
- if (address.Destination().Family() != AF_UNSPEC)
- return address.Destination().Family();
- return AF_INET;
-}
+namespace BPrivate {
+
+status_t do_ifaliasreq(const char* name, int32 option,
+ BNetworkInterfaceAddress& address, bool readBack = false);
+int family_from_interface_address(const BNetworkInterfaceAddress& address);
+
+};
+
+using namespace BPrivate;
static int
@@ -46,46 +46,6 @@ family_from_route(const route_entry& route)
static status_t
-do_ifaliasreq(const char* name, int32 option, BNetworkInterfaceAddress&
address,
- bool readBack = false)
-{
- int family = AF_INET;
- if (!readBack)
- family = family_from_interface_address(address);
-
- int socket = ::socket(family, SOCK_DGRAM, 0);
- if (socket < 0)
- return errno;
-
- FileDescriptorCloser closer(socket);
-
- ifaliasreq request;
- strlcpy(request.ifra_name, name, IF_NAMESIZE);
- request.ifra_index = address.Index();
- request.ifra_flags = address.Flags();
-
- memcpy(&request.ifra_addr, &address.Address().SockAddr(),
- address.Address().Length());
- memcpy(&request.ifra_mask, &address.Mask().SockAddr(),
- address.Mask().Length());
- memcpy(&request.ifra_broadaddr, &address.Broadcast().SockAddr(),
- address.Broadcast().Length());
-
- if (ioctl(socket, option, &request, sizeof(struct ifaliasreq)) < 0)
- return errno;
-
- if (readBack) {
- address.SetFlags(request.ifra_flags);
- address.Address().SetTo(request.ifra_addr);
- address.Mask().SetTo(request.ifra_mask);
- address.Broadcast().SetTo(request.ifra_broadaddr);
- }
-
- return B_OK;
-}
-
-
-static status_t
do_ifaliasreq(const char* name, int32 option,
const BNetworkInterfaceAddress& address)
{
@@ -115,65 +75,6 @@ do_request(int family, T& request, const char* name, int
option)
// #pragma mark -
-BNetworkInterfaceAddress::BNetworkInterfaceAddress()
- :
- fIndex(-1),
- fFlags(0)
-{
-}
-
-
-BNetworkInterfaceAddress::~BNetworkInterfaceAddress()
-{
-}
-
-
-status_t
-BNetworkInterfaceAddress::SetTo(const BNetworkInterface& interface, int32
index)
-{
- fIndex = index;
- return do_ifaliasreq(interface.Name(), B_SOCKET_GET_ALIAS, *this, true);
-}
-
-
-void
-BNetworkInterfaceAddress::SetAddress(const BNetworkAddress& address)
-{
- fAddress = address;
-}
-
-
-void
-BNetworkInterfaceAddress::SetMask(const BNetworkAddress& mask)
-{
- fMask = mask;
-}
-
-
-void
-BNetworkInterfaceAddress::SetBroadcast(const BNetworkAddress& broadcast)
-{
- fBroadcast = broadcast;
-}
-
-
-void
-BNetworkInterfaceAddress::SetDestination(const BNetworkAddress& destination)
-{
- fBroadcast = destination;
-}
-
-
-void
-BNetworkInterfaceAddress::SetFlags(uint32 flags)
-{
- fFlags = flags;
-}
-
-
-// #pragma mark -
-
-
BNetworkInterface::BNetworkInterface()
{
Unset();
@@ -380,7 +281,7 @@ BNetworkInterface::CountAddresses() const
status_t
BNetworkInterface::GetAddressAt(int32 index, BNetworkInterfaceAddress& address)
{
- return address.SetTo(*this, index);
+ return address.SetTo(Name(), index);
}
@@ -445,7 +346,7 @@ status_t
BNetworkInterface::AddAddress(const BNetworkAddress& local)
{
BNetworkInterfaceAddress address;
- address.SetAddress(local);
+ address.SetAddress(local.SockAddr());
return do_ifaliasreq(Name(), B_SOCKET_ADD_ALIAS, address);
}
@@ -462,8 +363,7 @@ status_t
BNetworkInterface::RemoveAddress(const BNetworkInterfaceAddress& address)
{
ifreq request;
- memcpy(&request.ifr_addr, &address.Address().SockAddr(),
- address.Address().Length());
+ memcpy(&request.ifr_addr, &address.Address(), address.Address().sa_len);
return do_request(family_from_interface_address(address), request,
Name(),
B_SOCKET_REMOVE_ALIAS);
diff --git a/src/kits/network/libnetapi/getifaddrs.cpp
b/src/kits/network/libnetapi/getifaddrs.cpp
deleted file mode 100644
index 575bdd5..0000000
--- a/src/kits/network/libnetapi/getifaddrs.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2015, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- * Adrien Destugues, pulkomandy@xxxxxxxxxxxxx
- */
-
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <AutoDeleter.h>
-#include <NetworkAddress.h>
-#include <NetworkInterface.h>
-#include <NetworkRoster.h>
-
-#include "compatibility/bsd/ifaddrs.h"
-
-
-int getifaddrs(struct ifaddrs **ifap)
-{
- if (ifap == NULL) {
- errno = B_BAD_VALUE;
- return -1;
- }
-
- BNetworkRoster& roster = BNetworkRoster::Default();
-
- uint32 cookie;
-
- struct ifaddrs* previous = NULL;
- struct ifaddrs* current = NULL;
- BNetworkInterface* interface = new(std::nothrow) BNetworkInterface();
- if (interface == NULL) {
- errno = B_NO_MEMORY;
- return -1;
- }
-
- while (roster.GetNextInterface(&cookie, *interface) == B_OK) {
- BNetworkInterfaceAddress address;
- int32 i = 0;
- while (interface->GetAddressAt(i++, address) == B_OK) {
- if (interface == NULL) {
- freeifaddrs(previous);
- errno = B_NO_MEMORY;
- return -1;
- }
-
- current = new(std::nothrow) ifaddrs();
- if (current == NULL) {
- freeifaddrs(previous);
- errno = B_NO_MEMORY;
- return -1;
- }
-
- // Chain this interface with the next one
- current->ifa_next = previous;
- previous = current;
-
- current->ifa_data = interface;
- current->ifa_name = interface->Name();
- // Points to the name in the BNetworkInterface
instance, which
- // is added as ifa_data so freeifaddrs can
release it.
- current->ifa_flags = address.Flags();
- current->ifa_addr = new
sockaddr(address.Address().SockAddr());
- current->ifa_netmask = new
sockaddr(address.Mask().SockAddr());
- current->ifa_dstaddr = new
sockaddr(address.Destination().SockAddr());
- }
-
- interface = new(std::nothrow) BNetworkInterface();
- }
-
- delete interface;
- *ifap = current;
-
- return 0;
-}
-
-
-void
-freeifaddrs(struct ifaddrs *ifa)
-{
- struct ifaddrs* next;
- BNetworkInterface* interface = NULL;
- while (ifa != NULL) {
- if (ifa->ifa_data != interface) {
- interface = (BNetworkInterface*)ifa->ifa_data;
- delete interface;
- }
-
- delete ifa->ifa_addr;
- delete ifa->ifa_netmask;
- delete ifa->ifa_dstaddr;
-
- next = ifa->ifa_next;
- delete ifa;
- ifa = next;
- }
-}
-
diff --git a/src/preferences/network/InterfacesAddOn/NetworkSettings.cpp
b/src/preferences/network/InterfacesAddOn/NetworkSettings.cpp
index 5330062..067da85 100644
--- a/src/preferences/network/InterfacesAddOn/NetworkSettings.cpp
+++ b/src/preferences/network/InterfacesAddOn/NetworkSettings.cpp
@@ -297,16 +297,16 @@ NetworkSettings::SetConfiguration()
BNetworkInterfaceAddress interfaceConfig;
fNetworkInterface->GetAddressAt(zeroAddr,
interfaceConfig);
- interfaceConfig.SetAddress(fAddress[inet_id]);
- interfaceConfig.SetMask(fNetmask[inet_id]);
+
interfaceConfig.SetAddress(fAddress[inet_id].SockAddr());
+
interfaceConfig.SetMask(fNetmask[inet_id].SockAddr());
fNetworkInterface->SetAddress(interfaceConfig);
} else {
// TODO : test this case (no address set for
this protocol)
printf("no zeroAddr found for %s(%d), found %"
B_PRIu32 "\n",
fProtocols[index].name, inet_id,
zeroAddr);
BNetworkInterfaceAddress interfaceConfig;
- interfaceConfig.SetAddress(fAddress[inet_id]);
- interfaceConfig.SetMask(fNetmask[inet_id]);
+
interfaceConfig.SetAddress(fAddress[inet_id].SockAddr());
+
interfaceConfig.SetMask(fNetmask[inet_id].SockAddr());
fNetworkInterface->AddAddress(interfaceConfig);
}
diff --git a/src/servers/net/DHCPClient.cpp b/src/servers/net/DHCPClient.cpp
index 850861a..f159574 100644
--- a/src/servers/net/DHCPClient.cpp
+++ b/src/servers/net/DHCPClient.cpp
@@ -527,7 +527,7 @@ DHCPClient::_Negotiate(dhcp_state state)
option = 1;
setsockopt(socket, SOL_SOCKET, SO_BROADCAST, &option, sizeof(option));
- if (bind(socket, local, local.Length()) < 0) {
+ if (bind(socket, &local.SockAddr(), local.Length()) < 0) {
close(socket);
return errno;
}
diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp
index f12ee8d..2950dea 100644
--- a/src/servers/net/NetServer.cpp
+++ b/src/servers/net/NetServer.cpp
@@ -613,12 +613,12 @@ NetServer::_ConfigureInterface(BMessage& message)
if (!address.IsEmpty() || !mask.IsEmpty() ||
!broadcast.IsEmpty()) {
BNetworkInterfaceAddress interfaceAddress;
- interfaceAddress.SetAddress(address);
- interfaceAddress.SetMask(mask);
+ interfaceAddress.SetAddress(address.SockAddr());
+ interfaceAddress.SetMask(mask.SockAddr());
if (!broadcast.IsEmpty())
- interfaceAddress.SetBroadcast(broadcast);
+
interfaceAddress.SetBroadcast(broadcast.SockAddr());
else if (!peer.IsEmpty())
- interfaceAddress.SetDestination(peer);
+
interfaceAddress.SetDestination(peer.SockAddr());
status_t status =
interface.SetAddress(interfaceAddress);
if (status != B_OK) {
@@ -949,9 +949,9 @@ NetServer::_ConfigureIPv6LinkLocal(const char* name)
}
BNetworkInterfaceAddress interfaceAddress;
- interfaceAddress.SetAddress(localLinkAddress);
- interfaceAddress.SetMask(localLinkMask);
- interfaceAddress.SetBroadcast(localLinkMask);
+ interfaceAddress.SetAddress(localLinkAddress.SockAddr());
+ interfaceAddress.SetMask(localLinkMask.SockAddr());
+ interfaceAddress.SetBroadcast(localLinkMask.SockAddr());
/* TODO: Duplicate Address Detection. (DAD)
Need to blast an icmp packet over the IPv6 network from :: to
ensure
diff --git a/src/servers/net/Services.cpp b/src/servers/net/Services.cpp
index 1ccc956..aee0ac2 100644
--- a/src/servers/net/Services.cpp
+++ b/src/servers/net/Services.cpp
@@ -274,8 +274,8 @@ Services::_StartService(struct service& service)
address.socket = socket(address.family, address.type,
address.protocol);
if (address.socket < 0
- || bind(address.socket, address.address,
address.address.Length())
- < 0
+ || bind(address.socket, &address.address.SockAddr(),
+ address.address.Length()) < 0
|| fcntl(address.socket, F_SETFD, FD_CLOEXEC) < 0) {
failed = true;
break;
Other related posts:
