Merge 31d4a750d8 into 68ebb6dae4

An incoming bytestream can be less than 24 bytes, leading to exceptions
when accessing its data (or allocating the vector for its payload).
Perform a size check before trying to decode the bytestream and discard
invalid incoming streams.

Signed-off-by: Francesco Valla <francesco.valla@mta.it>

bindings/python/icsneopy/communication/message/ethernetmessage.cpp

@@ -18,6 +18,17 @@ void init_ethernetmessage(pybind11::module_& m) {
 		.def_readwrite("fcs", &EthernetMessage::fcs)
 		.def_readwrite("frameTooShort", &EthernetMessage::frameTooShort)
 		.def_readwrite("noPadding", &EthernetMessage::noPadding)
+		.def_readwrite("fcsVerified", &EthernetMessage::fcsVerified)
+		.def_readwrite("txAborted", &EthernetMessage::txAborted)
+		.def_readwrite("crcError", &EthernetMessage::crcError)
+		.def_readwrite("isT1S", &EthernetMessage::isT1S)
+		.def_readwrite("isT1SSymbol", &EthernetMessage::isT1SSymbol)
+		.def_readwrite("isT1SBurst", &EthernetMessage::isT1SBurst)
+		.def_readwrite("txCollision", &EthernetMessage::txCollision)
+		.def_readwrite("isT1SWake", &EthernetMessage::isT1SWake)
+		.def_readwrite("t1sNodeId", &EthernetMessage::t1sNodeId)
+		.def_readwrite("t1sBurstCount", &EthernetMessage::t1sBurstCount)
+		.def_readwrite("t1sSymbolType", &EthernetMessage::t1sSymbolType)
 		.def("get_destination_mac", &EthernetMessage::getDestinationMAC, pybind11::return_value_policy::reference)
 		.def("get_source_mac", &EthernetMessage::getSourceMAC, pybind11::return_value_policy::reference)
 		.def("get_ether_type", &EthernetMessage::getEtherType);

bindings/python/icsneopy/device/chipid.cpp

@@ -111,7 +111,7 @@ void init_chipid(pybind11::module_& m) {
 		.value("RAD_GALAXY_2_ZMPCHIP_ID", ChipID::RAD_GALAXY_2_ZMPCHIP_ID)
 		.value("NewDevice59_MCHIP", ChipID::NewDevice59_MCHIP)
 		.value("RADMoon2_Z7010_ZYNQ", ChipID::RADMoon2_Z7010_ZYNQ)
-		.value("neoVIFIRE2_CORE_SG4", ChipID::neoVIFIRE2_CORE_SG4)
+		.value("neoVIFIRE2_Core_SG4", ChipID::neoVIFIRE2_Core_SG4)
 		.value("RADBMS_MCHIP", ChipID::RADBMS_MCHIP)
 		.value("RADMoon2_ZL_MCHIP", ChipID::RADMoon2_ZL_MCHIP)
 		.value("RADGigastar_USBZ_Z7010_ZYNQ", ChipID::RADGigastar_USBZ_Z7010_ZYNQ)

bindings/python/icsneopy/device/idevicesettings.cpp

@@ -71,6 +71,20 @@ void init_idevicesettings(pybind11::module_& m) {
         .def("set_phy_mode", &IDeviceSettings::setPhyMode, pybind11::call_guard<pybind11::gil_scoped_release>())
         .def("set_phy_speed", &IDeviceSettings::setPhySpeed, pybind11::call_guard<pybind11::gil_scoped_release>())
 
+        // 10BASE-T1S methods
+        .def("is_t1s_plca_enabled", &IDeviceSettings::isT1SPLCAEnabledFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("set_t1s_plca", &IDeviceSettings::setT1SPLCAFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("get_t1s_local_id", &IDeviceSettings::getT1SLocalIDFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("set_t1s_local_id", &IDeviceSettings::setT1SLocalIDFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("get_t1s_max_nodes", &IDeviceSettings::getT1SMaxNodesFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("set_t1s_max_nodes", &IDeviceSettings::setT1SMaxNodesFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("get_t1s_tx_opp_timer", &IDeviceSettings::getT1STxOppTimerFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("set_t1s_tx_opp_timer", &IDeviceSettings::setT1STxOppTimerFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("get_t1s_max_burst", &IDeviceSettings::getT1SMaxBurstFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("set_t1s_max_burst", &IDeviceSettings::setT1SMaxBurstFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("get_t1s_burst_timer", &IDeviceSettings::getT1SBurstTimerFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        .def("set_t1s_burst_timer", &IDeviceSettings::setT1SBurstTimerFor, pybind11::call_guard<pybind11::gil_scoped_release>())
+        
         // Status properties
         .def_readonly("disabled", &IDeviceSettings::disabled)
         .def_readonly("readonly", &IDeviceSettings::readonly);

communication/ethernetpacketizer.cpp

@@ -133,6 +133,10 @@ EthernetPacketizer::EthernetPacket::EthernetPacket(const uint8_t* data, size_t s
 
 int EthernetPacketizer::EthernetPacket::loadBytestream(const std::vector<uint8_t>& bytestream) {
 	errorWhileDecodingFromBytestream = 0;
+	if (bytestream.size() < 24) {
+		errorWhileDecodingFromBytestream = 1;
+		return errorWhileDecodingFromBytestream;
+	}
 	for(size_t i = 0; i < 6; i++)
 		destMAC[i] = bytestream[i];
 	for(size_t i = 0; i < 6; i++)

communication/packet/ethernetpacket.cpp

@@ -1,5 +1,5 @@
 #include "icsneo/communication/packet/ethernetpacket.h"
-#include <algorithm> // for std::copy
+#include <algorithm>
 #include <iostream>
 
 using namespace icsneo;
@@ -10,16 +10,17 @@ std::shared_ptr<EthernetMessage> HardwareEthernetPacket::DecodeToMessage(const s
 	// Make sure we have enough to read the packet length first
 	if(bytestream.size() < sizeof(HardwareEthernetPacket))
 		return nullptr;
-	// packet->Length will also encompass the two uint16_t's at the end of the struct, make sure that at least they are here
-	if(packet->Length < 4)
-		return nullptr;
 	const size_t fcsSize = packet->header.FCS_AVAIL ? 4 : 0;
+	// Ensure Length is sufficient for FCS extraction to avoid invalid iterator arithmetic
+	if(packet->Length < fcsSize)
+		return nullptr;
 	const size_t bytestreamExpectedSize = sizeof(HardwareEthernetPacket) + packet->Length;
 	const size_t bytestreamActualSize = bytestream.size();
 	if(bytestreamActualSize < bytestreamExpectedSize)
 		return nullptr;
 	auto messagePtr = std::make_shared<EthernetMessage>();
 	EthernetMessage& message = *messagePtr;
+	// Standard Ethernet fields
 	message.transmitted = packet->eid.TXMSG;
 	if(message.transmitted)
 		message.description = packet->stats;
@@ -27,12 +28,28 @@ std::shared_ptr<EthernetMessage> HardwareEthernetPacket::DecodeToMessage(const s
 	if(message.preemptionEnabled)
 		message.preemptionFlags = (uint8_t)((rawWords[0] & 0x03F8) >> 4);
 	message.frameTooShort = packet->header.RUNT_FRAME;
+	message.noPadding = !packet->header.ENABLE_PADDING;
+	message.fcsVerified = packet->header.FCS_VERIFIED;
+	message.txAborted = packet->eid.TXAborted;
+	message.crcError = packet->header.CRC_ERROR;
+
 	if(message.frameTooShort)
 		message.error = true;
 	// This timestamp is raw off the device (in timestampResolution increments)
 	// Decoder will fix as it has information about the timestampResolution increments
 	message.timestamp = packet->timestamp.TS;
 
+	// Check if this is a T1S packet and populate T1S-specific fields
+	message.isT1S = packet->header.T1S_ETHERNET;
+	if(message.isT1S) {
+		message.isT1SSymbol = packet->eid.T1S_SYMBOL;
+		message.isT1SBurst = packet->eid.T1S_BURST;
+		message.txCollision = packet->t1s_status.TXCollision;
+		message.isT1SWake = packet->t1s_status.T1SWake;
+		message.t1sNodeId = packet->t1s_node.T1S_NODE_ID;
+		message.t1sBurstCount = packet->t1s_node.T1S_BURST_COUNT;
+	}
+
 	const std::vector<uint8_t>::const_iterator databegin = bytestream.begin() + sizeof(HardwareEthernetPacket);
 	const std::vector<uint8_t>::const_iterator dataend = databegin + packet->Length - fcsSize;
 	message.data.insert(message.data.begin(), databegin, dataend);

include/icsneo/communication/message/ethernetmessage.h

@@ -4,17 +4,17 @@
 #ifdef __cplusplus
 
 #include "icsneo/communication/message/message.h"
-
-// Used for MACAddress.toString() only
+#include <string>
+#include <vector>
 #include <sstream>
 #include <iomanip>
+#include <cstring>
 
 namespace icsneo {
 
 struct MACAddress {
 	uint8_t data[6];
 
-	// Helpers
 	std::string toString() const {
 		std::stringstream ss;
 		for(size_t i = 0; i < 6; i++) {
@@ -33,11 +33,25 @@ struct MACAddress {
 
 class EthernetMessage : public Frame {
 public:
+	// Standard Ethernet fields
 	bool preemptionEnabled = false;
 	uint8_t preemptionFlags = 0;
 	std::optional<uint32_t> fcs;
 	bool frameTooShort = false;
 	bool noPadding = false;
+	bool fcsVerified = false;
+	bool txAborted = false;
+	bool crcError = false;
+	bool isT1S = false;
+
+	
+	bool isT1SSymbol = false;
+	bool isT1SBurst = false;
+	bool txCollision = false;
+	bool isT1SWake = false;
+	uint8_t t1sNodeId = 0;
+	uint8_t t1sBurstCount = 0;
+	uint8_t t1sSymbolType = 0;
 
 	// Accessors
 	const MACAddress& getDestinationMAC() const { return *(const MACAddress*)(data.data() + 0); }

include/icsneo/device/chipid.h

@@ -110,7 +110,7 @@ enum class ChipID : uint8_t {
 	RAD_GALAXY_2_ZMPCHIP_ID = 102,
 	NewDevice59_MCHIP = 103,
 	RADMoon2_Z7010_ZYNQ = 104,
-	neoVIFIRE2_CORE_SG4 = 105,
+	neoVIFIRE2_Core_SG4 = 105,
 	RADBMS_MCHIP = 106,
 	RADMoon2_ZL_MCHIP = 107,
 	RADGigastar_USBZ_Z7010_ZYNQ = 108,

include/icsneo/device/device.h

@@ -162,6 +162,14 @@ public:
 
 	bool hasBootloader() { return !!getBootloader(); }
 
+	virtual bool supportsSwVersionValidate() const {
+		return true;
+	}
+
+	void setBootloaderVersion(const HardwareInfo::Version& version) {
+		bootloaderVersion = version;
+	}
+
 	static std::string SerialNumToString(uint32_t serial);
 	static uint32_t SerialStringToNum(const std::string& serial);
 	static bool SerialStringIsNumeric(const std::string& serial);
@@ -982,6 +990,7 @@ protected:
 	LEDState ledState;
 	void updateLEDState();
 
+	std::optional<HardwareInfo::Version> bootloaderVersion = std::nullopt;
 
 private:
 	neodevice_t data;

include/icsneo/device/idevicesettings.h

@@ -940,6 +940,74 @@ public:
 		report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
 		return std::nullopt;
 	}
+
+	virtual std::optional<bool> isT1SPLCAEnabledFor(Network net) const {
+		(void)net;
+		report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
+		return std::nullopt;
+	}
+
+	virtual bool setT1SPLCAFor(Network net, bool enable) {
+		(void)net; (void)enable;
+		report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
+		return false;
+	}
+
+	virtual std::optional<uint8_t> getT1SLocalIDFor(Network net) const {
+		(void)net;
+		report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
+		return std::nullopt;
+	}
+
+	virtual bool setT1SLocalIDFor(Network net, uint8_t id) {
+		(void)net; (void)id;
+		return false;
+	}
+
+	virtual std::optional<uint8_t> getT1SMaxNodesFor(Network net) const {
+		(void)net;
+		report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
+		return std::nullopt;
+	}
+
+	virtual bool setT1SMaxNodesFor(Network net, uint8_t nodes) {
+		(void)net; (void)nodes;
+		return false;
+	}
+
+	virtual std::optional<uint8_t> getT1STxOppTimerFor(Network net) const {
+		(void)net;
+		report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
+		return std::nullopt;
+	}
+
+	virtual bool setT1STxOppTimerFor(Network net, uint8_t timer) {
+		(void)net; (void)timer;
+		return false;
+	}
+
+	virtual std::optional<uint8_t> getT1SMaxBurstFor(Network net) const {
+		(void)net;
+		report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
+		return std::nullopt;
+	}
+
+	virtual bool setT1SMaxBurstFor(Network net, uint8_t burst) {
+		(void)net; (void)burst;
+		return false;
+	}
+
+	virtual std::optional<uint8_t> getT1SBurstTimerFor(Network net) const {
+		(void)net;
+		report(APIEvent::Type::SettingNotAvaiableDevice, APIEvent::Severity::EventWarning);
+		return std::nullopt;
+	}
+
+	virtual bool setT1SBurstTimerFor(Network net, uint8_t timer) {
+		(void)net; (void)timer;
+		return false;
+	}
+
 	const void* getRawStructurePointer() const { return settingsInDeviceRAM.data(); }
 	void* getMutableRawStructurePointer() { return settings.data(); }
 	template<typename T> const T* getStructurePointer() const { return reinterpret_cast<const T*>(getRawStructurePointer()); }

include/icsneo/device/tree/neovifire2/neovifire2.h

@@ -98,13 +98,15 @@ public:
 	}
 
 	CoreChipVariant getCoreChipVariant() {
+		if(!bootloaderVersion.has_value()) {
 			const auto& hardwareInfo = getHardwareInfo(std::chrono::milliseconds(1000));
 			if(!hardwareInfo) {
 				chipVariant = CoreChipVariant::Invalid;
 				return chipVariant;
 			}
-		const auto& bootloaderVersion = hardwareInfo->bootloaderVersion;
-		if(bootloaderVersion.major >= CORE_SG4_BL_MAJOR_VERSION_CUTOFF) {
+			setBootloaderVersion(hardwareInfo->bootloaderVersion);
+		}
+		if(bootloaderVersion->major >= CORE_SG4_BL_MAJOR_VERSION_CUTOFF) {
 			chipVariant = CoreChipVariant::Core_SG4;
 		} else {
 			chipVariant = CoreChipVariant::Core;
@@ -122,7 +124,7 @@ public:
 		static std::vector<ChipInfo> chipsSG4 = {
 			{ChipID::neoVIFIRE2_MCHIP, true, "MCHIP", "fire2_mchip_ief", 0, FirmwareType::IEF},
 			{ChipID::neoVIFIRE2_ZYNQ, true, "ZCHIP", "fire2_zchip_ief", 1, FirmwareType::IEF},
-			{ChipID::neoVIFIRE2_CORE_SG4, true, "Core", "fire2_core_sg4", 2, FirmwareType::IEF}
+			{ChipID::neoVIFIRE2_Core_SG4, true, "Core", "fire2_core_sg4", 2, FirmwareType::IEF}
 		};
 		
 		if(chipVariant == CoreChipVariant::Core_SG4) {
@@ -137,7 +139,7 @@ public:
 		pipeline.add<EnterBootloaderPhase>()
 				.add<FlashPhase>(ChipID::neoVIFIRE2_MCHIP, BootloaderCommunication::RED);
 		if(chipVariant == CoreChipVariant::Core_SG4) {
-			pipeline.add<FlashPhase>(ChipID::neoVIFIRE2_CORE_SG4, BootloaderCommunication::REDCore, false, false);
+			pipeline.add<FlashPhase>(ChipID::neoVIFIRE2_Core_SG4, BootloaderCommunication::REDCore, false, false);
 		} else {
 			pipeline.add<FlashPhase>(ChipID::neoVIFIRE2_Core, BootloaderCommunication::REDCore, false, false);
 		}
@@ -147,6 +149,10 @@ public:
 		return pipeline;
 	}
 
+	bool supportsSwVersionValidate() const override {
+		return bootloaderVersion.has_value() && (bootloaderVersion->major > 4 || (bootloaderVersion->major == 4 && bootloaderVersion->minor >= 3));
+	}
+
 	std::vector<VersionReport> getChipVersions(bool refreshComponents = true) override {
 		if(chipVariant == CoreChipVariant::Invalid) {
 			getCoreChipVariant();

include/icsneo/device/tree/neovifire3t1slin/neovifire3t1slinsettings.h

@@ -257,6 +257,153 @@ public:
 		}
 	}
 
+	std::optional<bool> isT1SPLCAEnabledFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional<bool>((t1s->flags & ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA) != 0);
+	}
+
+	bool setT1SPLCAFor(Network net, bool enable) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		if(enable)
+			t1s->flags |= ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA;
+		else
+			t1s->flags &= ~ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA;
+		
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SLocalIDFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->local_id);
+	}
+
+	bool setT1SLocalIDFor(Network net, uint8_t id) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->local_id = id;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SMaxNodesFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->max_num_nodes);
+	}
+
+	bool setT1SMaxNodesFor(Network net, uint8_t nodes) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->max_num_nodes = nodes;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1STxOppTimerFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->to_timer);
+	}
+
+	bool setT1STxOppTimerFor(Network net, uint8_t timer) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->to_timer = timer;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SMaxBurstFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->max_burst_count);
+	}
+
+	bool setT1SMaxBurstFor(Network net, uint8_t burst) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->max_burst_count = burst;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SBurstTimerFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->burst_timer);
+	}
+
+	bool setT1SBurstTimerFor(Network net, uint8_t timer) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->burst_timer = timer;
+		return true;
+	}
+
+private:
+	const ETHERNET10T1S_SETTINGS* getT1SSettingsFor(Network net) const {
+		auto cfg = getStructurePointer<neovifire3t1slin_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		
+		switch(net.getNetID()) {
+			case Network::NetID::AE_01: return &(cfg->t1s1);
+			case Network::NetID::AE_02: return &(cfg->t1s2);
+			case Network::NetID::AE_03: return &(cfg->t1s3);
+			case Network::NetID::AE_04: return &(cfg->t1s4);
+			case Network::NetID::AE_05: return &(cfg->t1s5);
+			case Network::NetID::AE_06: return &(cfg->t1s6);
+			case Network::NetID::AE_07: return &(cfg->t1s7);
+			case Network::NetID::AE_08: return &(cfg->t1s8);
+			default:
+				report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+				return nullptr;
+		}
+	}
+
+	ETHERNET10T1S_SETTINGS* getMutableT1SSettingsFor(Network net) {
+		auto cfg = getMutableStructurePointer<neovifire3t1slin_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		
+		switch(net.getNetID()) {
+			case Network::NetID::AE_01: return &(cfg->t1s1);
+			case Network::NetID::AE_02: return &(cfg->t1s2);
+			case Network::NetID::AE_03: return &(cfg->t1s3);
+			case Network::NetID::AE_04: return &(cfg->t1s4);
+			case Network::NetID::AE_05: return &(cfg->t1s5);
+			case Network::NetID::AE_06: return &(cfg->t1s6);
+			case Network::NetID::AE_07: return &(cfg->t1s7);
+			case Network::NetID::AE_08: return &(cfg->t1s8);
+			default:
+				report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+				return nullptr;
+		}
+	}
+
 protected:
 	ICSNEO_UNALIGNED(const uint64_t*) getTerminationEnables() const override {
 		auto cfg = getStructurePointer<neovifire3t1slin_settings_t>();

include/icsneo/device/tree/rada2b/rada2b.h

@@ -58,7 +58,7 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADA2B_ZCHIP, BootloaderCommunication::RAD)
-			// .add<ReconnectPhase>()
+			.add<EnterApplicationPhase>(ChipID::RADA2B_ZCHIP)
 			.add<WaitPhase>(std::chrono::milliseconds(3000));
 	}
 protected:

include/icsneo/device/tree/radcomet/radcometbase.h

@@ -45,6 +45,7 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADComet_ZYNQ, BootloaderCommunication::RAD)
+			.add<EnterApplicationPhase>(ChipID::RADComet_ZYNQ)
 			.add<WaitPhase>(std::chrono::milliseconds(3000))
 			.add<ReconnectPhase>();
 	}

include/icsneo/device/tree/radcomet3/radcomet3.h

@@ -69,6 +69,7 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADCOMET3_ZCHIP, BootloaderCommunication::RAD)
+			.add<EnterApplicationPhase>(ChipID::RADCOMET3_ZCHIP)
 			.add<WaitPhase>(std::chrono::milliseconds(5000))
 			.add<ReconnectPhase>();
 	}

include/icsneo/device/tree/radcomet3/radcomet3settings.h

@@ -113,6 +113,149 @@ public:
 				return nullptr;
 		}
 	}
+
+	std::optional<bool> isT1SPLCAEnabledFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional<bool>((t1s->flags & ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA) != 0);
+	}
+
+	bool setT1SPLCAFor(Network net, bool enable) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		if(enable)
+			t1s->flags |= ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA;
+		else
+			t1s->flags &= ~ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA;
+		
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SLocalIDFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->local_id);
+	}
+
+	bool setT1SLocalIDFor(Network net, uint8_t id) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->local_id = id;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SMaxNodesFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->max_num_nodes);
+	}
+
+	bool setT1SMaxNodesFor(Network net, uint8_t nodes) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->max_num_nodes = nodes;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1STxOppTimerFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->to_timer);
+	}
+
+	bool setT1STxOppTimerFor(Network net, uint8_t timer) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->to_timer = timer;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SMaxBurstFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->max_burst_count);
+	}
+
+	bool setT1SMaxBurstFor(Network net, uint8_t burst) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->max_burst_count = burst;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SBurstTimerFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+		
+		return std::make_optional(t1s->burst_timer);
+	}
+
+	bool setT1SBurstTimerFor(Network net, uint8_t timer) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+		
+		t1s->burst_timer = timer;
+		return true;
+	}
+
+private:
+	const ETHERNET10T1S_SETTINGS* getT1SSettingsFor(Network net) const {
+		auto cfg = getStructurePointer<radcomet3_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		
+		switch(net.getNetID()) {
+			case Network::NetID::AE_02: return &(cfg->t1s1);
+			case Network::NetID::AE_03: return &(cfg->t1s2);
+			case Network::NetID::AE_04: return &(cfg->t1s3);
+			case Network::NetID::AE_05: return &(cfg->t1s4);
+			case Network::NetID::AE_06: return &(cfg->t1s5);
+			case Network::NetID::AE_07: return &(cfg->t1s6);
+			default:
+				report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+				return nullptr;
+		}
+	}
+
+	ETHERNET10T1S_SETTINGS* getMutableT1SSettingsFor(Network net) {
+		auto cfg = getMutableStructurePointer<radcomet3_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+		
+		switch(net.getNetID()) {
+			case Network::NetID::AE_02: return &(cfg->t1s1);
+			case Network::NetID::AE_03: return &(cfg->t1s2);
+			case Network::NetID::AE_04: return &(cfg->t1s3);
+			case Network::NetID::AE_05: return &(cfg->t1s4);
+			case Network::NetID::AE_06: return &(cfg->t1s5);
+			case Network::NetID::AE_07: return &(cfg->t1s6);
+			default:
+				report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+				return nullptr;
+		}
+	}
 };
 
 }

include/icsneo/device/tree/radgalaxy/radgalaxy.h

@@ -80,6 +80,7 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RADGalaxy_ZYNQ, BootloaderCommunication::RAD)
+			.add<EnterApplicationPhase>(ChipID::RADGalaxy_ZYNQ)
 			.add<ReconnectPhase>()
 			.add<WaitPhase>(std::chrono::milliseconds(3000));
 	}

include/icsneo/device/tree/radgalaxy2/radgalaxy2.h

@@ -87,9 +87,10 @@ public:
 		return BootloaderPipeline()
 			.add<EnterBootloaderPhase>()
 			.add<FlashPhase>(ChipID::RAD_GALAXY_2_ZMPCHIP_ID, BootloaderCommunication::RAD)
+			.add<EnterApplicationPhase>(ChipID::RAD_GALAXY_2_ZMPCHIP_ID)
 			.add<ReconnectPhase>()
 			.add<FlashPhase>(ChipID::RADGALAXY2_SYSMON_CHIP, BootloaderCommunication::RADGalaxy2Peripheral)
-			.add<EnterApplicationPhase>(ChipID::RAD_GALAXY_2_ZMPCHIP_ID)
+			.add<EnterApplicationPhase>(ChipID::RADGALAXY2_SYSMON_CHIP)
 			.add<ReconnectPhase>()
 			.add<WaitPhase>(std::chrono::milliseconds(3000));
 	}

include/icsneo/device/tree/radgigastar/radgigastar.h

@@ -93,11 +93,13 @@ public:
 		if(com->driver->isEthernet()) {
 			return BootloaderPipeline()
 				.add<FlashPhase>(ChipID::RADGigastar_ZYNQ, BootloaderCommunication::RAD)
+				.add<EnterApplicationPhase>(ChipID::RADGigastar_ZYNQ)
 				.add<WaitPhase>(std::chrono::milliseconds(3000))
 				.add<ReconnectPhase>();
 		}
 		return BootloaderPipeline()
 			.add<FlashPhase>(ChipID::RADGigastar_USBZ_ZYNQ, BootloaderCommunication::RAD)
+			.add<EnterApplicationPhase>(ChipID::RADGigastar_USBZ_ZYNQ)
 			.add<WaitPhase>(std::chrono::milliseconds(3000))
 			.add<ReconnectPhase>();
 	}

include/icsneo/device/tree/radgigastar2/radgigastar2settings.h

@@ -249,6 +249,153 @@ namespace icsneo
 			}
 		}
 
+		std::optional<bool> isT1SPLCAEnabledFor(Network net) const override {
+			const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return std::nullopt;
+			
+			return std::make_optional<bool>((t1s->flags & ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA) != 0);
+		}
+
+		bool setT1SPLCAFor(Network net, bool enable) override {
+			ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return false;
+			
+			if(enable)
+				t1s->flags |= ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA;
+			else
+				t1s->flags &= ~ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA;
+			
+			return true;
+		}
+
+		std::optional<uint8_t> getT1SLocalIDFor(Network net) const override {
+			const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return std::nullopt;
+			
+			return std::make_optional(t1s->local_id);
+		}
+
+		bool setT1SLocalIDFor(Network net, uint8_t id) override {
+			ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return false;
+			
+			t1s->local_id = id;
+			return true;
+		}
+
+		std::optional<uint8_t> getT1SMaxNodesFor(Network net) const override {
+			const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return std::nullopt;
+			
+			return std::make_optional(t1s->max_num_nodes);
+		}
+
+		bool setT1SMaxNodesFor(Network net, uint8_t nodes) override {
+			ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return false;
+			
+			t1s->max_num_nodes = nodes;
+			return true;
+		}
+
+		std::optional<uint8_t> getT1STxOppTimerFor(Network net) const override {
+			const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return std::nullopt;
+			
+			return std::make_optional(t1s->to_timer);
+		}
+
+		bool setT1STxOppTimerFor(Network net, uint8_t timer) override {
+			ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return false;
+			
+			t1s->to_timer = timer;
+			return true;
+		}
+
+		std::optional<uint8_t> getT1SMaxBurstFor(Network net) const override {
+			const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return std::nullopt;
+			
+			return std::make_optional(t1s->max_burst_count);
+		}
+
+		bool setT1SMaxBurstFor(Network net, uint8_t burst) override {
+			ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return false;
+			
+			t1s->max_burst_count = burst;
+			return true;
+		}
+
+		std::optional<uint8_t> getT1SBurstTimerFor(Network net) const override {
+			const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return std::nullopt;
+			
+			return std::make_optional(t1s->burst_timer);
+		}
+
+		bool setT1SBurstTimerFor(Network net, uint8_t timer) override {
+			ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+			if(t1s == nullptr)
+				return false;
+			
+			t1s->burst_timer = timer;
+			return true;
+		}
+
+	private:
+		const ETHERNET10T1S_SETTINGS* getT1SSettingsFor(Network net) const {
+			auto cfg = getStructurePointer<radgigastar2_settings_t>();
+			if(cfg == nullptr)
+				return nullptr;
+			
+			switch(net.getNetID()) {
+				case Network::NetID::AE_03: return &(cfg->t1s1);
+				case Network::NetID::AE_04: return &(cfg->t1s2);
+				case Network::NetID::AE_05: return &(cfg->t1s3);
+				case Network::NetID::AE_06: return &(cfg->t1s4);
+				case Network::NetID::AE_07: return &(cfg->t1s5);
+				case Network::NetID::AE_08: return &(cfg->t1s6);
+				case Network::NetID::AE_09: return &(cfg->t1s7);
+				case Network::NetID::AE_10: return &(cfg->t1s8);
+				default:
+					report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+					return nullptr;
+			}
+		}
+
+		ETHERNET10T1S_SETTINGS* getMutableT1SSettingsFor(Network net) {
+			auto cfg = getMutableStructurePointer<radgigastar2_settings_t>();
+			if(cfg == nullptr)
+				return nullptr;
+			
+			switch(net.getNetID()) {
+				case Network::NetID::AE_03: return &(cfg->t1s1);
+				case Network::NetID::AE_04: return &(cfg->t1s2);
+				case Network::NetID::AE_05: return &(cfg->t1s3);
+				case Network::NetID::AE_06: return &(cfg->t1s4);
+				case Network::NetID::AE_07: return &(cfg->t1s5);
+				case Network::NetID::AE_08: return &(cfg->t1s6);
+				case Network::NetID::AE_09: return &(cfg->t1s7);
+				case Network::NetID::AE_10: return &(cfg->t1s8);
+				default:
+					report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+					return nullptr;
+			}
+		}
+
 	protected:
 		ICSNEO_UNALIGNED(const uint64_t *)
 		getTerminationEnables() const override

include/icsneo/device/tree/radmoont1s/radmoont1ssettings.h

@@ -47,6 +47,169 @@ static_assert(sizeof(radmoont1s_settings_t) == 160, "RADMoonT1S settings size mi
 class RADMoonT1SSettings : public IDeviceSettings {
 public:
 	RADMoonT1SSettings(std::shared_ptr<Communication> com) : IDeviceSettings(com, sizeof(radmoont1s_settings_t)) {}
+
+	std::optional<bool> isT1SPLCAEnabledFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+
+		return std::make_optional<bool>((t1s->flags & ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA) != 0);
+	}
+
+	bool setT1SPLCAFor(Network net, bool enable) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+
+		if(enable)
+			t1s->flags |= ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA;
+		else
+			t1s->flags &= ~ETHERNET10T1S_SETTINGS_FLAG_ENABLE_PLCA;
+
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SLocalIDFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+
+		return std::make_optional(t1s->local_id);
+	}
+
+	bool setT1SLocalIDFor(Network net, uint8_t id) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+
+		t1s->local_id = id;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SMaxNodesFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+
+		return std::make_optional(t1s->max_num_nodes);
+	}
+
+	bool setT1SMaxNodesFor(Network net, uint8_t nodes) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+
+		t1s->max_num_nodes = nodes;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1STxOppTimerFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+
+		return std::make_optional(t1s->to_timer);
+	}
+
+	bool setT1STxOppTimerFor(Network net, uint8_t timer) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+
+		t1s->to_timer = timer;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SMaxBurstFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+
+		return std::make_optional(t1s->max_burst_count);
+	}
+
+	bool setT1SMaxBurstFor(Network net, uint8_t burst) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+
+		t1s->max_burst_count = burst;
+		return true;
+	}
+
+	std::optional<uint8_t> getT1SBurstTimerFor(Network net) const override {
+		const ETHERNET10T1S_SETTINGS* t1s = getT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return std::nullopt;
+
+		return std::make_optional(t1s->burst_timer);
+	}
+
+	bool setT1SBurstTimerFor(Network net, uint8_t timer) override {
+		ETHERNET10T1S_SETTINGS* t1s = getMutableT1SSettingsFor(net);
+		if(t1s == nullptr)
+			return false;
+
+		t1s->burst_timer = timer;
+		return true;
+	}
+
+private:
+	const ETHERNET10T1S_SETTINGS* getT1SSettingsFor(Network net) const {
+		auto cfg = getStructurePointer<radmoont1s_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+
+		switch(net.getNetID()) {
+			case Network::NetID::AE_01:
+				return &(cfg->t1s);
+			default:
+				report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+				return nullptr;
+		}
+	}
+
+	ETHERNET10T1S_SETTINGS* getMutableT1SSettingsFor(Network net) {
+		auto cfg = getMutableStructurePointer<radmoont1s_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+
+		switch(net.getNetID()) {
+			case Network::NetID::AE_01:
+				return &(cfg->t1s);
+			default:
+				report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+				return nullptr;
+		}
+	}
+
+	const ETHERNET10T1S_SETTINGS_EXT* getT1SSettingsExtFor(Network net) const {
+		auto cfg = getStructurePointer<radmoont1s_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+
+		switch(net.getNetID()) {
+			case Network::NetID::AE_01:
+				return &(cfg->t1sExt);
+			default:
+				report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+				return nullptr;
+		}
+	}
+
+	ETHERNET10T1S_SETTINGS_EXT* getMutableT1SSettingsExtFor(Network net) {
+		auto cfg = getMutableStructurePointer<radmoont1s_settings_t>();
+		if(cfg == nullptr)
+			return nullptr;
+
+		switch(net.getNetID()) {
+			case Network::NetID::AE_01:
+				return &(cfg->t1sExt);
+			default:
+				report(APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error);
+				return nullptr;
+		}
+	}
 };
 
 }

include/icsneo/platform/servd.h

@@ -18,27 +18,24 @@ class Servd : public Driver {
 public:
 	static void Find(std::vector<FoundDevice>& foundDevices);
 	static bool Enabled();
-	Servd(const device_eventhandler_t& err, neodevice_t& forDevice, const std::unordered_set<std::string>& availableDrivers);
+	Servd(const device_eventhandler_t& err, neodevice_t& forDevice, const Address& address);
 	~Servd() override;
 	bool open() override;
 	bool isOpen() override;
 	bool close() override;
-	bool faa(const std::string& key, int32_t inc, int32_t& orig);
 	bool enableCommunication(bool enable, bool& sendMsg) override;
 	driver_finder_t getFinder() override { return Servd::Find; }
 
 private:
-	void alive();
-	void read(Address&& address);
-	void write(Address&& address);
+	void read();
+	void write();
 	neodevice_t& device;
-	std::thread aliveThread; // makes sure the client and server are healthy
 	std::thread writeThread;
 	std::thread readThread;
 	Socket messageSocket;
 	bool opened = false;
 	bool comEnabled = false;
-	std::string driver;
+	std::unique_ptr<Socket> dataSocket;
 };
 
 }

include/icsneo/platform/socket.h

@@ -73,11 +73,12 @@ public:
 	using SocketHandleType = int;
 	#endif
 	
-	Socket() {
+	template<class... Args>
+	Socket(Args&&... args) {
 		#ifdef _WIN32
 		static WSA wsa;
 		#endif
-		mFD = socket(AF_INET, SOCK_DGRAM, 0);
+		mFD = socket(std::forward<Args>(args)...);
 	}
 	
 	~Socket() {
@@ -102,6 +103,10 @@ public:
 		#endif
 	}
 
+	bool connect(const Address& to) {
+		return ::connect(mFD, (sockaddr*)&to.sockaddr(), sizeof(sockaddr_in)) != -1;
+	}
+	
 	bool bind(const Address& at) {
 		return ::bind(mFD, (sockaddr*)&at.sockaddr(), sizeof(sockaddr_in)) != -1;
 	}
@@ -141,6 +146,14 @@ public:
 		return true;
 	}
 	
+	bool send(const void* buffer, size_t size) {
+		auto sent = ::send(mFD, (const char*)buffer, (int)size, 0);
+		if(sent == -1) {
+			return false;
+		}
+		return (size_t)sent == size;
+	}
+	
 	bool recvfrom(void* buffer, size_t& size, Address& from) {
 		sockaddr_in addr;
 		socklen_t addLen = sizeof(addr);
@@ -163,8 +176,8 @@ public:
 	}
 
 	template<typename REQ, typename RES>
-	bool transceive(const Address& to, REQ&& request, RES&& response, const std::chrono::milliseconds& timeout) {
-		if(!sendto(request.data(), request.size(), to)) {
+	bool transceive(REQ&& request, RES&& response, const std::chrono::milliseconds& timeout) {
+		if(!send(request.data(), request.size())) {
 			return false;
 		}
 		bool hasData;

platform/servd.cpp

@@ -6,7 +6,7 @@
 
 using namespace icsneo;
 
-#define SERVD_VERSION 1
+#define SERVD_VERSION 2
 
 static const Address SERVD_ADDRESS = Address("127.0.0.1", 26741);
 static const std::string SERVD_VERSION_STR = std::to_string(SERVD_VERSION);
@@ -41,20 +41,17 @@ std::vector<std::string> split(const std::string_view& str, char delim = ' ') {
 }
 
 void Servd::Find(std::vector<FoundDevice>& found) {
-	Socket socket;
+	Socket socket(AF_INET, SOCK_DGRAM, 0);
+	socket.connect(SERVD_ADDRESS);
 	if(!socket.set_nonblocking()) {
 		EventManager::GetInstance().add(APIEvent::Type::ServdNonblockError, APIEvent::Severity::Error);
 		return;
 	}
-	if(!socket.bind(Address("127.0.0.1", 0))) {
-		EventManager::GetInstance().add(APIEvent::Type::ServdBindError, APIEvent::Severity::Error);
-		return;
-	}
 	std::string response;
 
 	response.resize(512);
 	const std::string version_request = SERVD_VERSION_STR + " version";
-	if(!socket.transceive(SERVD_ADDRESS, version_request, response, std::chrono::milliseconds(5000))) {
+	if(!socket.transceive(version_request, response, std::chrono::milliseconds(5000))) {
 		EventManager::GetInstance().add(APIEvent::Type::ServdTransceiveError, APIEvent::Severity::Error);
 		return;
 	}
@@ -66,46 +63,39 @@ void Servd::Find(std::vector<FoundDevice>& found) {
 
 	response.resize(512);
 	const std::string find_request = SERVD_VERSION_STR + " find";
-	if(!socket.transceive(SERVD_ADDRESS, find_request, response, std::chrono::milliseconds(5000))) {
+	if(!socket.transceive(find_request, response, std::chrono::milliseconds(5000))) {
 		EventManager::GetInstance().add(APIEvent::Type::ServdTransceiveError, APIEvent::Severity::Error);
 		return;
 	}
 	const auto lines = split(response, '\n');
 	for(auto&& line : lines) {
 		const auto cols = split(line, ' ');
-		if(cols.size() < 2) {
+		if(cols.size() < 3) {
 			EventManager::GetInstance().add(APIEvent::Type::ServdInvalidResponseError, APIEvent::Severity::Error);
 			continue;
 		}
 		const auto& serial = cols[0];
-		std::unordered_set<std::string> drivers;
-		for (size_t i = 1; i < cols.size(); ++i) {
-			drivers.emplace(cols[i]);
+		const auto& ip = cols[1];
+		uint16_t port = 0;
+		try {
+			port = static_cast<uint16_t>(std::stoi(cols[2]));
+		} catch (const std::exception&) {
+			EventManager::GetInstance().add(APIEvent::Type::ServdInvalidResponseError, APIEvent::Severity::Error);
+			continue;
 		}
+		Address address(ip.c_str(), port);
 		auto& newFound = found.emplace_back();
 		std::copy(serial.begin(), serial.end(), newFound.serial);
 		newFound.makeDriver = [=](device_eventhandler_t err, neodevice_t& forDevice) {
-			return std::make_unique<Servd>(err, forDevice, drivers);
+			return std::make_unique<Servd>(err, forDevice, address);
 		};
 	}
 }
 
-Servd::Servd(const device_eventhandler_t& err, neodevice_t& forDevice, const std::unordered_set<std::string>& availableDrivers) :
-	Driver(err), device(forDevice) {
+Servd::Servd(const device_eventhandler_t& err, neodevice_t& forDevice, const Address& address) :
+	Driver(err), device(forDevice), messageSocket(AF_INET, SOCK_DGRAM, 0) {
+	messageSocket.connect(address);
 	messageSocket.set_nonblocking();
-	messageSocket.bind(Address("127.0.0.1", 0));
-	if(availableDrivers.count("dxx")) {
-		driver = "dxx"; // prefer USB over Ethernet
-	} else if(availableDrivers.count("cab")) {
-		driver = "cab"; // prefer CAB over TCP
-	} else if(availableDrivers.count("tcp")) {
-		driver = "tcp";
-	} else if(availableDrivers.count("vcp")) {
-		driver = "vcp";
-	} else {
-		// just take the first driver
-		driver = *availableDrivers.begin();
-	}
 }
 
 Servd::~Servd() {
@@ -113,21 +103,31 @@ Servd::~Servd() {
 }
 
 bool Servd::open() {
-	const std::string request = SERVD_VERSION_STR + " open " + std::string(device.serial) + " " + driver;
+	const std::string request = SERVD_VERSION_STR + " open";
 	std::string response;
 	response.resize(512);
-	if(!messageSocket.transceive(SERVD_ADDRESS, request, response, std::chrono::milliseconds(5000))) {
+	if(!messageSocket.transceive(request, response, std::chrono::milliseconds(5000))) {
 		EventManager::GetInstance().add(APIEvent::Type::ServdTransceiveError, APIEvent::Severity::Error);
 		return false;
 	}
 	const auto tokens = split(response);
-	if(tokens.size() != 4) {
+	if(tokens.size() != 2) {
 		EventManager::GetInstance().add(APIEvent::Type::ServdInvalidResponseError, APIEvent::Severity::Error);
 		return false;
 	}
-	aliveThread = std::thread(&Servd::alive, this);
-	readThread = std::thread(&Servd::read, this, Address{tokens[2].c_str(), (uint16_t)std::stol(tokens[3].c_str())});
-	writeThread = std::thread(&Servd::write, this, Address{tokens[0].c_str(), (uint16_t)std::stol(tokens[1].c_str())});
+	dataSocket = std::make_unique<Socket>(AF_INET, SOCK_STREAM, 0);
+	const auto& ip = tokens[0];
+	uint16_t port = 0;
+	try {
+		port = static_cast<uint16_t>(std::stoi(tokens[1]));
+	} catch (const std::exception&) {
+		EventManager::GetInstance().add(APIEvent::Type::ServdInvalidResponseError, APIEvent::Severity::Error);
+		return false;
+	}
+	Address address(ip.c_str(), port);
+	dataSocket->connect(address);
+	readThread = std::thread(&Servd::read, this);
+	writeThread = std::thread(&Servd::write, this);
 	opened = true;
 	return true;
 }
@@ -138,9 +138,6 @@ bool Servd::isOpen() {
 
 bool Servd::close() {
 	setIsClosing(true);
-	if(aliveThread.joinable()) {
-		aliveThread.join();
-	}
 	if(readThread.joinable()) {
 		readThread.join();
 	}
@@ -148,8 +145,16 @@ bool Servd::close() {
 		writeThread.join();
 	}
 	if(isOpen()) {
-		const std::string request = SERVD_VERSION_STR + " close " + std::string(device.serial);
-		messageSocket.sendto(request.data(), request.size(), SERVD_ADDRESS);
+		Address localAddress;
+		dataSocket->address(localAddress);
+		const std::string request = SERVD_VERSION_STR + " close " + localAddress.ip() + " " + std::to_string(localAddress.port());
+		std::string response;
+		response.resize(1);
+		if(!messageSocket.transceive(request, response, std::chrono::milliseconds(5000))) {
+			EventManager::GetInstance().add(APIEvent::Type::ServdTransceiveError, APIEvent::Severity::Error);
+			return false;
+		}
+		dataSocket.reset();
 	}
 	opened = false;
 	setIsClosing(false);
@@ -159,13 +164,13 @@ bool Servd::close() {
 bool Servd::enableCommunication(bool enable, bool& sendMsg) {
 	const std::string serialString(device.serial);
 	{
-		const std::string request = SERVD_VERSION_STR + " lock " + serialString + " com 1000";
+		const std::string request = SERVD_VERSION_STR + " lock com 1000";
 		std::string response;
 		response.resize(1);
 		bool locked = false;
 		const auto timeout = std::chrono::steady_clock::now() + std::chrono::seconds(1);
 		do {
-			if(!messageSocket.transceive(SERVD_ADDRESS, request, response, std::chrono::milliseconds(5000))) {
+			if(!messageSocket.transceive(request, response, std::chrono::milliseconds(5000))) {
 				return false;
 			}
 			locked = response == "1" ? true : false;
@@ -181,10 +186,10 @@ bool Servd::enableCommunication(bool enable, bool& sendMsg) {
 	}
 	uint64_t com = 0;
 	{
-		const std::string request = SERVD_VERSION_STR + " load " + serialString + " com";
+		const std::string request = SERVD_VERSION_STR + " load com";
 		std::string response;
 		response.resize(20);
-		if(!messageSocket.transceive(SERVD_ADDRESS, request, response, std::chrono::milliseconds(5000))) {
+		if(!messageSocket.transceive(request, response, std::chrono::milliseconds(5000))) {
 			EventManager::GetInstance().add(APIEvent::Type::ServdTransceiveError, APIEvent::Severity::Error);
 			return false;
 		}
@@ -202,16 +207,20 @@ bool Servd::enableCommunication(bool enable, bool& sendMsg) {
 	}
 	if(comEnabled != enable) {
 		com += enable ? 1 : -1;
-		const std::string request = SERVD_VERSION_STR + " store " + serialString  + " com " + std::to_string(com);
-		if(!messageSocket.sendto(request.data(), request.size(), SERVD_ADDRESS)) {
+		const std::string request = SERVD_VERSION_STR + " store com " + std::to_string(com);
+		std::string response;
+		response.resize(1);
+		if(!messageSocket.transceive(request, response, std::chrono::milliseconds(5000))) {
 			EventManager::GetInstance().add(APIEvent::Type::ServdSendError, APIEvent::Severity::Error);
 			return false;
 		}
 	}
 	comEnabled = enable;
 	{
-		const std::string request = SERVD_VERSION_STR + " unlock " + serialString + " com";
-		if(!messageSocket.sendto(request.data(), request.size(), SERVD_ADDRESS)) {
+		const std::string request = SERVD_VERSION_STR + " unlock com";
+		std::string response;
+		response.resize(1);
+		if(!messageSocket.transceive(request, response, std::chrono::milliseconds(5000))) {
 			EventManager::GetInstance().add(APIEvent::Type::ServdSendError, APIEvent::Severity::Error);
 			return false;
 		}
@@ -219,78 +228,11 @@ bool Servd::enableCommunication(bool enable, bool& sendMsg) {
 	return true;
 }
 
-void Servd::alive() {
-	Socket socket;
-	socket.set_nonblocking();
-	socket.bind(Address("127.0.0.1", 0));
-	const std::string statusRequest = SERVD_VERSION_STR + " status " + std::string(device.serial);
-	std::string statusResponse;
-	statusResponse.resize(8);
-	while(!isDisconnected() && !isClosing()) {
-		if(!socket.sendto(statusRequest.data(), statusRequest.size(), {"127.0.0.1", 26741})) {
-			EventManager::GetInstance().add(APIEvent::Type::ServdSendError, APIEvent::Severity::Error);
-			setIsDisconnected(true);
-			return;
-		}
-		bool hasData;
-		if(!socket.poll(std::chrono::milliseconds(2000), hasData)) {
-			EventManager::GetInstance().add(APIEvent::Type::ServdPollError, APIEvent::Severity::Error);
-			setIsDisconnected(true);
-			return;
-		}
-		if(!hasData) {
-			EventManager::GetInstance().add(APIEvent::Type::ServdNoDataError, APIEvent::Severity::Error);
-			setIsDisconnected(true);
-			return;
-		}
-		size_t statusResponseSize = statusResponse.size();
-		if(!socket.recv(statusResponse.data(), statusResponseSize)) {
-			EventManager::GetInstance().add(APIEvent::Type::ServdRecvError, APIEvent::Severity::Error);
-			setIsDisconnected(true);
-			return;
-		}
-		statusResponse.resize(statusResponseSize);
-		if(statusRequest == "closed") {
-			EventManager::GetInstance().add(APIEvent::Type::DeviceDisconnected, APIEvent::Severity::Error);
-			setIsDisconnected(true);
-			return;
-		}
-		if(statusResponse != "open") {
-			EventManager::GetInstance().add(APIEvent::Type::ServdInvalidResponseError, APIEvent::Severity::Error);
-			setIsDisconnected(true);
-			return;
-		}
-		std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-	}
-}
-
-void Servd::read(Address&& address) {
-	Socket socket;
-	socket.set_nonblocking();
-	socket.set_reuse(true);
-	#ifdef _WIN32
-	if(!socket.bind(Address("127.0.0.1", address.port()))) {
-		EventManager::GetInstance().add(APIEvent::Type::ServdBindError, APIEvent::Severity::Error);
-		setIsDisconnected(true);
-		return;
-	}
-	#else
-	if(!socket.bind(Address(address.ip().c_str(), address.port()))) {
-		EventManager::GetInstance().add(APIEvent::Type::ServdBindError, APIEvent::Severity::Error);
-		setIsDisconnected(true);
-		return;
-	}
-	#endif
-	if(!socket.join_multicast("127.0.0.1", address.ip())) {
-		EventManager::GetInstance().add(APIEvent::Type::ServdJoinMulticastError, APIEvent::Severity::Error);
-		setIsDisconnected(true);
-		return;
-	}
-
-	std::vector<uint8_t> buf(65535);
+void Servd::read() {
+	std::vector<uint8_t> buf(2 * 1024 * 1024);
 	while(!isDisconnected() && !isClosing()) {
 		bool hasData;
-		if(!socket.poll(std::chrono::milliseconds(100), hasData)) {
+		if(!dataSocket->poll(std::chrono::milliseconds(100), hasData)) {
 			EventManager::GetInstance().add(APIEvent::Type::ServdPollError, APIEvent::Severity::Error);
 			setIsDisconnected(true);
 			return;
@@ -299,7 +241,7 @@ void Servd::read(Address&& address) {
 			continue;
 		}
 		size_t bufSize = buf.size();
-		if(!socket.recv(buf.data(), bufSize)) {
+		if(!dataSocket->recv(buf.data(), bufSize)) {
 			EventManager::GetInstance().add(APIEvent::Type::ServdRecvError, APIEvent::Severity::Error);
 			setIsDisconnected(true);
 			return;
@@ -308,16 +250,14 @@ void Servd::read(Address&& address) {
 	}
 }
 
-void Servd::write(Address&& address) {
-	Socket socket;
-	socket.bind(Address("127.0.0.1", 0));
+void Servd::write() {
 	WriteOperation writeOp;
 	while(!isDisconnected() && !isClosing()) {
 		if(!writeQueue.wait_dequeue_timed(writeOp, std::chrono::milliseconds(100))) {
 			continue;
 		}
 		if(!isClosing()) {
-			if(!socket.sendto(writeOp.bytes.data(), writeOp.bytes.size(), address)) {
+			if(!dataSocket->send(writeOp.bytes.data(), writeOp.bytes.size())) {
 				EventManager::GetInstance().add(APIEvent::Type::ServdSendError, APIEvent::Severity::Error);
 				setIsDisconnected(true);
 				return;