IP now fills automatically the sender address when no link layer PDU is present. Made some protocols work when using PacketSender::send_recv.

include/bootp.h

@@ -293,6 +293,17 @@ namespace Tins {
          */
         void vend(const vend_type &new_vend);
 
+        /**
+         * \brief Check wether ptr points to a valid response for this PDU.
+         *
+         * This returns true, if the xid field is equal.
+         * 
+         * \sa PDU::matches_response
+         * \param ptr The pointer to the buffer.
+         * \param total_sz The size of the buffer.
+         */
+        bool matches_response(uint8_t *ptr, uint32_t total_sz);
+
         /**
          * \brief Getter for the PDU's type.
          * \sa PDU::pdu_type

include/ip.h

@@ -634,6 +634,7 @@ namespace Tins {
             /*The options start here. */
         } TINS_END_PACK;
 
+        void prepare_for_serialize(const PDU *parent);
         void internal_add_option(const ip_option &option);
         void init_ip_fields();
         void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);

include/packet_sender.h

@@ -63,7 +63,9 @@ namespace Tins {
          */
         enum SocketType {
             ETHER_SOCKET,
-            IP_SOCKET,
+            IP_TCP_SOCKET,
+            IP_UDP_SOCKET,
+            IP_RAW_SOCKET,
             ARP_SOCKET,
             ICMP_SOCKET,
             IPV6_SOCKET,

include/pdu.h

@@ -297,6 +297,20 @@ namespace Tins {
          */
         void copy_inner_pdu(const PDU &pdu);
 
+        /**
+         * \brief Prepares this PDU for serialization.
+         * 
+         * This method is called before the inner PDUs are serialized.
+         * It's useful in situations such as when serializing IP PDUs,
+         * which don't contain any link layer encapsulation, and therefore
+         * require to set the source IP address before the TCP/UDP checksum
+         * is calculated.
+         * 
+         * By default, this method does nothing
+         * 
+         * \param parent The parent PDU.
+         */
+        virtual void prepare_for_serialize(const PDU *parent) { }
 
         /** 
          * \brief Serializes this PDU and propagates this action to child PDUs.
@@ -307,16 +321,6 @@ namespace Tins {
          */
         void serialize(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
 
-        /** 
-         * \brief Clones the inner pdu(if any).
-         *
-         * This method clones the inner pdu using data from a buffer.
-         * \param ptr The pointer from which the child PDU must be cloned.
-         * \param total_sz The total size of the buffer.
-         * \return Returns the cloned PDU. Will be 0 if cloning failed.
-         */
-        PDU *clone_inner_pdu(const uint8_t *ptr, uint32_t total_sz);
-
         /** 
          * \brief Serializes this TCP PDU.
          *

include/rawpdu.h

@@ -116,6 +116,18 @@ namespace Tins {
             return _payload.size();
         }
 
+        /**
+         * \brief Check wether ptr points to a valid response for this PDU.
+         *
+         * This always returns true, since we don't know what this 
+         * RawPDU is holding.
+         * 
+         * \sa PDU::matches_response
+         * \param ptr The pointer to the buffer.
+         * \param total_sz The size of the buffer.
+         */
+        bool matches_response(uint8_t *ptr, uint32_t total_sz);
+
         /**
          * \brief Getter for the PDU's type.
          * \sa PDU::pdu_type

include/tcp.h

@@ -392,6 +392,15 @@ namespace Tins {
          * \sa PDU::header_size
          */
         uint32_t header_size() const;
+        
+        /**
+         * \brief Check wether ptr points to a valid response for this PDU.
+         *
+         * \sa PDU::matches_response
+         * \param ptr The pointer to the buffer.
+         * \param total_sz The size of the buffer.
+         */
+        bool matches_response(uint8_t *ptr, uint32_t total_sz);
 
         /**
          * \brief Getter for the PDU's type.

include/udp.h

@@ -103,6 +103,18 @@ namespace Tins {
          */
         void length(uint16_t new_len);
 
+        /**
+         * \brief Check wether ptr points to a valid response for this PDU.
+         *
+         * This compares the source and destination ports in the provided
+         * response with those stored in this PDU.
+         * 
+         * \sa PDU::matches_response
+         * \param ptr The pointer to the buffer.
+         * \param total_sz The size of the buffer.
+         */
+        bool matches_response(uint8_t *ptr, uint32_t total_sz);
+
         /** \brief Returns the header size.
          *
          * This metod overrides PDU::header_size. This size includes the
@@ -131,7 +143,6 @@ namespace Tins {
             uint16_t check;
         } TINS_END_PACK;
 
-        void copy_fields(const UDP *other);
         void write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *parent);
 
         udphdr _udp;