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

* Applied patch by Andreas Färber as part of #5319.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35522 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-02-19 16:44:55 +00:00
parent a99f1ef770
commit 63b69bec3c
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/private/kernel/boot/net/IP.h
View File

@ -59,6 +59,7 @@ private:
};
uint16 ip_checksum(ChainBuffer *buffer);
ip_addr_t ip_parse_address(const char* address);
#endif // _BOOT_IP_H

22
src/system/boot/loader/net/IP.cpp
View File

@ -266,3 +266,25 @@ ip_checksum(ChainBuffer *buffer)
return ~checksum;
}
ip_addr_t
ip_parse_address(const char *string)
{
ip_addr_t address = 0;
int components = 0;
// TODO: Handles only IPv4 addresses for now.
while (components < 4) {
address |= strtol(string, NULL, 0) << ((4 - components - 1) * 8);
const char *dot = strchr(string, '.');
if (dot == NULL)
break;
string = dot + 1;
components++;
}
return address;
}

27
src/system/boot/platform/openfirmware/network.cpp
View File

@ -15,6 +15,7 @@
#include <boot/platform.h>
#include <boot/net/Ethernet.h>
#include <boot/net/IP.h>
#include <boot/net/NetStack.h>
#include <platform/openfirmware/openfirmware.h>
@ -76,28 +77,6 @@ hex_dump(const void *_data, int length)
#endif // !TRACE_NETWORK
static ip_addr_t
parse_ip_address(const char *string)
{
ip_addr_t address = 0;
int components = 0;
// TODO: Handles only IPv4 addresses for now.
while (components < 4) {
address |= strtol(string, NULL, 0) << ((4 - components - 1) * 8);
const char *dot = strchr(string, '.');
if (dot == NULL)
break;
string = dot + 1;
components++;
}
return address;
}
// #pragma mark -
@ -165,7 +144,7 @@ OFEthernetInterface::Init(const char *device, const char *parameters)
if (parameters != NULL) {
char *comma = strrchr(parameters, ',');
if (comma != NULL && comma != strchr(parameters, ',')) {
SetIPAddress(parse_ip_address(comma + 1));
SetIPAddress(ip_parse_address(comma + 1));
}
}
if (fIPAddress == 0) {
@ -176,7 +155,7 @@ OFEthernetInterface::Init(const char *device, const char *parameters)
defaultClientIP, sizeof(defaultClientIP) - 1);
if (bytesRead != OF_FAILED && bytesRead > 1) {
defaultClientIP[bytesRead] = '\0';
ip_addr_t address = parse_ip_address(defaultClientIP);
ip_addr_t address = ip_parse_address(defaultClientIP);
SetIPAddress(address);
}
}