Added SLL pseudo protocol header.

include/constants.h

@@ -73,6 +73,7 @@ namespace Tins {
         
         struct Ethernet {
             enum e {
+                UNKNOWN = 0,
                 //~ PUP = 0x0200,     /* Xerox PUP */
                 SPRITE = 0x0500,  /* Sprite */
                 IP = 0x0800,      /* IP */

include/internals.h

@@ -33,6 +33,8 @@
 #include <sstream>
 #include <string>
 #include <stdint.h>
+#include "constants.h"
+#include "pdu.h"
 
 /**
  * \cond
@@ -52,15 +54,10 @@ namespace Internals {
         typedef T type;
     };
     
-    template<typename T1, typename T2>
-    struct is_same {
-        static const bool value = false;
-    };
+    PDU *pdu_from_flag(Constants::Ethernet::e flag, const uint8_t *buffer, 
+      uint32_t size, bool rawpdu_on_no_match = true);
     
-    template<typename T1>
-    struct is_same<T1, T1> {
-        static const bool value = true;
-    };
+    Constants::Ethernet::e pdu_flag_to_ether_type(PDU::PDUType flag);
 }
 }
 /**

include/ip.h

@@ -231,8 +231,9 @@ namespace Tins {
             PDU *child = 0);
 
         /**
-         * \brief Constructor which creates an IP object from a buffer and adds all identifiable
-         * PDUs found in the buffer as children of this one.
+         * \brief Constructor which constructs an IP object from a buffer 
+         * and adds all identifiable PDUs found in the buffer as children 
+         * of this one.
          * \param buffer The buffer from which this PDU will be constructed.
          * \param total_sz The total size of the buffer.
          */

include/packet_writer.h

@@ -53,7 +53,8 @@ public:
     enum LinkType {
         RADIOTAP = DLT_IEEE802_11_RADIO,
         DOT11 = DLT_IEEE802_11,
-        ETH2 = DLT_EN10MB
+        ETH2 = DLT_EN10MB,
+        SLL = DLT_LINUX_SLL
     };
     
     /**

include/pdu.h

@@ -103,7 +103,8 @@ namespace Tins {
             DNS,
             LOOPBACK,
             IPv6,
-            ICMPv6
+            ICMPv6,
+            SLL
         };
 
         /** \brief PDU constructor

include/sll.h

@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2012, Nasel
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following disclaimer
+ *   in the documentation and/or other materials provided with the
+ *   distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef TINS_SLL_H
+#define TINS_SLL_H
+
+#include <vector>
+#include "pdu.h"
+#include "endianness.h"
+#include "hw_address.h"
+
+namespace Tins {
+class SLL : public PDU {
+public:
+    /**
+     * This PDU's flag.
+     */
+    static const PDU::PDUType pdu_flag = PDU::SLL;
+
+    /**
+     *  The type of the address type
+     */
+    typedef HWAddress<8> address_type;
+    
+    /**
+     * Default constructor
+     */
+    SLL();
+    
+    /**
+     * \brief Constructor which constructs an SLL object from a buffer 
+     * and adds all identifiable PDUs found in the buffer as children 
+     * of this one.
+     * \param buffer The buffer from which this PDU will be constructed.
+     * \param total_sz The total size of the buffer.
+     */
+    SLL(const uint8_t *buffer, uint32_t total_sz);
+    
+    // Getters
+
+    /**
+     *  \brief Getter for the packet_type field.
+     *  \return The stored packet_type field value.
+     */
+    uint16_t packet_type() const {
+        return Endian::be_to_host(_header.packet_type);
+    }
+
+    /**
+     *  \brief Getter for the lladdr_type field.
+     *  \return The stored lladdr_type field value.
+     */
+    uint16_t lladdr_type() const {
+        return Endian::be_to_host(_header.lladdr_type);
+    }
+
+    /**
+     *  \brief Getter for the lladdr_len field.
+     *  \return The stored lladdr_len field value.
+     */
+    uint16_t lladdr_len() const {
+        return Endian::be_to_host(_header.lladdr_len);
+    }
+
+    /**
+     *  \brief Getter for the address field.
+     *  \return The stored address field value.
+     */
+    address_type address() const {
+        return _header.address;
+    }
+
+    /**
+     *  \brief Getter for the protocol field.
+     *  \return The stored protocol field value.
+     */
+    uint16_t protocol() const {
+        return Endian::be_to_host(_header.protocol);
+    }
+    
+    /**
+     * \brief Getter for the PDU's type.
+     * \sa PDU::pdu_type
+     */
+    PDUType pdu_type() const { return pdu_flag; }
+    
+    // Setters
+
+    /**
+     *  \brief Setter for the packet_type field.
+     *  \param new_packet_type The new packet_type field value.
+     */
+    void packet_type(uint16_t new_packet_type);
+
+    /**
+     *  \brief Setter for the lladdr_type field.
+     *  \param new_lladdr_type The new lladdr_type field value.
+     */
+    void lladdr_type(uint16_t new_lladdr_type);
+
+    /**
+     *  \brief Setter for the lladdr_len field.
+     *  \param new_lladdr_len The new lladdr_len field value.
+     */
+    void lladdr_len(uint16_t new_lladdr_len);
+
+    /**
+     *  \brief Setter for the address field.
+     *  \param new_address The new address field value.
+     */
+    void address(const address_type &new_address);
+
+    /**
+     *  \brief Setter for the protocol field.
+     *  \param new_protocol The new protocol field value.
+     */
+    void protocol(uint16_t new_protocol);
+    
+    /**
+     * \brief Returns the header size.
+     *
+     * This metod overrides PDU::header_size. \sa PDU::header_size
+     */
+    uint32_t header_size() const;
+    
+    /**
+     * \sa PDU::clone
+     */
+    SLL *clone() const {
+        return new SLL(*this);
+    }
+private:
+    TINS_BEGIN_PACK
+    struct sllhdr {
+        uint16_t packet_type, lladdr_type, lladdr_len;
+        uint8_t address[8];
+        uint16_t protocol;
+    } TINS_END_PACK;
+    
+    void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *);
+    
+    sllhdr _header;
+};
+}
+
+#endif // TINS_SLL_H

include/sniffer.h

@@ -42,6 +42,7 @@
 #include "packet.h"
 #include "loopback.h"
 #include "dot11.h"
+#include "sll.h"
 #include "cxxstd.h"
 
 namespace Tins {
@@ -268,6 +269,8 @@ namespace Tins {
             }
             else if(data->iface_type == DLT_NULL) 
                 ret_val = call_functor<Tins::Loopback>(data, packet, header);
+            else if(data->iface_type == DLT_LINUX_SLL)
+                ret_val = call_functor<Tins::SLL>(data, packet, header);
                 
             if(!ret_val)
                 pcap_breakloop(data->handle);

include/tins.h

@@ -30,6 +30,7 @@
 #ifndef TINS_TINS_H
 #define TINS_TINS_H
 
+#include "dns.h"
 #include "arp.h"
 #include "bootp.h"
 #include "dhcp.h"
@@ -52,7 +53,6 @@
 #include "tcp.h"
 #include "udp.h"
 #include "utils.h"
-#include "dns.h"
 #include "tcp_stream.h"
 #include "crypto.h"
 #include "pdu_cacher.h"
@@ -61,5 +61,6 @@
 #include "ip_address.h"
 #include "packet.h"
 #include "timestamp.h"
+#include "sll.h"
 
 #endif // TINS_TINS_H