Windows: PCAP: Rework for Ethernet Packetizer and Performance

include/icsneo/platform/windows/pcap.h

@@ -7,6 +7,7 @@
 #include "icsneo/device/neodevice.h"
 #include "icsneo/communication/driver.h"
 #include "icsneo/api/eventmanager.h"
+#include "icsneo/communication/ethernetpacketizer.h"
 #include <string>
 
 namespace icsneo {
@@ -33,8 +34,16 @@ private:
 	neodevice_t& device;
 	uint8_t deviceMAC[6];
 	bool openable = true;
+	EthernetPacketizer ethPacketizer;
+	
+	std::thread transmitThread;
+	pcap_send_queue* transmitQueue = nullptr;
+	std::condition_variable transmitQueueCV;
+	std::mutex transmitQueueMutex;
+	
 	void readTask();
 	void writeTask();
+	void transmitTask();
 
 	class NetworkInterface {
 	public:
@@ -51,27 +60,6 @@ private:
 	};
 	static std::vector<NetworkInterface> knownInterfaces;
 	NetworkInterface interface;
-
-	class EthernetPacket {
-	public: // Don't worry about endian when setting fields, this is all taken care of in getBytestream
-		EthernetPacket() {};
-		EthernetPacket(const std::vector<uint8_t>& bytestream);
-		EthernetPacket(const uint8_t* data, size_t size);
-		int loadBytestream(const std::vector<uint8_t>& bytestream);
-		std::vector<uint8_t> getBytestream() const;
-		uint8_t errorWhileDecodingFromBytestream = 0; // Not part of final bytestream, only for checking the result of the constructor
-		uint8_t destMAC[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-		uint8_t srcMAC[6] = { 0x00, 0xFC, 0x70, 0xFF, 0xFF, 0xFF };
-		uint16_t etherType = 0xCAB1; // Big endian, Should be 0xCAB1 or 0xCAB2
-		uint32_t icsEthernetHeader = 0xAAAA5555; // Big endian, Should be 0xAAAA5555
-		// At this point in the packet, there is a 16-bit payload size, little endian
-		// This is calculated from payload size in getBytestream
-		uint16_t packetNumber = 0;
-		bool firstPiece = true; // These booleans make up a 16-bit bitfield, packetInfo
-		bool lastPiece = true;
-		bool bufferHalfFull = false;
-		std::vector<uint8_t> payload;
-	};
 };
 
 }