sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

Added error checking and removed some redundancy from device isOpen()

Browse Source
This commit is contained in:
EricLiu2000
2019-06-13 16:01:35 -04:00
parent 2806c935f1
commit 965679c370
8 changed files with 73 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/windows/pcap.cpp
+12 -4
View File
@@ -194,14 +194,20 @@ PCAP::PCAP(const device_errorhandler_t& err, neodevice_t& forDevice) : ICommunic
}
bool PCAP::open() {
if(!openable)
if(!openable) {
err(APIError::InvalidNeoDevice);
return false;
}
if(!pcap.ok())
if(!pcap.ok()) {
err(APIError::DriverFailedToOpen);
return false;
}
if(isOpen())
if(isOpen()) {
err(APIError::DeviceCurrentlyOpen);
return false;
}
// Open the interface
interface.fp = pcap.open(interface.nameFromWinPCAP.c_str(), 100, PCAP_OPENFLAG_PROMISCUOUS | PCAP_OPENFLAG_MAX_RESPONSIVENESS, 1, nullptr, errbuf);
@@ -222,8 +228,10 @@ bool PCAP::isOpen() {
}
bool PCAP::close() {
if(!isOpen())
if(!isOpen()) {
err(APIError::DeviceCurrentlyClosed);
return false;
}
closing = true; // Signal the threads that we are closing
readThread.join();