Fixed compilation issues triggered in GNU/kFreeBSD.

2026-01-25 19:51:34 +01:00 · 2013-04-22 23:48:53 -03:00
parent 9be4f0ca37
commit fdfb8b0dea
10 changed files with 31 additions and 29 deletions
--- a/include/packet_sender.h
+++ b/include/packet_sender.h
@@ -278,7 +278,7 @@ namespace Tins {

        std::vector<int> _sockets;
        #ifndef WIN32
-            #ifdef BSD
+            #if defined(BSD) || defined(__FreeBSD_kernel__)
            typedef std::map<uint32_t, int> BSDEtherSockets;
            BSDEtherSockets _ether_socket;
            #else
--- a/include/utils.h
+++ b/include/utils.h
@@ -39,7 +39,7 @@
    #undef interface
 #endif
 #include "macros.h"
-#ifdef BSD
+#if defined(BSD) || defined(__FreeBSD_kernel__)
    #include <sys/file.h>
    #include <sys/socket.h>
    #include <sys/sysctl.h>
@@ -280,7 +280,7 @@ namespace Tins {
        dereference_until_pdu(T &value) {
            return dereference_until_pdu(*value);
        }
-        #ifdef BSD
+        #if defined(BSD) || defined(__FreeBSD_kernel__)
        inline std::vector<char> query_route_table() {
            int mib[6];
            std::vector<char> buf;
@@ -322,7 +322,7 @@ namespace Tins {
        #endif
    }
 }
-#ifdef BSD
+#if defined(BSD) || defined(__FreeBSD_kernel__)
 template<class ForwardIterator>
 void Tins::Utils::route_entries(ForwardIterator output) {
    std::vector<char> buffer = query_route_table();
--- a/src/dot11.cpp
+++ b/src/dot11.cpp
@@ -36,7 +36,7 @@
 #include "exceptions.h"

 #ifndef WIN32
-    #if defined(BSD) || defined(__APPLE__)
+    #if defined(__FreeBSD_kernel__) || defined(BSD) || defined(__APPLE__)
        #include <sys/types.h>
        #include <net/if_dl.h>
    #else
@@ -185,7 +185,7 @@ void Dot11::send(PacketSender &sender, const NetworkInterface &iface) {
    if(!iface)
        throw invalid_interface();
    
-    #ifndef BSD
+    #if !defined(BSD) && !defined(__FreeBSD_kernel__)
        sockaddr_ll addr;

        memset(&addr, 0, sizeof(struct sockaddr_ll));
--- a/src/dot3.cpp
+++ b/src/dot3.cpp
@@ -35,7 +35,7 @@
 #include <algorithm>
 #include "macros.h"
 #ifndef WIN32
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
        #include <net/if_dl.h>
    #else
        #include <netpacket/packet.h>
@@ -94,7 +94,7 @@ void Dot3::send(PacketSender &sender, const NetworkInterface &iface) {
    if(!iface)
        throw invalid_interface();
        
-    #ifndef BSD
+    #if !defined(BSD) && !defined(__FreeBSD_kernel__)
        struct sockaddr_ll addr;

        memset(&addr, 0, sizeof(struct sockaddr_ll));
@@ -147,7 +147,7 @@ void Dot3::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *pa
 PDU *Dot3::recv_response(PacketSender &sender, const NetworkInterface &iface) {
    if(!iface)
        throw invalid_interface();
-    #ifndef BSD
+    #if !defined(BSD) && !defined(__FreeBSD_kernel__)
        struct sockaddr_ll addr;
        memset(&addr, 0, sizeof(struct sockaddr_ll));

--- a/src/ethernetII.cpp
+++ b/src/ethernetII.cpp
@@ -35,7 +35,7 @@
 #include <algorithm>
 #include "macros.h"
 #ifndef WIN32
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
        #include <net/if_dl.h>
    #else
        #include <netpacket/packet.h>
@@ -106,7 +106,7 @@ void EthernetII::send(PacketSender &sender, const NetworkInterface &iface) {
    if(!iface)
        throw invalid_interface();
    
-    #ifndef BSD
+    #if !defined(BSD) && !defined(__FreeBSD_kernel__)
        struct sockaddr_ll addr;

        memset(&addr, 0, sizeof(struct sockaddr_ll));
@@ -156,7 +156,7 @@ void EthernetII::write_serialization(uint8_t *buffer, uint32_t total_sz, const P

 #ifndef WIN32
 PDU *EthernetII::recv_response(PacketSender &sender, const NetworkInterface &iface) {
-    #ifndef BSD
+    #if !defined(BSD) && !defined(__FreeBSD_kernel__)
        struct sockaddr_ll addr;
        memset(&addr, 0, sizeof(struct sockaddr_ll));

--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -409,7 +409,7 @@ void IP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU* pare
        //flag(new_flag);
    }
    
-    #ifdef __FreeBSD__
+    #if __FreeBSD__ || defined(__FreeBSD_kernel__)
        if(!parent)
            total_sz = Endian::host_to_be<uint16_t>(total_sz);
    #endif
--- a/src/network_interface.cpp
+++ b/src/network_interface.cpp
@@ -33,7 +33,7 @@
 #include "macros.h"
 #ifndef WIN32
    #include <netinet/in.h>
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
        #include <ifaddrs.h>
        #include <net/if_dl.h>
        #include <sys/socket.h>
@@ -64,7 +64,7 @@ struct InterfaceInfoCollector {
    bool operator() (const struct ifaddrs *addr) {
        using Tins::Endian::host_to_be;
            using Tins::IPv4Address;
-        #ifdef BSD
+        #if defined(BSD) || defined(__FreeBSD_kernel__)
            const struct sockaddr_dl* addr_ptr = ((struct sockaddr_dl*)addr->ifa_addr);
            
            if(addr->ifa_addr->sa_family == AF_LINK && addr_ptr->sdl_index == iface_id)
@@ -138,7 +138,7 @@ NetworkInterface::NetworkInterface(IPv4Address ip) : iface_id(0) {
    typedef std::vector<Utils::RouteEntry> entries_type;
    
    if(ip == "127.0.0.1")
-        #ifdef BSD
+        #if defined(BSD) || defined(__FreeBSD_kernel__)
        iface_id = resolve_index("lo0");
        #else
        iface_id = resolve_index("lo");
--- a/src/packet_sender.cpp
+++ b/src/packet_sender.cpp
@@ -34,7 +34,7 @@
    #include <sys/time.h>
    #include <arpa/inet.h>
    #include <unistd.h>
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
        #include <sys/ioctl.h>
        #include <sys/types.h>
        #include <sys/stat.h>
@@ -85,7 +85,7 @@ const uint32_t PacketSender::DEFAULT_TIMEOUT = 2;
 PacketSender::PacketSender(const NetworkInterface &iface, uint32_t recv_timeout, 
  uint32_t usec) 
 : _sockets(SOCKETS_END, INVALID_RAW_SOCKET), 
-#if !defined(BSD) && !defined(WIN32)
+#if !defined(BSD) && !defined(WIN32) && !defined(__FreeBSD_kernel__)
  _ether_socket(INVALID_RAW_SOCKET),
 #endif
  _timeout(recv_timeout), _timeout_usec(usec), default_iface(iface)
@@ -106,7 +106,7 @@ PacketSender::~PacketSender() {
            ::closesocket(_sockets[i]);
        #endif
    }
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
    for(BSDEtherSockets::iterator it = _ether_socket.begin(); it != _ether_socket.end(); ++it)
        ::close(it->second);
    #elif !defined(WIN32)
@@ -125,7 +125,7 @@ const NetworkInterface& PacketSender::default_interface() {

 #ifndef WIN32
 bool PacketSender::ether_socket_initialized(const NetworkInterface& iface) const {
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
    return _ether_socket.count(iface.id());
    #else
    return _ether_socket != INVALID_RAW_SOCKET;
@@ -135,7 +135,7 @@ bool PacketSender::ether_socket_initialized(const NetworkInterface& iface) const
 int PacketSender::get_ether_socket(const NetworkInterface& iface) {
    if(!ether_socket_initialized(iface))
        open_l2_socket(iface);
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
    return _ether_socket[iface.id()];
    #else
    return _ether_socket;
@@ -143,7 +143,7 @@ int PacketSender::get_ether_socket(const NetworkInterface& iface) {
 }

 void PacketSender::open_l2_socket(const NetworkInterface& iface) {
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
        int sock = -1;
        // At some point, there should be an available device
        for (int i = 0; sock == -1;i++) {
@@ -197,7 +197,7 @@ void PacketSender::open_l3_socket(SocketType type) {

 void PacketSender::close_socket(SocketType type, const NetworkInterface &iface) {
    if(type == ETHER_SOCKET) {
-        #ifdef BSD
+        #if defined(BSD) || defined(__FreeBSD_kernel__)
        BSDEtherSockets::iterator it = _ether_socket.find(iface.id());
        if(it == _ether_socket.end())
            throw InvalidSocketTypeError();
@@ -265,11 +265,12 @@ PDU *PacketSender::send_recv(PDU &pdu, const NetworkInterface &iface) {

 #ifndef WIN32
 void PacketSender::send_l2(PDU &pdu, struct sockaddr* link_addr, 
-  uint32_t len_addr, const NetworkInterface &iface) {
+  uint32_t len_addr, const NetworkInterface &iface) 
+{
    int sock = get_ether_socket(iface);
    PDU::serialization_type buffer = pdu.serialize();
    if(!buffer.empty()) {
-        #ifdef BSD
+        #if defined(BSD) || defined(__FreeBSD_kernel__)
        if(::write(sock, &buffer[0], buffer.size()) == -1)
        #else
        if(::sendto(sock, &buffer[0], buffer.size(), 0, link_addr, len_addr) == -1)
@@ -279,7 +280,8 @@ void PacketSender::send_l2(PDU &pdu, struct sockaddr* link_addr,
 }

 PDU *PacketSender::recv_l2(PDU &pdu, struct sockaddr *link_addr, 
-  uint32_t len_addr, const NetworkInterface &iface) {
+  uint32_t len_addr, const NetworkInterface &iface) 
+{
    int sock = get_ether_socket(iface);
    return recv_match_loop(sock, pdu, link_addr, len_addr);
 }
--- a/src/radiotap.cpp
+++ b/src/radiotap.cpp
@@ -34,7 +34,7 @@
 #include <stdexcept>
 #include "macros.h"
 #ifndef WIN32
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
        #include <net/if_dl.h>
    #else
        #include <netpacket/packet.h>
@@ -242,7 +242,7 @@ void RadioTap::send(PacketSender &sender, const NetworkInterface &iface) {
    if(!iface)
        throw invalid_interface();
    
-    #ifndef BSD
+    #if !defined(BSD) && !defined(__FreeBSD_kernel__)
        struct sockaddr_ll addr;

        memset(&addr, 0, sizeof(struct sockaddr_ll));
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -34,7 +34,7 @@
 #include <cstring>
 #include "utils.h"
 #ifndef WIN32
-    #ifdef BSD
+    #if defined(BSD) || defined(__FreeBSD_kernel__)
        #include <sys/socket.h>
        #include <netinet/in.h>
        #include <net/if_dl.h>