Merge remote-tracking branch 'origin/master'

Author: Moi78

netutils/platforms/lls_linux.cpp

@@ -6,14 +6,12 @@
 #include "lls_linux.h"
 #include "common/NetworkMapper.h"
 
-#ifdef __linux__
+#if defined(__linux__) && !defined(BUILD_XDP_BACKEND)
 
 std::optional<uint64_t> LowLatSocket::get_mac(uint16_t id) {
     return m_mapper->get_mac_by_uid(id);
 }
 
-#ifdef __linux__
-
 LowLatSocket::LowLatSocket(uint16_t self_uid, std::shared_ptr<NetworkMapper> mapper) {
     m_socket = 0;
     m_iface_addr = {};
@@ -78,46 +76,6 @@ IfaceMeta get_iface_meta(const std::string &name) {
     return meta;
 }
 
-#else
-// Embeddable interface that must be private
-extern "C" IfaceMeta _fetch_iface_meta(std::string& name);
-
-IfaceMeta get_iface_meta(std::string& name) {
-    return _fetch_iface_meta(name);
-}
-
-LowLatSocket::LowLatSocket(uint16_t self_uid, std::shared_ptr<NetworkMapper> mapper) {
-    m_socket = 0;
-    m_self_uid = self_uid;
-    m_mapper = std::move(mapper);
-}
-
-LowLatSocket::~LowLatSocket() {
-
-}
-
-bool LowLatSocket::init_socket(std::string interface, EthProtocol proto) {
-    IfaceMeta meta = get_iface_meta(interface);
-    memcpy(m_iface_addr, meta.mac, 6);
-
-    memset(m_hdr.h_dest, 0xFF, 6);
-    memcpy(m_hdr.h_source, meta.mac, 6);
-    m_hdr.h_proto = htons(proto);
-    m_self_proto = proto;
-
-    return true;
-}
-
-int LowLatSocket::send_data_internal(uint8_t *data, size_t size) {
-    return _send_data(data, size);
-}
-
-int LowLatSocket::recv_data_internal(uint8_t *data, size_t size) const {
-    return _recv_data(data, size, m_self_proto);
-}
-
-#endif // __linux__
-
 bool LowLatSocket::format_packet_header(uint8_t *packet_buffer, uint16_t dest_uid, size_t packet_size) {
     INT_LLP<1>* llpck = reinterpret_cast<INT_LLP<1> *>(packet_buffer);
     llpck->eth_header = m_hdr;

netutils/platforms/lls_linux.h

@@ -6,7 +6,7 @@
 #ifndef LLSLINUX_H
 #define LLSLINUX_H
 
-#ifdef __linux__
+#if defined(__linux__) && !defined(BUILD_XDP_BACKEND)
 
 #include <string>
 #include <cstring>