sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix PCAP MAC PID issues by checking against the serial returned instead

pull/4/head
Paul Hollinsky 2018-10-04 17:37:17 -04:00
parent efe04128fb
commit 6ad4e564b9
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
device/neovifire2/include/neovifire2eth.h
View File

@ -31,6 +31,9 @@ public:
auto device = std::make_shared<NeoVIFIRE2ETH>(neodevice);
if(!device->open()) // We will get the serial number on open
continue; // If the open failed, we won't display the device as an option to connect to
const char* serial = device->getNeoDevice().serial;
if(serial[0] != 'C' || serial[1] != 'Y')
continue; // The device is not a FIRE 2
strncpy(neodevice.serial, device->getNeoDevice().serial, sizeof(neodevice.serial));
neodevice.serial[sizeof(neodevice.serial) - 1] = '\0';
}

14
device/radgalaxy/include/radgalaxy.h
View File

@ -15,12 +15,13 @@ public:
static constexpr DeviceType::Enum DEVICE_TYPE = DeviceType::RADGalaxy;
static constexpr const uint16_t PRODUCT_ID = 0x0003;
RADGalaxy(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<PCAP>(getWritableNeoDevice());
auto transport = std::unique_ptr<ICommunication>(new PCAP(getWritableNeoDevice()));
auto packetizer = std::make_shared<Packetizer>();
packetizer->disableChecksum = true;
packetizer->align16bit = false;
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
auto encoder = std::unique_ptr<Encoder>(new Encoder(packetizer));
auto decoder = std::unique_ptr<Decoder>(new Decoder());
com = std::make_shared<Communication>(std::move(transport), packetizer, std::move(encoder), std::move(decoder));
getWritableNeoDevice().type = DEVICE_TYPE;
productId = PRODUCT_ID;
}
@ -29,12 +30,15 @@ public:
std::vector<std::shared_ptr<Device>> found;
for(auto neodevice : PCAP::FindByProduct(PRODUCT_ID)) {
{
{ // Scope created so that we don't have two of the same device at once
strncpy(neodevice.serial, SERIAL_FIND_ON_OPEN, sizeof(neodevice.serial));
neodevice.serial[sizeof(neodevice.serial) - 1] = '\0';
auto device = std::make_shared<RADGalaxy>(neodevice);
auto device = std::make_shared<NeoVIFIRE2ETH>(neodevice);
if(!device->open()) // We will get the serial number on open
continue; // If the open failed, we won't display the device as an option to connect to
const char* serial = device->getNeoDevice().serial;
if(serial[0] != 'R' || serial[1] != 'G')
continue; // The device is not a RADGalaxy
strncpy(neodevice.serial, device->getNeoDevice().serial, sizeof(neodevice.serial));
neodevice.serial[sizeof(neodevice.serial) - 1] = '\0';
}

2
platform/windows/include/devices.h
View File

@ -8,7 +8,7 @@
#include "device/neovifire2/include/neovifire2usb.h"
// #include "device/plasion/include/neoviion.h"
// #include "device/plasion/include/neoviplasma.h"
// #include "device/radgalaxy/include/radgalaxy.h"
#include "device/radgalaxy/include/radgalaxy.h"
// #include "device/radstar2/include/radstar2.h"
// #include "device/radsupermoon/include/radsupermoon.h"
// #include "device/valuecan3/include/valuecan3.h"

6
platform/windows/pcap.cpp
View File

@ -131,8 +131,10 @@ std::vector<neodevice_t> PCAP::FindByProduct(int product) {
EthernetPacket packet(data, header->caplen);
if(packet.etherType == 0xCAB2 && packet.srcMAC[0] == 0x00 && packet.srcMAC[1] == 0xFC && packet.srcMAC[2] == 0x70) {
if(product != packet.srcMAC[3]) // This is where the PID is stored in the MAC
continue; // This is not a product we're currently looking for
/* Here we could check packet.srcMAC[3] against the PID, however for some devices
* this is not correct. For this reason, we don't check the product here and instead
* check the serial number that comes back later.
*/
neodevice_t neodevice;
/* Unlike other transport layers, we can't get the serial number here as we