Extended constructor for packet_t added (takes src, dst and data)

diff --git a/src/libstrongswan/utils/packet.c b/src/libstrongswan/utils/packet.c
index b5716fc4bc63c7cc34f81c422b9a16dbaef59bfc..a2c329d604be005a8b8e45bd8be9e952f1d43a11 100644 (file)
--- a/src/libstrongswan/utils/packet.c
+++ b/src/libstrongswan/utils/packet.c
@@ -126,10 +126,10 @@ METHOD(packet_t, clone_, packet_t*,
        return other;
 }
 
-/*
- * Documented in header
+/**
+ * Described in header.
  */
-packet_t *packet_create()
+packet_t *packet_create_from_data(host_t *src, host_t *dst, chunk_t data)
 {
        private_packet_t *this;
 
@@ -145,8 +145,19 @@ packet_t *packet_create()
                        .clone = _clone_,
                        .destroy = _destroy,
                },
+               .source = src,
+               .destination = dst,
+               .adjusted_data = data,
+               .data = data,
        );
 
        return &this->public;
 }
 
+/*
+ * Described in header.
+ */
+packet_t *packet_create()
+{
+       return packet_create_from_data(NULL, NULL, chunk_empty);
+}

diff --git a/src/libstrongswan/utils/packet.h b/src/libstrongswan/utils/packet.h
index 9106bbef50e96b5d83bbae56dc6c77c9fd18be74..5c4440115f31301a4716b377ea054d7df088697a 100644 (file)
--- a/src/libstrongswan/utils/packet.h
+++ b/src/libstrongswan/utils/packet.h
@@ -108,4 +108,14 @@ struct packet_t {
  */
 packet_t *packet_create();
 
+/**
+ * Create a packet from the supplied data
+ *
+ * @param src                  source address (gets owned)
+ * @param dst                  destination address (gets owned)
+ * @param data                 packet data (gets owned)
+ * @return packet_t object
+ */
+packet_t *packet_create_from_data(host_t *src, host_t *dst, chunk_t data);
+
 #endif /** PACKET_H_ @}*/