From f65256c2e7c311046ef89838d066d96a51688dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Mon, 9 Aug 2010 19:12:51 +0000
Subject: [PATCH] * Fixed a bug in BNetworkRoster::GetNextInterface() that
 caused an endless loop   and always returned the first interface. * Fixed bug
 #6436 by using the new BNetworkRoster functionality.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37994 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/network/libnetapi/NetworkRoster.cpp  |  7 +++-
 .../network/EthernetSettingsView.cpp          | 41 +++++--------------
 src/preferences/network/Jamfile               |  1 +
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/src/kits/network/libnetapi/NetworkRoster.cpp b/src/kits/network/libnetapi/NetworkRoster.cpp
index 49dfd2cdf3..d3c0ae2e85 100644
--- a/src/kits/network/libnetapi/NetworkRoster.cpp
+++ b/src/kits/network/libnetapi/NetworkRoster.cpp
@@ -49,6 +49,9 @@ BNetworkRoster::GetNextInterface(uint32* cookie,
 {
 	// TODO: think about caching the interfaces!
 
+	if (cookie == NULL)
+		return B_BAD_VALUE;
+
 	// get a list of all interfaces
 
 	int socket = ::socket(AF_INET, SOCK_DGRAM, 0);
@@ -82,8 +85,10 @@ BNetworkRoster::GetNextInterface(uint32* cookie,
 
 	for (uint32 i = 0; interfaces < end; i++) {
 		interface.SetTo(interfaces[0].ifr_name);
-		if (i == *cookie)
+		if (i == *cookie) {
+			(*cookie)++;
 			return B_OK;
+		}
 
 		interfaces = (ifreq*)((uint8*)interfaces
 			+ _SIZEOF_ADDR_IFREQ(interfaces[0]));
diff --git a/src/preferences/network/EthernetSettingsView.cpp b/src/preferences/network/EthernetSettingsView.cpp
index 778f4f38ec..c155e78e1e 100644
--- a/src/preferences/network/EthernetSettingsView.cpp
+++ b/src/preferences/network/EthernetSettingsView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2009 Haiku Inc. All rights reserved.
+ * Copyright 2004-2010 Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -45,6 +45,8 @@
 #include <Directory.h>
 #include <FindDirectory.h>
 #include <fs_interface.h>
+#include <NetworkInterface.h>
+#include <NetworkRoster.h>
 #include <Path.h>
 
 #include <arpa/inet.h>
@@ -235,38 +237,17 @@ EthernetSettingsView::_GatherInterfaces()
 {
 	// iterate over all interfaces and retrieve minimal status
 
-	ifconf config;
-	config.ifc_len = sizeof(config.ifc_value);
-	if (ioctl(fSocket, SIOCGIFCOUNT, &config, sizeof(struct ifconf)) < 0)
-		return;
-
-	uint32 count = (uint32)config.ifc_value;
-	if (count == 0)
-		return;
-
-	void* buffer = malloc(count * sizeof(struct ifreq));
-	if (buffer == NULL)
-		return;
-
-	MemoryDeleter deleter(buffer);
-
-	config.ifc_len = count * sizeof(struct ifreq);
-	config.ifc_buf = buffer;
-	if (ioctl(fSocket, SIOCGIFCONF, &config, sizeof(struct ifconf)) < 0)
-		return;
-
-	ifreq* interface = (ifreq*)buffer;
-
 	fInterfaces.MakeEmpty();
 
-	for (uint32 i = 0; i < count; i++) {
-		if (strncmp(interface->ifr_name, "loop", 4) && interface->ifr_name[0]) {
-			fInterfaces.AddItem(new BString(interface->ifr_name));
-			fSettings.AddItem(new Settings(interface->ifr_name));
-		}
+	BNetworkRoster& roster = BNetworkRoster::Default();
+	BNetworkInterface interface;
+	uint32 cookie = 0;
 
-		interface = (ifreq*)((addr_t)interface + IF_NAMESIZE
-			+ interface->ifr_addr.sa_len);
+	while (roster.GetNextInterface(&cookie, interface) == B_OK) {
+		if (strncmp(interface.Name(), "loop", 4) && interface.Name()[0]) {
+			fInterfaces.AddItem(new BString(interface.Name()));
+			fSettings.AddItem(new Settings(interface.Name()));
+		}
 	}
 }
 
diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile
index 9151c2d772..d504a19dc2 100644
--- a/src/preferences/network/Jamfile
+++ b/src/preferences/network/Jamfile
@@ -10,6 +10,7 @@ Preference Network :
 	Settings.cpp
 
 	: be $(HAIKU_NETWORK_LIBS) $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
+		libbnetapi.so
 	: Network.rdef
 ;