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

Optionally allows a different settings format; now you can write:

Browse Source 
interface /dev/net/... { ... }
instead of:
	interface {
		device /dev/net/...
		...
	}

This will also work with service::name, and address::family.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21556 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-07-04 19:42:16 +00:00
parent 43d946d6d6
commit 9047804645
2 changed files with 75 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/servers/net/Settings.cpp
View File

@ -20,10 +20,17 @@
#include <string.h>
struct settings_template {
uint32 type;
const char* name;
const settings_template* sub_template;
bool parent_value;
};
// Interface templates
const static settings_template kInterfaceAddressTemplate[] = {
{B_STRING_TYPE, "family", NULL},
{B_STRING_TYPE, "family", NULL, true},
{B_STRING_TYPE, "address", NULL},
{B_STRING_TYPE, "mask", NULL},
{B_STRING_TYPE, "peer", NULL},
@ -34,7 +41,7 @@ const static settings_template kInterfaceAddressTemplate[] = {
};
const static settings_template kInterfaceTemplate[] = {
{B_STRING_TYPE, "device", NULL},
{B_STRING_TYPE, "device", NULL, true},
{B_MESSAGE_TYPE, "address", kInterfaceAddressTemplate},
{B_INT32_TYPE, "flags", NULL},
{B_INT32_TYPE, "metric", NULL},
@ -50,7 +57,7 @@ const static settings_template kInterfacesTemplate[] = {
// Service templates
const static settings_template kServiceAddressTemplate[] = {
{B_STRING_TYPE, "family", NULL},
{B_STRING_TYPE, "family", NULL, true},
{B_STRING_TYPE, "type", NULL},
{B_STRING_TYPE, "protocol", NULL},
{B_STRING_TYPE, "address", NULL},
@ -59,7 +66,7 @@ const static settings_template kServiceAddressTemplate[] = {
};
const static settings_template kServiceTemplate[] = {
{B_STRING_TYPE, "name", NULL},
{B_STRING_TYPE, "name", NULL, true},
{B_MESSAGE_TYPE, "address", kServiceAddressTemplate},
{B_STRING_TYPE, "user", NULL},
{B_STRING_TYPE, "group", NULL},
@ -129,6 +136,52 @@ Settings::_FindSettingsTemplate(const settings_template* settingsTemplate,
}
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;
}
}
return B_OK;
}
status_t
Settings::_ConvertFromDriverParameter(const driver_parameter& parameter,
const settings_template* settingsTemplate, BMessage& message)
@ -139,25 +192,7 @@ Settings::_ConvertFromDriverParameter(const driver_parameter& parameter,
return B_BAD_VALUE;
}
for (int32 i = 0; i < parameter.value_count; i++) {
switch (settingsTemplate->type) {
case B_STRING_TYPE:
message.AddString(parameter.name, parameter.values[i]);
break;
case B_INT32_TYPE:
message.AddInt32(parameter.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(parameter.name, true);
else
message.AddBool(parameter.name, false);
break;
}
}
_AddParameter(parameter, parameter.name, settingsTemplate->type, message);
if (settingsTemplate->type == B_MESSAGE_TYPE
&& parameter.parameter_count > 0) {
@ -168,6 +203,13 @@ Settings::_ConvertFromDriverParameter(const driver_parameter& parameter,
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);

20
src/servers/net/Settings.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2006, Haiku, Inc. All Rights Reserved.
* Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -13,14 +13,9 @@
#include <Message.h>
#include <Messenger.h>
class BPath;
struct settings_template {
uint32 type;
const char* name;
const settings_template* sub_template;
};
struct settings_template;
class Settings {
@ -42,8 +37,13 @@ class Settings {
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* _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,