i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net_server: Documented suggested interface behavior

Browse Source 
* Also simplified updating the interface message with SetString().

Change-Id: I29635cba5ddde693f6b7b97b8bd01769b02919d5
Reviewed-on: https://review.haiku-os.org/788
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Axel Dörfler
2018-12-21 08:30:25 +00:00
committed by Adrien Destugues
parent a0efb75a5c
commit 949a1ff7cc
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/net/NetServer.cpp
+9 -2
View File
@@ -666,6 +666,14 @@ NetServer::_ConfigureDevice(const char* device)
} }
/*! \brief Traverses the device tree starting from \a startPath, and configures
everything that has not yet been configured via settings before.
\param suggestedInterface Contains the configuration of an interface that
does not have any hardware left. It is used to configure the first
unconfigured device. This allows to move a Haiku configuration around
without losing the network configuration.
*/
void void
NetServer::_ConfigureDevices(const char* startPath, NetServer::_ConfigureDevices(const char* startPath,
BStringList& devicesAlreadyConfigured, BMessage* suggestedInterface) BStringList& devicesAlreadyConfigured, BMessage* suggestedInterface)
@@ -683,8 +691,7 @@ NetServer::_ConfigureDevices(const char* startPath,
if (S_ISBLK(stat.st_mode) || S_ISCHR(stat.st_mode)) { if (S_ISBLK(stat.st_mode) || S_ISCHR(stat.st_mode)) {
if (suggestedInterface != NULL if (suggestedInterface != NULL
&& suggestedInterface->RemoveName("device") == B_OK && suggestedInterface->SetString("device", path.Path()) == B_OK
&& suggestedInterface->AddString("device", path.Path()) == B_OK
&& _ConfigureInterface(*suggestedInterface) == B_OK) && _ConfigureInterface(*suggestedInterface) == B_OK)
suggestedInterface = NULL; suggestedInterface = NULL;
else if (!devicesAlreadyConfigured.HasString(path.Path())) else if (!devicesAlreadyConfigured.HasString(path.Path()))