Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added ability to parse link level addresses.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39779 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-12-09 00:06:45 +00:00
parent d5a09773bf
commit 8faecc1d5e
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
headers/os/net/NetworkAddress.h
View File

@ -141,6 +141,9 @@ public:
operator const sockaddr&();
operator sockaddr&();
private:
status_t _ParseLinkAddress(const char* address);
private:
sockaddr_storage fAddress;
status_t fStatus;

54
src/kits/network/libnetapi/NetworkAddress.cpp
View File

@ -10,12 +10,26 @@
#include <NetworkRoster.h>
#include <arpa/inet.h>
#include <ctype.h>
#include <errno.h>
#include <netinet/in.h>
#include <stdio.h>
#include <sys/sockio.h>
static uint8
from_hex(char hex)
{
if (isdigit(hex))
return hex - '0';
return tolower(hex) - 'a' + 10;
}
// #pragma mark -
BNetworkAddress::BNetworkAddress()
{
Unset();
@ -163,6 +177,12 @@ BNetworkAddress::SetTo(const char* host, const char* service, uint32 flags)
status_t
BNetworkAddress::SetTo(int family, const char* host, uint16 port, uint32 flags)
{
if (family == AF_LINK) {
if (port != 0)
return B_BAD_VALUE;
return _ParseLinkAddress(host);
}
BNetworkAddressResolver resolver;
status_t status = resolver.SetTo(family, host, port, flags);
if (status != B_OK)
@ -177,6 +197,12 @@ status_t
BNetworkAddress::SetTo(int family, const char* host, const char* service,
uint32 flags)
{
if (family == AF_LINK) {
if (service != NULL)
return B_BAD_VALUE;
return _ParseLinkAddress(host);
}
BNetworkAddressResolver resolver;
status_t status = resolver.SetTo(family, host, service, flags);
if (status != B_OK)
@ -1136,3 +1162,31 @@ BNetworkAddress::operator const sockaddr&()
{
return (sockaddr&)fAddress;
}
// #pragma mark - private
status_t
BNetworkAddress::_ParseLinkAddress(const char* address)
{
uint8 linkAddress[128];
uint32 length = 0;
while (length < sizeof(linkAddress)) {
if (!isxdigit(address[0]) || !isxdigit(address[1]))
return B_BAD_VALUE;
linkAddress[length++] = (from_hex(address[0]) << 4)
| from_hex(address[1]);
if (address[2] == '\0')
break;
if (address[2] != ':')
return B_BAD_VALUE;
address += 3;
}
SetToLinkLevel(linkAddress, length);
return B_OK;
}