i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Move getifaddrs to libnetwork again."

Browse Source 
This reverts commit 31ea76548a.

Adrien, please try again without clobbering the otherwise nice
BNetworkInterface API!

Conflicts:
	src/kits/network/getifaddrs.cpp
This commit is contained in:
Axel Dörfler
2015-02-05 11:07:53 +01:00
parent a08f5ecbe3
commit 7720614300
17 changed files with 278 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/net/NetworkAddress.h
+2
View File
@@ -138,7 +138,9 @@ public:
operator const sockaddr*() const;
operator const sockaddr&() const;
operator const sockaddr*();
operator sockaddr*();
operator const sockaddr&();
operator sockaddr&();
private:
headers/os/net/NetworkInterface.h
+19 -16
View File
@@ -8,12 +8,11 @@
#include <net/if.h>
#include <net/if_types.h>
#include <sys/socket.h>
#include <ObjectList.h>
#include <NetworkAddress.h>
class BNetworkAddress;
class BNetworkInterface;
@@ -22,20 +21,24 @@ public:
BNetworkInterfaceAddress();
~BNetworkInterfaceAddress();
status_t SetTo(const char* interfaceName,
status_t SetTo(const BNetworkInterface& interface,
int32 index);
void SetAddress(const sockaddr& address);
void SetMask(const sockaddr& mask);
void SetBroadcast(const sockaddr& broadcast);
void SetDestination(const sockaddr& destination);
void SetAddress(const BNetworkAddress& address);
void SetMask(const BNetworkAddress& mask);
void SetBroadcast(const BNetworkAddress& broadcast);
void SetDestination(
const BNetworkAddress& destination);
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; }
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; }
void SetFlags(uint32 flags);
uint32 Flags() const { return fFlags; }
@@ -44,9 +47,9 @@ public:
private:
int32 fIndex;
sockaddr_storage fAddress;
sockaddr_storage fMask;
sockaddr_storage fBroadcast;
BNetworkAddress fAddress;
BNetworkAddress fMask;
BNetworkAddress fBroadcast;
uint32 fFlags;
};