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

* Factored out a BNetworkAddressResolver from BNetworkAddress, that also allows

Browse Source 
to iterate over all possible addresses, as suggested privately by Rene.
* Added flags to the resolving methods that allow more control over the
  addresses returned.
* Added setters to BNetworkAddress that accept a service name instead of port
  number, renamed PortName() to ServiceName().
* Made the sockaddr* cast operators return a const sockaddr as it was supposed
  to be, although I should probably add non-const ones as well.
* This also simplified the code somewhat.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38039 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-12 11:27:14 +00:00
parent e05f4ded2d
commit 836c43f2b8
5 changed files with 387 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/net/NetworkAddress.h
+20 -8
View File
@@ -12,16 +12,21 @@
#include <sys/socket.h>
#include <Archivable.h>
#include <NetworkAddressResolver.h>
#include <String.h>
class BNetworkAddress : public BArchivable {
public:
BNetworkAddress();
BNetworkAddress(int family,
const char* address, uint16 port = 0);
BNetworkAddress(const char* address,
uint16 port = 0);
uint16 port = 0, uint32 flags = 0);
BNetworkAddress(const char* address,
const char* service, uint32 flags = 0);
BNetworkAddress(int family, const char* address,
uint16 port = 0, uint32 flags = 0);
BNetworkAddress(int family, const char* address,
const char* service, uint32 flags = 0);
BNetworkAddress(const sockaddr& address);
BNetworkAddress(
const sockaddr_storage& address);
@@ -38,10 +43,16 @@ public:
void Unset();
status_t SetTo(const char* address, uint16 port = 0,
uint32 flags = 0);
status_t SetTo(const char* address, const char* service,
uint32 flags = 0);
status_t SetTo(int family, const char* address,
uint16 port = 0);
status_t SetTo(const char* address, uint16 port = 0);
uint16 port = 0, uint32 flags = 0);
status_t SetTo(int family, const char* address,
const char* service, uint32 flags = 0);
void SetTo(const sockaddr& address);
void SetTo(const sockaddr& address, size_t length);
void SetTo(const sockaddr_storage& address);
void SetTo(const sockaddr_in& address);
void SetTo(const sockaddr_in6& address);
@@ -56,6 +67,7 @@ public:
status_t SetToMask(int family, uint32 prefixLength);
status_t SetToWildcard(int family);
void SetPort(uint16 port);
status_t SetPort(const char* service);
void SetToLinkLevel(uint8* address, size_t length);
void SetToLinkLevel(const char* name);
@@ -97,7 +109,7 @@ public:
BString ToString(bool includePort = true) const;
BString HostName() const;
BString PortName() const;
BString ServiceName() const;
virtual status_t Archive(BMessage* into, bool deep = true) const;
static BArchivable* Instantiate(BMessage* archive);
@@ -111,8 +123,8 @@ public:
bool operator!=(const BNetworkAddress& other) const;
bool operator<(const BNetworkAddress& other) const;
operator sockaddr*() const;
operator sockaddr&() const;
operator const sockaddr*() const;
operator const sockaddr&() const;
private:
sockaddr_storage fAddress;
headers/os/net/NetworkAddressResolver.h
+62
View File
@@ -0,0 +1,62 @@
/*
* Copyright 2010, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NETWORK_ADDRESS_RESOLVER_H
#define _NETWORK_ADDRESS_RESOLVER_H
#include <SupportDefs.h>
class BNetworkAddress;
struct addrinfo;
// flags for name resolution
enum {
B_NO_ADDRESS_RESOLUTION = 0x0001,
B_UNCONFIGURED_ADDRESS_FAMILIES = 0x0002,
};
class BNetworkAddressResolver {
public:
BNetworkAddressResolver();
BNetworkAddressResolver(const char* address,
uint16 port = 0, uint32 flags = 0);
BNetworkAddressResolver(const char* address,
const char* service, uint32 flags = 0);
BNetworkAddressResolver(int family,
const char* address, uint16 port = 0,
uint32 flags = 0);
BNetworkAddressResolver(int family,
const char* address, const char* service,
uint32 flags = 0);
~BNetworkAddressResolver();
status_t InitCheck() const;
void Unset();
status_t SetTo(const char* address, uint16 port = 0,
uint32 flags = 0);
status_t SetTo(const char* address, const char* service,
uint32 flags = 0);
status_t SetTo(int family, const char* address,
uint16 port = 0, uint32 flags = 0);
status_t SetTo(int family, const char* address,
const char* service, uint32 flags = 0);
status_t GetNextAddress(uint32* cookie,
BNetworkAddress& address) const;
status_t GetNextAddress(int family, uint32* cookie,
BNetworkAddress& address) const;
private:
addrinfo* fInfo;
status_t fStatus;
};
#endif // _NETWORK_ADDRESS_RESOLVER_H