libshared: Factored out driver settings class from net_server.

* The new class is called DriverSettingsMessageAdapter which can translate
  between a driver_settings file, and a BMessage.
* The net_server Settings class is now just using this class.

headers/private/shared/DriverSettingsMessageAdapter.h

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2006-2013, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Axel Dörfler, axeld@pinc-software.de
+ *		Michael Lotz <mmlr@mlotz.ch>
+ */
+#ifndef DRIVER_SETTINGS_MESSAGE_ADAPTER_H
+#define DRIVER_SETTINGS_MESSAGE_ADAPTER_H
+
+
+#include <driver_settings.h>
+#include <Message.h>
+
+
+struct settings_template {
+	uint32		type;
+	const char*	name;
+	const settings_template* sub_template;
+	bool		parent_value;
+};
+
+
+class DriverSettingsMessageAdapter {
+public:
+								DriverSettingsMessageAdapter();
+								~DriverSettingsMessageAdapter();
+
+			status_t			ConvertFromDriverSettings(
+									const driver_settings& settings,
+									const settings_template* settingsTemplate,
+									BMessage& message);
+			status_t			ConvertFromDriverSettings(const char* path,
+									const settings_template* settingsTemplate,
+									BMessage& message);
+
+			status_t			ConvertToDriverSettings(
+									const settings_template* settingsTemplate,
+									BString& settings, const BMessage& message);
+			status_t			ConvertToDriverSettings(const char* path,
+									const settings_template* settingsTemplate,
+									const BMessage& message);
+
+private:
+			const settings_template* _FindSettingsTemplate(
+									const settings_template* settingsTemplate,
+									const char* name);
+			const settings_template* _FindParentValueTemplate(
+									const settings_template* settingsTemplate);
+			status_t			_AddParameter(const driver_parameter& parameter,
+									const char* name, uint32 type,
+									BMessage& message);
+
+			status_t			_ConvertFromDriverParameter(
+									const driver_parameter& parameter,
+									const settings_template* settingsTemplate,
+									BMessage& message);
+
+			status_t			_AppendSettings(
+									const settings_template* settingsTemplate,
+									BString& settings, const BMessage& message,
+									const char* name, type_code type,
+									int32 count,
+									const char* settingName = NULL);
+
+};
+
+
+#endif	// DRIVER_SETTINGS_MESSAGE_ADAPTER_H

src/kits/shared/DriverSettingsMessageAdapter.cpp

@@ -0,0 +1,320 @@
+/*
+ * Copyright 2006-2013, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Axel Dörfler, axeld@pinc-software.de
+ *		Michael Lotz <mmlr@mlotz.ch>
+ */
+
+
+#include "DriverSettingsMessageAdapter.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <File.h>
+#include <String.h>
+
+
+DriverSettingsMessageAdapter::DriverSettingsMessageAdapter()
+{
+}
+
+
+DriverSettingsMessageAdapter::~DriverSettingsMessageAdapter()
+{
+}
+
+
+status_t
+DriverSettingsMessageAdapter::ConvertFromDriverSettings(
+	const driver_settings& settings, const settings_template* settingsTemplate,
+	BMessage& message)
+{
+	message.MakeEmpty();
+
+	for (int32 i = 0; i < settings.parameter_count; i++) {
+		status_t status = _ConvertFromDriverParameter(settings.parameters[i],
+			settingsTemplate, message);
+		if (status == B_BAD_VALUE) {
+			// ignore unknown entries
+			continue;
+		}
+		if (status != B_OK)
+			return status;
+	}
+
+	return B_OK;
+}
+
+
+status_t
+DriverSettingsMessageAdapter::ConvertFromDriverSettings(const char* path,
+	const settings_template* settingsTemplate, BMessage& message)
+{
+	void* handle = load_driver_settings(path);
+	if (handle == NULL)
+		return B_ENTRY_NOT_FOUND;
+
+	const driver_settings* settings = get_driver_settings(handle);
+	status_t status;
+	if (settings != NULL) {
+		status = ConvertFromDriverSettings(*settings, settingsTemplate,
+			message);
+	} else
+		status = B_BAD_DATA;
+
+	unload_driver_settings(handle);
+	return status;
+}
+
+
+status_t
+DriverSettingsMessageAdapter::ConvertToDriverSettings(
+	const settings_template* settingsTemplate, BString& settings,
+	const BMessage& message)
+{
+	int32 index = 0;
+	char *name = NULL;
+	type_code type;
+	int32 count = 0;
+
+	while (message.GetInfo(B_ANY_TYPE, index++, &name, &type, &count) == B_OK) {
+		status_t result = _AppendSettings(settingsTemplate, settings, message,
+			name, type, count);
+		if (result != B_OK)
+			return result;
+	}
+
+	return B_OK;
+}
+
+
+status_t
+DriverSettingsMessageAdapter::ConvertToDriverSettings(const char* path,
+	const settings_template* settingsTemplate, const BMessage& message)
+{
+	BString settings;
+	status_t status = ConvertToDriverSettings(settingsTemplate, settings,
+		message);
+	if (status != B_OK)
+		return status;
+
+	settings.RemoveFirst("\n");
+	BFile settingsFile(path, B_WRITE_ONLY | B_ERASE_FILE | B_CREATE_FILE);
+
+	ssize_t written = settingsFile.Write(settings.String(), settings.Length());
+	if (written < 0)
+		return written;
+
+	return written == settings.Length() ? B_OK : B_ERROR;
+}
+
+
+// #pragma mark -
+
+
+const settings_template*
+DriverSettingsMessageAdapter::_FindSettingsTemplate(
+	const settings_template* settingsTemplate, const char* name)
+{
+	while (settingsTemplate->name != NULL) {
+		if (!strcmp(name, settingsTemplate->name))
+			return settingsTemplate;
+
+		settingsTemplate++;
+	}
+
+	return NULL;
+}
+
+
+const settings_template*
+DriverSettingsMessageAdapter::_FindParentValueTemplate(
+	const settings_template* settingsTemplate)
+{
+	settingsTemplate = settingsTemplate->sub_template;
+	if (settingsTemplate == NULL)
+		return NULL;
+
+	while (settingsTemplate->name != NULL) {
+		if (settingsTemplate->parent_value)
+			return settingsTemplate;
+
+		settingsTemplate++;
+	}
+
+	return NULL;
+}
+
+
+status_t
+DriverSettingsMessageAdapter::_AddParameter(const driver_parameter& parameter,
+	const char* name, uint32 type, BMessage& message)
+{
+	for (int32 i = 0; i < parameter.value_count; i++) {
+		switch (type) {
+			case B_STRING_TYPE:
+				message.AddString(name, parameter.values[i]);
+				break;
+			case B_INT32_TYPE:
+				message.AddInt32(name, atoi(parameter.values[i]));
+				break;
+			case B_BOOL_TYPE:
+				if (!strcasecmp(parameter.values[i], "true")
+					|| !strcasecmp(parameter.values[i], "on")
+					|| !strcasecmp(parameter.values[i], "enabled")
+					|| !strcasecmp(parameter.values[i], "1"))
+					message.AddBool(name, true);
+				else
+					message.AddBool(name, false);
+				break;
+		}
+	}
+	if (type == B_BOOL_TYPE && parameter.value_count == 0) {
+		// boolean parameters are always true
+		message.AddBool(name, true);
+	}
+
+	return B_OK;
+}
+
+
+status_t
+DriverSettingsMessageAdapter::_ConvertFromDriverParameter(
+	const driver_parameter& parameter,
+	const settings_template* settingsTemplate, BMessage& message)
+{
+	settingsTemplate = _FindSettingsTemplate(settingsTemplate, parameter.name);
+	if (settingsTemplate == NULL) {
+		fprintf(stderr, "unknown parameter %s\n", parameter.name);
+		return B_BAD_VALUE;
+	}
+
+	_AddParameter(parameter, parameter.name, settingsTemplate->type, message);
+
+	if (settingsTemplate->type == B_MESSAGE_TYPE
+		&& parameter.parameter_count > 0) {
+		status_t status = B_OK;
+		BMessage subMessage;
+		for (int32 j = 0; j < parameter.parameter_count; j++) {
+			status = _ConvertFromDriverParameter(parameter.parameters[j],
+				settingsTemplate->sub_template, subMessage);
+			if (status != B_OK)
+				break;
+
+			const settings_template* parentValueTemplate
+				= _FindParentValueTemplate(settingsTemplate);
+			if (parentValueTemplate != NULL) {
+				_AddParameter(parameter, parentValueTemplate->name,
+					parentValueTemplate->type, subMessage);
+			}
+		}
+		if (status == B_OK)
+			message.AddMessage(parameter.name, &subMessage);
+	}
+
+	return B_OK;
+}
+
+
+status_t
+DriverSettingsMessageAdapter::_AppendSettings(
+	const settings_template* settingsTemplate, BString& settings,
+	const BMessage& message, const char* name, type_code type, int32 count,
+	const char* settingName)
+{
+	const settings_template* valueTemplate
+		= _FindSettingsTemplate(settingsTemplate, name);
+	if (valueTemplate == NULL) {
+		fprintf(stderr, "unknown field %s\n", name);
+		return B_BAD_VALUE;
+	}
+
+	if (valueTemplate->type != type) {
+		fprintf(stderr, "field type mismatch %s\n", name);
+		return B_BAD_VALUE;
+	}
+
+	if (settingName == NULL)
+		settingName = name;
+
+	if (type != B_MESSAGE_TYPE) {
+		settings.Append("\n");
+		settings.Append(settingName);
+		settings.Append("\t");
+	}
+
+	for (int32 valueIndex = 0; valueIndex < count; valueIndex++) {
+		if (valueIndex > 0 && type != B_MESSAGE_TYPE)
+			settings.Append(" ");
+
+		switch (type) {
+			case B_BOOL_TYPE:
+			{
+				bool value;
+				status_t result = message.FindBool(name, valueIndex, &value);
+				if (result != B_OK)
+					return result;
+
+				settings.Append(value ? "true" : "false");
+				break;
+			}
+
+			case B_STRING_TYPE:
+			{
+				const char* value = NULL;
+				status_t result = message.FindString(name, valueIndex, &value);
+				if (result != B_OK)
+					return result;
+
+				settings.Append(value);
+				break;
+			}
+
+			case B_INT32_TYPE:
+			{
+				int32 value;
+				status_t result = message.FindInt32(name, valueIndex, &value);
+				if (result != B_OK)
+					return result;
+
+				char buffer[100];
+				snprintf(buffer, sizeof(buffer), "%"B_PRId32, value);
+				settings.Append(buffer, sizeof(buffer));
+				break;
+			}
+
+			case B_MESSAGE_TYPE:
+			{
+				BMessage subMessage;
+				status_t result = message.FindMessage(name, valueIndex,
+					&subMessage);
+				if (result != B_OK)
+					return result;
+
+				const settings_template* parentValueTemplate
+					= _FindParentValueTemplate(valueTemplate);
+				if (parentValueTemplate != NULL) {
+					_AppendSettings(valueTemplate->sub_template, settings,
+						subMessage, parentValueTemplate->name,
+						parentValueTemplate->type, 1, name);
+					subMessage.RemoveName(parentValueTemplate->name);
+				}
+
+				BString subSettings;
+				ConvertToDriverSettings(valueTemplate->sub_template,
+					subSettings, subMessage);
+				subSettings.ReplaceAll("\n", "\n\t");
+				subSettings.RemoveFirst("\n");
+
+				settings.Append(" {\n");
+				settings.Append(subSettings);
+				settings.Append("\n}");
+			}
+		}
+	}
+
+	return B_OK;
+}

src/kits/shared/Jamfile

@@ -30,6 +30,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			ColorQuantizer.cpp
 			CommandPipe.cpp
 			DragTrackingFilter.cpp
+			DriverSettingsMessageAdapter.cpp
 			HashString.cpp
 			IconButton.cpp
 			IconView.cpp

src/servers/net/Jamfile

@@ -23,7 +23,7 @@ Server net_server :
 	DHCPClient.cpp
 	Services.cpp
 
-	: be network bnetapi $(TARGET_LIBSTDC++)
+	: be network bnetapi $(TARGET_LIBSTDC++) libshared.a
 	# for PPP
 	#libppp.a
 ;

src/servers/net/Settings.cpp

@@ -9,6 +9,10 @@
 
 #include "Settings.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <Directory.h>
 #include <File.h>
 #include <FindDirectory.h>
@@ -17,18 +21,9 @@
 #include <PathMonitor.h>
 #include <String.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <DriverSettingsMessageAdapter.h>
 
 
-struct settings_template {
-	uint32		type;
-	const char*	name;
-	const settings_template* sub_template;
-	bool		parent_value;
-};
-
 // Interface templates
 
 const static settings_template kInterfaceAddressTemplate[] = {
@@ -123,447 +118,6 @@ Settings::~Settings()
 }
 
 
-status_t
-Settings::_GetPath(const char* name, BPath& path)
-{
-	if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path, true) != B_OK)
-		return B_ERROR;
-
-	path.Append("network");
-	create_directory(path.Path(), 0755);
-
-	if (name != NULL)
-		path.Append(name);
-	return B_OK;
-}
-
-
-const settings_template*
-Settings::_FindSettingsTemplate(const settings_template* settingsTemplate,
-	const char* name)
-{
-	while (settingsTemplate->name != NULL) {
-		if (!strcmp(name, settingsTemplate->name))
-			return settingsTemplate;
-
-		settingsTemplate++;
-	}
-
-	return NULL;
-}
-
-
-const settings_template*
-Settings::_FindParentValueTemplate(const settings_template* settingsTemplate)
-{
-	settingsTemplate = settingsTemplate->sub_template;
-	if (settingsTemplate == NULL)
-		return NULL;
-
-	while (settingsTemplate->name != NULL) {
-		if (settingsTemplate->parent_value)
-			return settingsTemplate;
-
-		settingsTemplate++;
-	}
-
-	return NULL;
-}
-
-
-status_t
-Settings::_AddParameter(const driver_parameter& parameter, const char* name,
-	uint32 type, BMessage& message)
-{
-	for (int32 i = 0; i < parameter.value_count; i++) {
-		switch (type) {
-			case B_STRING_TYPE:
-				message.AddString(name, parameter.values[i]);
-				break;
-			case B_INT32_TYPE:
-				message.AddInt32(name, atoi(parameter.values[i]));
-				break;
-			case B_BOOL_TYPE:
-				if (!strcasecmp(parameter.values[i], "true")
-					|| !strcasecmp(parameter.values[i], "on")
-					|| !strcasecmp(parameter.values[i], "enabled")
-					|| !strcasecmp(parameter.values[i], "1"))
-					message.AddBool(name, true);
-				else
-					message.AddBool(name, false);
-				break;
-		}
-	}
-	if (type == B_BOOL_TYPE && parameter.value_count == 0) {
-		// boolean parameters are always true
-		message.AddBool(name, true);
-	}
-
-	return B_OK;
-}
-
-
-status_t
-Settings::_ConvertFromDriverParameter(const driver_parameter& parameter,
-	const settings_template* settingsTemplate, BMessage& message)
-{
-	settingsTemplate = _FindSettingsTemplate(settingsTemplate, parameter.name);
-	if (settingsTemplate == NULL) {
-		fprintf(stderr, "unknown parameter %s\n", parameter.name);
-		return B_BAD_VALUE;
-	}
-
-	_AddParameter(parameter, parameter.name, settingsTemplate->type, message);
-
-	if (settingsTemplate->type == B_MESSAGE_TYPE
-		&& parameter.parameter_count > 0) {
-		status_t status = B_OK;
-		BMessage subMessage;
-		for (int32 j = 0; j < parameter.parameter_count; j++) {
-			status = _ConvertFromDriverParameter(parameter.parameters[j],
-				settingsTemplate->sub_template, subMessage);
-			if (status != B_OK)
-				break;
-
-			const settings_template* parentValueTemplate
-				= _FindParentValueTemplate(settingsTemplate);
-			if (parentValueTemplate != NULL) {
-				_AddParameter(parameter, parentValueTemplate->name,
-					parentValueTemplate->type, subMessage);
-			}
-		}
-		if (status == B_OK)
-			message.AddMessage(parameter.name, &subMessage);
-	}
-
-	return B_OK;
-}
-
-
-status_t
-Settings::_ConvertFromDriverSettings(const driver_settings& settings,
-	const settings_template* settingsTemplate, BMessage& message)
-{
-	message.MakeEmpty();
-
-	for (int32 i = 0; i < settings.parameter_count; i++) {
-		status_t status = _ConvertFromDriverParameter(settings.parameters[i],
-			settingsTemplate, message);
-		if (status == B_BAD_VALUE) {
-			// ignore unknown entries
-			continue;
-		}
-		if (status != B_OK)
-			return status;
-	}
-
-	return B_OK;
-}
-
-
-status_t
-Settings::_ConvertFromDriverSettings(const char* name,
-	const settings_template* settingsTemplate, BMessage& message)
-{
-	BPath path;
-	status_t status = _GetPath(name, path);
-	if (status != B_OK)
-		return status;
-
-	void* handle = load_driver_settings(path.Path());
-	if (handle == NULL)
-		return B_ENTRY_NOT_FOUND;
-
-	const driver_settings* settings = get_driver_settings(handle);
-	if (settings != NULL) {
-		status = _ConvertFromDriverSettings(*settings, settingsTemplate,
-			message);
-	}
-
-	unload_driver_settings(handle);
-	return status;
-}
-
-
-status_t
-Settings::_AppendSettings(const settings_template* settingsTemplate,
-	BString& settings, const BMessage& message, const char* name,
-	type_code type, int32 count, const char* settingName)
-{
-	const settings_template* valueTemplate
-		= _FindSettingsTemplate(settingsTemplate, name);
-	if (valueTemplate == NULL) {
-		fprintf(stderr, "unknown field %s\n", name);
-		return B_BAD_VALUE;
-	}
-
-	if (valueTemplate->type != type) {
-		fprintf(stderr, "field type mismatch %s\n", name);
-		return B_BAD_VALUE;
-	}
-
-	if (settingName == NULL)
-		settingName = name;
-
-	if (type != B_MESSAGE_TYPE) {
-		settings.Append("\n");
-		settings.Append(settingName);
-		settings.Append("\t");
-	}
-
-	for (int32 valueIndex = 0; valueIndex < count; valueIndex++) {
-		if (valueIndex > 0 && type != B_MESSAGE_TYPE)
-			settings.Append(" ");
-
-		switch (type) {
-			case B_BOOL_TYPE:
-			{
-				bool value;
-				status_t result = message.FindBool(name, valueIndex, &value);
-				if (result != B_OK)
-					return result;
-
-				settings.Append(value ? "true" : "false");
-				break;
-			}
-
-			case B_STRING_TYPE:
-			{
-				const char* value = NULL;
-				status_t result = message.FindString(name, valueIndex, &value);
-				if (result != B_OK)
-					return result;
-
-				settings.Append(value);
-				break;
-			}
-
-			case B_INT32_TYPE:
-			{
-				int32 value;
-				status_t result = message.FindInt32(name, valueIndex, &value);
-				if (result != B_OK)
-					return result;
-
-				char buffer[100];
-				snprintf(buffer, sizeof(buffer), "%"B_PRId32, value);
-				settings.Append(buffer, sizeof(buffer));
-				break;
-			}
-
-			case B_MESSAGE_TYPE:
-			{
-				BMessage subMessage;
-				status_t result = message.FindMessage(name, valueIndex,
-					&subMessage);
-				if (result != B_OK)
-					return result;
-
-				const settings_template* parentValueTemplate
-					= _FindParentValueTemplate(valueTemplate);
-				if (parentValueTemplate != NULL) {
-					_AppendSettings(valueTemplate->sub_template, settings,
-						subMessage, parentValueTemplate->name,
-						parentValueTemplate->type, 1, name);
-					subMessage.RemoveName(parentValueTemplate->name);
-				}
-
-				BString subSettings;
-				_ConvertToDriverSettings(valueTemplate->sub_template,
-					subSettings, subMessage);
-				subSettings.ReplaceAll("\n", "\n\t");
-				subSettings.RemoveFirst("\n");
-
-				settings.Append(" {\n");
-				settings.Append(subSettings);
-				settings.Append("\n}");
-			}
-		}
-	}
-
-	return B_OK;
-}
-
-
-status_t
-Settings::_ConvertToDriverSettings(const settings_template* settingsTemplate,
-	BString& settings, const BMessage& message)
-{
-	int32 index = 0;
-	char *name = NULL;
-	type_code type;
-	int32 count = 0;
-
-	while (message.GetInfo(B_ANY_TYPE, index++, &name, &type, &count) == B_OK) {
-		status_t result = _AppendSettings(settingsTemplate, settings, message,
-			name, type, count);
-		if (result != B_OK)
-			return result;
-	}
-
-	return B_OK;
-}
-
-
-status_t
-Settings::_ConvertToDriverSettings(const char* name,
-	const settings_template* settingsTemplate, const BMessage& message)
-{
-	BPath path;
-	status_t status = _GetPath(name, path);
-	if (status != B_OK)
-		return status;
-
-	BString settings;
-	status = _ConvertToDriverSettings(settingsTemplate, settings, message);
-	if (status != B_OK)
-		return status;
-
-	settings.RemoveFirst("\n");
-	BFile settingsFile(path.Path(), B_WRITE_ONLY | B_ERASE_FILE
-		| B_CREATE_FILE);
-
-	ssize_t written = settingsFile.Write(settings.String(), settings.Length());
-	if (written < 0)
-		return written;
-
-	return written == settings.Length() ? B_OK : B_ERROR;
-}
-
-
-status_t
-Settings::_Load(const char* name, uint32* _type)
-{
-	status_t status = B_ENTRY_NOT_FOUND;
-
-	if (name == NULL || strcmp(name, "interfaces") == 0) {
-		status = _ConvertFromDriverSettings("interfaces", kInterfacesTemplate,
-			fInterfaces);
-		if (status == B_OK && _type != NULL)
-			*_type = kMsgInterfaceSettingsUpdated;
-	}
-	if (name == NULL || strcmp(name, "wireless_networks") == 0) {
-		status = _ConvertFromDriverSettings("wireless_networks",
-			kNetworksTemplate, fNetworks);
-		if (status == B_OK && _type != NULL)
-			*_type = kMsgInterfaceSettingsUpdated;
-	}
-	if (name == NULL || strcmp(name, "services") == 0) {
-		status = _ConvertFromDriverSettings("services", kServicesTemplate,
-			fServices);
-		if (status == B_OK && _type != NULL)
-			*_type = kMsgServiceSettingsUpdated;
-	}
-
-	return status;
-}
-
-
-status_t
-Settings::_Save(const char* name)
-{
-	status_t status = B_ENTRY_NOT_FOUND;
-
-	if (name == NULL || strcmp(name, "interfaces") == 0) {
-		status = _ConvertToDriverSettings("interfaces", kInterfacesTemplate,
-			fInterfaces);
-	}
-	if (name == NULL || strcmp(name, "wireless_networks") == 0) {
-		status = _ConvertToDriverSettings("wireless_networks",
-			kNetworksTemplate, fNetworks);
-	}
-	if (name == NULL || strcmp(name, "services") == 0) {
-		status = _ConvertToDriverSettings("services", kServicesTemplate,
-			fServices);
-	}
-
-	return status;
-}
-
-
-status_t
-Settings::_StartWatching(const char* name, const BMessenger& target)
-{
-	BPath path;
-	status_t status = _GetPath(name, path);
-	if (status != B_OK)
-		return status;
-
-	return BPrivate::BPathMonitor::StartWatching(path.Path(), B_WATCH_STAT,
-		target);
-}
-
-
-status_t
-Settings::StartMonitoring(const BMessenger& target)
-{
-	if (_IsWatching(target))
-		return B_OK;
-	if (_IsWatching())
-		StopMonitoring(fListener);
-
-	fListener = target;
-
-	status_t status = _StartWatching("interfaces", target);
-	if (status == B_OK)
-		status = _StartWatching("wireless_networks", target);
-	if (status == B_OK)
-		status = _StartWatching("services", target);
-
-	return status;
-}
-
-
-status_t
-Settings::StopMonitoring(const BMessenger& target)
-{
-	// TODO: this needs to be changed in case the server will watch
-	//	anything else but settings
-	return BPrivate::BPathMonitor::StopWatching(target);
-}
-
-
-status_t
-Settings::Update(BMessage* message)
-{
-	const char* pathName;
-	int32 opcode;
-	if (message->FindInt32("opcode", &opcode) != B_OK
-		|| message->FindString("path", &pathName) != B_OK)
-		return B_BAD_VALUE;
-
-	BPath settingsFolderPath;
-	_GetPath(NULL, settingsFolderPath);
-	if (strncmp(pathName, settingsFolderPath.Path(),
-			strlen(settingsFolderPath.Path()))) {
-		return B_NAME_NOT_FOUND;
-	}
-
-	if (message->FindBool("removed")) {
-		// for now, we only consider existing settings files
-		// (ie. deleting "services" won't stop any)
-		return B_OK;
-	}
-
-	int32 fields;
-	if (opcode == B_STAT_CHANGED
-		&& message->FindInt32("fields", &fields) == B_OK
-		&& (fields & (B_STAT_MODIFICATION_TIME | B_STAT_SIZE)) == 0) {
-		// only update when the modified time or size has changed
-		return B_OK;
-	}
-
-	BPath path(pathName);
-	uint32 type;
-	if (_Load(path.Leaf(), &type) == B_OK) {
-		BMessage update(type);
-		fListener.SendMessage(&update);
-	}
-
-	return B_OK;
-}
-
-
 status_t
 Settings::GetNextInterface(uint32& cookie, BMessage& interface)
 {
@@ -652,3 +206,175 @@ Settings::Services() const
 	return fServices;
 }
 
+
+status_t
+Settings::StartMonitoring(const BMessenger& target)
+{
+	if (_IsWatching(target))
+		return B_OK;
+	if (_IsWatching())
+		StopMonitoring(fListener);
+
+	fListener = target;
+
+	status_t status = _StartWatching("interfaces", target);
+	if (status == B_OK)
+		status = _StartWatching("wireless_networks", target);
+	if (status == B_OK)
+		status = _StartWatching("services", target);
+
+	return status;
+}
+
+
+status_t
+Settings::StopMonitoring(const BMessenger& target)
+{
+	// TODO: this needs to be changed in case the server will watch
+	//	anything else but settings
+	return BPrivate::BPathMonitor::StopWatching(target);
+}
+
+
+status_t
+Settings::Update(BMessage* message)
+{
+	const char* pathName;
+	int32 opcode;
+	if (message->FindInt32("opcode", &opcode) != B_OK
+		|| message->FindString("path", &pathName) != B_OK)
+		return B_BAD_VALUE;
+
+	BPath settingsFolderPath;
+	_GetPath(NULL, settingsFolderPath);
+	if (strncmp(pathName, settingsFolderPath.Path(),
+			strlen(settingsFolderPath.Path()))) {
+		return B_NAME_NOT_FOUND;
+	}
+
+	if (message->FindBool("removed")) {
+		// for now, we only consider existing settings files
+		// (ie. deleting "services" won't stop any)
+		return B_OK;
+	}
+
+	int32 fields;
+	if (opcode == B_STAT_CHANGED
+		&& message->FindInt32("fields", &fields) == B_OK
+		&& (fields & (B_STAT_MODIFICATION_TIME | B_STAT_SIZE)) == 0) {
+		// only update when the modified time or size has changed
+		return B_OK;
+	}
+
+	BPath path(pathName);
+	uint32 type;
+	if (_Load(path.Leaf(), &type) == B_OK) {
+		BMessage update(type);
+		fListener.SendMessage(&update);
+	}
+
+	return B_OK;
+}
+
+
+// #pragma mark - private
+
+
+status_t
+Settings::_Load(const char* name, uint32* _type)
+{
+	BPath path;
+	status_t status = _GetPath(NULL, path);
+	if (status != B_OK)
+		return status;
+
+	DriverSettingsMessageAdapter adapter;
+	status = B_ENTRY_NOT_FOUND;
+
+	if (name == NULL || strcmp(name, "interfaces") == 0) {
+		status = adapter.ConvertFromDriverSettings(
+			_Path(path, "interfaces").Path(), kInterfacesTemplate, fInterfaces);
+		if (status == B_OK && _type != NULL)
+			*_type = kMsgInterfaceSettingsUpdated;
+	}
+	if (name == NULL || strcmp(name, "wireless_networks") == 0) {
+		status = adapter.ConvertFromDriverSettings(
+			_Path(path, "wireless_networks").Path(),
+			kNetworksTemplate, fNetworks);
+		if (status == B_OK && _type != NULL)
+			*_type = kMsgInterfaceSettingsUpdated;
+	}
+	if (name == NULL || strcmp(name, "services") == 0) {
+		status = adapter.ConvertFromDriverSettings(
+			_Path(path, "services").Path(), kServicesTemplate, fServices);
+		if (status == B_OK && _type != NULL)
+			*_type = kMsgServiceSettingsUpdated;
+	}
+
+	return status;
+}
+
+
+status_t
+Settings::_Save(const char* name)
+{
+	BPath path;
+	status_t status = _GetPath(NULL, path);
+	if (status != B_OK)
+		return status;
+
+	DriverSettingsMessageAdapter adapter;
+	status = B_ENTRY_NOT_FOUND;
+
+	if (name == NULL || strcmp(name, "interfaces") == 0) {
+		status = adapter.ConvertToDriverSettings(
+			_Path(path, "interfaces").Path(), kInterfacesTemplate, fInterfaces);
+	}
+	if (name == NULL || strcmp(name, "wireless_networks") == 0) {
+		status = adapter.ConvertToDriverSettings(
+			_Path(path, "wireless_networks").Path(),
+			kNetworksTemplate, fNetworks);
+	}
+	if (name == NULL || strcmp(name, "services") == 0) {
+		status = adapter.ConvertToDriverSettings(_Path(path, "services").Path(),
+			kServicesTemplate, fServices);
+	}
+
+	return status;
+}
+
+
+BPath
+Settings::_Path(BPath& parent, const char* leaf)
+{
+	return BPath(parent.Path(), leaf);
+}
+
+
+status_t
+Settings::_GetPath(const char* name, BPath& path)
+{
+	if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path, true) != B_OK)
+		return B_ERROR;
+
+	path.Append("network");
+	create_directory(path.Path(), 0755);
+
+	if (name != NULL)
+		path.Append(name);
+	return B_OK;
+}
+
+
+status_t
+Settings::_StartWatching(const char* name, const BMessenger& target)
+{
+	BPath path;
+	status_t status = _GetPath(name, path);
+	if (status != B_OK)
+		return status;
+
+	return BPrivate::BPathMonitor::StartWatching(path.Path(), B_WATCH_STAT,
+		target);
+}
+

src/servers/net/Settings.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2013, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -9,13 +9,9 @@
 #define SETTINGS_H
 
 
-#include <driver_settings.h>
 #include <Message.h>
 #include <Messenger.h>
-
-
-class BPath;
-struct settings_template;
+#include <Path.h>
 
 
 class Settings {
@@ -45,43 +41,11 @@ private:
 			status_t			_Load(const char* name = NULL,
 									uint32* _type = NULL);
 			status_t			_Save(const char* name = NULL);
+			BPath				_Path(BPath& parent, const char* name);
 			status_t			_GetPath(const char* name, BPath& path);
 
 			status_t			_StartWatching(const char* name,
 									const BMessenger& target);
-			const settings_template* _FindSettingsTemplate(
-									const settings_template* settingsTemplate,
-									const char* name);
-			const settings_template* _FindParentValueTemplate(
-									const settings_template* settingsTemplate);
-			status_t			_AddParameter(const driver_parameter& parameter,
-									const char* name, uint32 type,
-									BMessage& message);
-
-			status_t			_ConvertFromDriverParameter(
-									const driver_parameter& parameter,
-									const settings_template* settingsTemplate,
-									BMessage& message);
-			status_t			_ConvertFromDriverSettings(
-									const driver_settings& settings,
-									const settings_template* settingsTemplate,
-									BMessage& message);
-			status_t			_ConvertFromDriverSettings(const char* path,
-									const settings_template* settingsTemplate,
-									BMessage& message);
-
-			status_t			_AppendSettings(
-									const settings_template* settingsTemplate,
-									BString& settings, const BMessage& message,
-									const char* name, type_code type,
-									int32 count,
-									const char* settingName = NULL);
-			status_t			_ConvertToDriverSettings(
-									const settings_template* settingsTemplate,
-									BString& settings, const BMessage& message);
-			status_t			_ConvertToDriverSettings(const char* path,
-									const settings_template* settingsTemplate,
-									const BMessage& message);
 
 			bool				_IsWatching(const BMessenger& target) const
 									{ return fListener == target; }