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

* Moved the network definitions into their own file "wireless_networks".

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39841 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-12-13 22:24:39 +00:00
parent 5075403207
commit c64bdbb55d
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,13 @@ const static settings_template kInterfaceTemplate[] = {
{0, NULL, NULL}
};
const static settings_template kInterfacesTemplate[] = {
{B_MESSAGE_TYPE, "interface", kInterfaceTemplate},
{0, NULL, NULL}
};
// Network templates
const static settings_template kNetworkTemplate[] = {
{B_STRING_TYPE, "name", NULL, true},
{B_STRING_TYPE, "mac", NULL},
@ -61,8 +68,7 @@ const static settings_template kNetworkTemplate[] = {
{0, NULL, NULL}
};
const static settings_template kInterfacesTemplate[] = {
{B_MESSAGE_TYPE, "interface", kInterfaceTemplate},
const static settings_template kNetworksTemplate[] = {
{B_MESSAGE_TYPE, "network", kNetworkTemplate},
{0, NULL, NULL}
};
@ -282,6 +288,12 @@ Settings::_Load(const char* name, uint32* _type)
if (status == B_OK && _type != NULL)
*_type = kMsgInterfaceSettingsUpdated;
}
if (name == NULL || !strcmp(name, "wireless_networks")) {
status = _ConvertFromDriverSettings("wireless_networks",
kNetworksTemplate, fNetworks);
if (status == B_OK && _type != NULL)
*_type = kMsgInterfaceSettingsUpdated;
}
if (name == NULL || !strcmp(name, "services")) {
status = _ConvertFromDriverSettings("services", kServicesTemplate,
fServices);
@ -317,6 +329,8 @@ Settings::StartMonitoring(const BMessenger& target)
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);
@ -382,7 +396,7 @@ Settings::GetNextInterface(uint32& cookie, BMessage& interface)
status_t
Settings::GetNextNetwork(uint32& cookie, BMessage& network)
{
status_t status = fInterfaces.FindMessage("network", cookie, &network);
status_t status = fNetworks.FindMessage("network", cookie, &network);
if (status != B_OK)
return status;

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

@ -72,6 +72,7 @@ private:
private:
BMessenger fListener;
BMessage fInterfaces;
BMessage fNetworks;
BMessage fServices;
};