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

Remove all debugging printouts to stdout

Browse Source
This commit is contained in:
Paul Hollinsky
2018-10-30 15:02:01 -04:00
parent ccd26a3637
commit 92d98f8bd5
16 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/windows/pcap.cpp
+8 -8
View File
@@ -20,7 +20,7 @@ std::vector<PCAP::PCAPFoundDevice> PCAP::FindAll() {
std::vector<PCAPFoundDevice> foundDevices;
PCAPDLL pcap;
if(!pcap.ok()) {
std::cout << "PCAP not okay" << std::endl;
ErrorManager::GetInstance().add(APIError::PCAPCouldNotStart);
return std::vector<PCAPFoundDevice>();
}
@@ -38,7 +38,7 @@ std::vector<PCAP::PCAPFoundDevice> PCAP::FindAll() {
}
if(!success) {
std::cout << "PCAP FindAllDevs_Ex not okay " << errbuf << std::endl;
ErrorManager::GetInstance().add(APIError::PCAPCouldNotFindDevices);
return std::vector<PCAPFoundDevice>();
}
@@ -55,13 +55,13 @@ std::vector<PCAP::PCAPFoundDevice> PCAP::FindAll() {
// Now we're going to ask Win32 for the information as well
ULONG size = 0;
if(GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, nullptr, nullptr, &size) != ERROR_BUFFER_OVERFLOW) {
std::cout << "GetAdaptersAddresses size query not okay" << std::endl;
ErrorManager::GetInstance().add(APIError::PCAPCouldNotFindDevices);
return std::vector<PCAPFoundDevice>();
}
std::vector<uint8_t> adapterAddressBuffer;
adapterAddressBuffer.resize(size);
if(GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, nullptr, (IP_ADAPTER_ADDRESSES*)adapterAddressBuffer.data(), &size) != ERROR_SUCCESS) {
std::cout << "GetAdaptersAddresses not okay" << std::endl;
ErrorManager::GetInstance().add(APIError::PCAPCouldNotFindDevices);
return std::vector<PCAPFoundDevice>();
}
@@ -124,7 +124,7 @@ std::vector<PCAP::PCAPFoundDevice> PCAP::FindAll() {
const uint8_t* data;
auto res = pcap.next_ex(interface.fp, &header, &data);
if(res < 0) {
std::cout << "pcapnextex failed with " << res << std::endl;
//std::cout << "pcapnextex failed with " << res << std::endl;
break;
}
if(res == 0)
@@ -177,7 +177,7 @@ bool PCAP::IsHandleValid(neodevice_handle_t handle) {
return (netifIndex < knownInterfaces.size());
}
PCAP::PCAP(neodevice_t& forDevice) : device(forDevice) {
PCAP::PCAP(device_errorhandler_t err, neodevice_t& forDevice) : device(forDevice), err(err) {
if(IsHandleValid(device.handle)) {
interface = knownInterfaces[(device.handle >> 24) & 0xFF];
interface.fp = nullptr; // We're going to open our own connection to the interface. This should already be nullptr but just in case.
@@ -206,7 +206,7 @@ bool PCAP::open() {
// Open the interface
interface.fp = pcap.open(interface.nameFromWinPCAP.c_str(), 100, PCAP_OPENFLAG_PROMISCUOUS | PCAP_OPENFLAG_MAX_RESPONSIVENESS, 1, nullptr, errbuf);
if(interface.fp == nullptr) {
std::cout << "Open device " << device.serial << " failed with " << errbuf << std::endl;
err(APIError::DriverFailedToOpen);
return false;
}
@@ -241,7 +241,7 @@ void PCAP::readTask() {
while(!closing) {
auto readBytes = pcap.next_ex(interface.fp, &header, &data);
if(readBytes < 0) {
std::cout << "pcapnextex failed in read task with " << readBytes << std::endl;
err(APIError::FailedToRead);
break;
}
if(readBytes == 0)
platform/windows/vcp.cpp
+11 -18
View File
@@ -249,28 +249,22 @@ void VCP::readTask() {
case LAUNCH: {
COMSTAT comStatus;
unsigned long errorCodes;
if(!ClearCommError(handle, &errorCodes, &comStatus))
std::cout << "Error clearing com err" << std::endl;
ClearCommError(handle, &errorCodes, &comStatus);
bytesRead = 0;
if(ReadFile(handle, readbuf, READ_BUFFER_SIZE, nullptr, &overlappedRead)) {
if(GetOverlappedResult(handle, &overlappedRead, &bytesRead, FALSE)) {
if(bytesRead)
readQueue.enqueue_bulk(readbuf, bytesRead);
} else {
std::cout <<"Readfile succeeded but not enqueued " << GetLastError() << std::endl;
}
continue;
}
auto err = GetLastError();
if(err == ERROR_SUCCESS)
std::cout << "Error was success?" << std::endl;
if(err == ERROR_IO_PENDING)
auto lastError = GetLastError();
if(lastError == ERROR_IO_PENDING)
state = WAIT;
else
std::cout << "ReadFile failed " << err << std::endl;
else if(lastError != ERROR_SUCCESS)
err(APIError::FailedToRead);
}
break;
case WAIT: {
@@ -281,11 +275,11 @@ void VCP::readTask() {
readQueue.enqueue_bulk(readbuf, bytesRead);
state = LAUNCH;
} else
std::cout << "ReadFile deferred failed " << err << std::endl;
err(APIError::FailedToRead);
}
if(ret == WAIT_ABANDONED) {
state = LAUNCH;
std::cout << "Readfile abandoned" << std::endl;
err(APIError::FailedToRead);
}
}
}
@@ -311,20 +305,19 @@ void VCP::writeTask() {
state = WAIT;
}
else
std::cout << "Writefile failed " << err << std::endl;
err(APIError::FailedToWrite);
}
break;
case WAIT: {
auto ret = WaitForSingleObject(overlappedWrite.hEvent, 50);
if(ret == WAIT_OBJECT_0) {
if(!GetOverlappedResult(handle, &overlappedWrite, &bytesWritten, FALSE)) {
std::cout << "Writefile deferred failed " << GetLastError() << std::endl;
}
if(!GetOverlappedResult(handle, &overlappedWrite, &bytesWritten, FALSE))
err(APIError::FailedToWrite);
state = LAUNCH;
}
if(ret == WAIT_ABANDONED) {
std::cout << "Writefile deferred abandoned" << std::endl;
err(APIError::FailedToWrite);
state = LAUNCH;
}
}