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

reuse discovered pcap interfaces in DeviceFinder::FindAll()

Browse Source
This commit is contained in:
Jeffrey Quesnelle
2020-05-11 16:17:56 -04:00
parent 99879c9021
commit d2019c24df
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/devicefinder.cpp
+7 -3
View File
@@ -88,6 +88,10 @@ std::vector<std::shared_ptr<Device>> DeviceFinder::FindAll() {
std::vector<std::shared_ptr<Device>> foundDevices;
std::vector<std::vector<std::shared_ptr<Device>>> findResults;
#if defined(LIBICSNEO_HAVE_PCAP) && LIBICSNEO_HAVE_PCAP == 1
auto pcapDevices = PCAP::FindAll();
#endif
#ifdef __ETHERBADGE_H_
findResults.push_back(EtherBADGE::Find());
#endif
@@ -105,7 +109,7 @@ std::vector<std::shared_ptr<Device>> DeviceFinder::FindAll() {
#endif
#ifdef __NEOVIFIRE2ETH_H_
findResults.push_back(NeoVIFIRE2ETH::Find());
findResults.push_back(NeoVIFIRE2ETH::Find(pcapDevices));
#endif
#ifdef __NEOVIFIRE2USB_H_
@@ -121,7 +125,7 @@ std::vector<std::shared_ptr<Device>> DeviceFinder::FindAll() {
#endif
#ifdef __RADGALAXY_H_
findResults.push_back(RADGalaxy::Find());
findResults.push_back(RADGalaxy::Find(pcapDevices));
#endif
#ifdef __RADPLUTOUSB_H_
@@ -129,7 +133,7 @@ std::vector<std::shared_ptr<Device>> DeviceFinder::FindAll() {
#endif
#ifdef __RADSTAR2ETH_H_
findResults.push_back(RADStar2ETH::Find());
findResults.push_back(RADStar2ETH::Find(pcapDevices));
#endif
#ifdef __RADSTAR2USB_H_