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

BNetworkDevice: Fix memory leaks and address comments.

Browse Source 
Thanks Axel and Jerome for the reviews!

Change-Id: I4f116c540cf59ba74b79d9d2f95ed40edc9c4174
Reviewed-on: https://review.haiku-os.org/557
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2018-09-13 19:53:33 +00:00
committed by waddlesplash
parent 45bc01d2f7
commit 043b00fb2c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/network/libnetapi/NetworkDevice.cpp
+9 -3
View File
@@ -12,8 +12,8 @@
#include <stdio.h> #include <stdio.h>
#include <sys/sockio.h> #include <sys/sockio.h>
#include <Messenger.h>
#include <Looper.h> #include <Looper.h>
#include <Messenger.h>
#include <AutoDeleter.h> #include <AutoDeleter.h>
#include <NetServer.h> #include <NetServer.h>
@@ -741,6 +741,8 @@ BNetworkDevice::Scan(bool wait, bool forceRescan)
BString interfaceName; BString interfaceName;
if (message->FindString("interface", &interfaceName) != B_OK) if (message->FindString("interface", &interfaceName) != B_OK)
return; return;
// See comment in AutoconfigLooper::_NetworkMonitorNotification
// for the reason as to why we use FindFirst instead of ==.
if (fInterface.FindFirst(interfaceName) < 0) if (fInterface.FindFirst(interfaceName) < 0)
return; return;
if (message->FindInt32("opcode") != B_NETWORK_WLAN_SCANNED) if (message->FindInt32("opcode") != B_NETWORK_WLAN_SCANNED)
@@ -788,11 +790,15 @@ BNetworkDevice::Scan(bool wait, bool forceRescan)
// If there is already a scan currently running, it's probably an "infinite" // If there is already a scan currently running, it's probably an "infinite"
// one, which we of course don't want to wait for. So just return immediately // one, which we of course don't want to wait for. So just return immediately
// if that's the case. // if that's the case.
if (status == EINPROGRESS) if (status == EINPROGRESS) {
delete listener;
return B_OK; return B_OK;
}
if (!wait || status != B_OK) if (!wait || status != B_OK) {
delete listener;
return status; return status;
}
while (wait_for_thread(listener->Run(), NULL) == B_INTERRUPTED) while (wait_for_thread(listener->Run(), NULL) == B_INTERRUPTED)
; ;