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

Fixed BNetworkServiceSettings::IsEnabled(), GetMessage()

Browse Source 
* GetMessage() now checks if the only existing address is the default
  wildcard address, and then omits it in the message (as it will be
  created by default, anyway).
This commit is contained in:
Axel Dörfler 2015-03-12 09:29:49 +00:00
parent a6f0a92032
commit a7f408b41c
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/kits/network/libnetapi/NetworkSettings.cpp
View File

@ -445,8 +445,8 @@ BNetworkSettings::GetService(const char* name, BMessage& service)
status_t
BNetworkSettings::AddService(const BMessage& service)
{
const char* name = NULL;
if (service.FindString("name", &name) != B_OK)
const char* name = service.GetString("name");
if (name == NULL)
return B_BAD_VALUE;
_RemoveItem(fServices, "service", "name", name);
@ -1538,7 +1538,7 @@ BNetworkServiceSettings::SetStandAlone(bool alone)
bool
BNetworkServiceSettings::IsEnabled() const
{
return InitCheck() == B_OK && !fEnabled;
return InitCheck() == B_OK && fEnabled;
}
@ -1688,10 +1688,20 @@ BNetworkServiceSettings::GetMessage(BMessage& data) const
}
for (int32 i = 0; i < CountAddresses(); i++) {
BMessage address;
status = AddressAt(i).GetMessage(address);
BNetworkServiceAddressSettings address = AddressAt(i);
if (address.Family() == Family()
&& address.Type() == Type()
&& address.Protocol() == Protocol()
&& address.Address().IsWildcard()
&& address.Address().Port() == Port()) {
// This address will be created automatically, no need to store it
continue;
}
BMessage addressMessage;
status = AddressAt(i).GetMessage(addressMessage);
if (status == B_OK)
status = data.AddMessage("address", &address);
status = data.AddMessage("address", &addressMessage);
if (status != B_OK)
break;
}