From 431b9a3183df593f05940a4f2cc25583b26f4e74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Sat, 2 Jan 2010 09:38:53 +0000
Subject: [PATCH] Patch by Andreas Faerber: (OpenFirmware network boot)  * If
 retrieving an IP address from the non-standard /chosen/dhcp-response   
 fails, try to parse it from /options/default-client-ip instead.

Thanks!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34850 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../boot/platform/openfirmware/network.cpp    | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/system/boot/platform/openfirmware/network.cpp b/src/system/boot/platform/openfirmware/network.cpp
index 6a02ccddbc..51f41eeb65 100644
--- a/src/system/boot/platform/openfirmware/network.cpp
+++ b/src/system/boot/platform/openfirmware/network.cpp
@@ -52,6 +52,41 @@ hex_dump(const void *_data, int length)
 #endif	// !TRACE_NETWORK
 
 
+static int
+parse_ip_address_component(const char *sz, int len)
+{
+	const int base = 10;
+		// only decimal numbers for now
+	int r = 0;
+	for (int i = 0; i < len; i++) {
+		int x = sz[i] - '0';
+		for (int j = 1; j < len - i; j++)
+			x *= base;
+		r += x;
+	}
+	return r;
+}
+
+
+static ip_addr_t
+parse_ip_address(const char *sz)
+{
+	ip_addr_t addr = 0;
+	int i = 0;
+	const char *psz = sz;
+	// TODO: Handles only IPv4 addresses for now.
+	char *p = strchr(psz, '.');
+	while (p != NULL && i < 4) {
+		int len = p - psz;
+		addr |= parse_ip_address_component(psz, len) << ((4 - i - 1) * 8);
+		p = strchr(psz = p + 1, '.');
+		i++;
+	}
+	addr |= parse_ip_address_component(psz, sz + strlen(sz) - psz);
+	return addr;
+}
+
+
 class OFEthernetInterface : public EthernetInterface {
 public:
 	OFEthernetInterface();
@@ -128,8 +163,20 @@ OFEthernetInterface::Init(const char *device)
 	} dhcpResponse;
 	bytesRead = of_getprop(gChosen, "dhcp-response", &dhcpResponse,
 		sizeof(dhcpResponse));
-	if (bytesRead != OF_FAILED && bytesRead == (int)sizeof(dhcpResponse))
+	if (bytesRead != OF_FAILED && bytesRead == (int)sizeof(dhcpResponse)) {
 		SetIPAddress(ntohl(dhcpResponse.ip_address));
+	} else {
+		char saddr[16];
+		package = of_finddevice("/options");
+		bytesRead = of_getprop(package, "default-client-ip", saddr, sizeof(saddr));
+		if (bytesRead != OF_FAILED) {
+			saddr[bytesRead] = '\0';
+			printf("default-client-ip: %s\n", saddr);
+			ip_addr_t addr = parse_ip_address(saddr);
+			printf("addr = %x\n", (unsigned int)addr);
+			SetIPAddress(addr);
+		}
+	}
 
 	return B_OK;
 }