Moved packet_t to libstrongswan
authorTobias Brunner <tobias@strongswan.org>
Fri, 6 Jul 2012 14:40:46 +0000 (16:40 +0200)
committerTobias Brunner <tobias@strongswan.org>
Wed, 8 Aug 2012 13:41:02 +0000 (15:41 +0200)
15 files changed:
src/libcharon/Android.mk
src/libcharon/Makefile.am
src/libcharon/encoding/message.h
src/libcharon/network/packet.c [deleted file]
src/libcharon/network/packet.h [deleted file]
src/libcharon/network/receiver.c
src/libcharon/network/receiver.h
src/libcharon/network/sender.h
src/libcharon/network/socket.h
src/libcharon/sa/ike_sa.h
src/libcharon/sa/ikev2/tasks/ike_mobike.h
src/libstrongswan/Android.mk
src/libstrongswan/Makefile.am
src/libstrongswan/utils/packet.c [new file with mode: 0644]
src/libstrongswan/utils/packet.h [new file with mode: 0644]

index 5e93e23..a4ac871 100644 (file)
@@ -44,7 +44,7 @@ encoding/payloads/vendor_id_payload.c encoding/payloads/vendor_id_payload.h \
 encoding/payloads/hash_payload.c encoding/payloads/hash_payload.h \
 kernel/kernel_handler.c kernel/kernel_handler.h \
 network/receiver.c network/receiver.h network/sender.c network/sender.h \
-network/packet.c network/packet.h network/socket.c network/socket.h \
+network/socket.c network/socket.h \
 network/socket_manager.c network/socket_manager.h \
 processing/jobs/acquire_job.c processing/jobs/acquire_job.h \
 processing/jobs/delete_child_sa_job.c processing/jobs/delete_child_sa_job.h \
index df23e22..cd2c9de 100644 (file)
@@ -42,7 +42,7 @@ encoding/payloads/vendor_id_payload.c encoding/payloads/vendor_id_payload.h \
 encoding/payloads/hash_payload.c encoding/payloads/hash_payload.h \
 kernel/kernel_handler.c kernel/kernel_handler.h \
 network/receiver.c network/receiver.h network/sender.c network/sender.h \
-network/packet.c network/packet.h network/socket.c network/socket.h \
+network/socket.c network/socket.h \
 network/socket_manager.c network/socket_manager.h \
 processing/jobs/acquire_job.c processing/jobs/acquire_job.h \
 processing/jobs/delete_child_sa_job.c processing/jobs/delete_child_sa_job.h \
index 6f3c796..6d558da 100644 (file)
 typedef struct message_t message_t;
 
 #include <library.h>
-#include <network/packet.h>
 #include <encoding/payloads/ike_header.h>
 #include <encoding/payloads/notify_payload.h>
 #include <sa/keymat.h>
 #include <sa/ike_sa_id.h>
+#include <utils/packet.h>
 #include <utils/linked_list.h>
 
 /**
diff --git a/src/libcharon/network/packet.c b/src/libcharon/network/packet.c
deleted file mode 100644 (file)
index c817e00..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2012 Tobias Brunner
- * Copyright (C) 2005-2006 Martin Willi
- * Copyright (C) 2005 Jan Hutter
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-#include "packet.h"
-
-typedef struct private_packet_t private_packet_t;
-
-/**
- * Private data of an packet_t object.
- */
-struct private_packet_t {
-
-       /**
-        * Public part of a packet_t object.
-        */
-       packet_t public;
-
-       /**
-        * source address
-        */
-       host_t *source;
-
-       /**
-        * destination address
-        */
-       host_t *destination;
-
-        /**
-         * message data
-         */
-       chunk_t data;
-
-       /**
-        * actual chunk returned from get_data, adjusted when skip_bytes is called
-        */
-       chunk_t adjusted_data;
-};
-
-METHOD(packet_t, set_source, void,
-       private_packet_t *this, host_t *source)
-{
-       DESTROY_IF(this->source);
-       this->source = source;
-}
-
-METHOD(packet_t, set_destination, void,
-       private_packet_t *this, host_t *destination)
-{
-       DESTROY_IF(this->destination);
-       this->destination = destination;
-}
-
-METHOD(packet_t, get_source, host_t*,
-       private_packet_t *this)
-{
-       return this->source;
-}
-
-METHOD(packet_t, get_destination, host_t*,
-       private_packet_t *this)
-{
-       return this->destination;
-}
-
-METHOD(packet_t, get_data, chunk_t,
-       private_packet_t *this)
-{
-       return this->adjusted_data;
-}
-
-METHOD(packet_t, set_data, void,
-       private_packet_t *this, chunk_t data)
-{
-       free(this->data.ptr);
-       this->adjusted_data = this->data = data;
-}
-
-METHOD(packet_t, skip_bytes, void,
-       private_packet_t *this, size_t bytes)
-{
-       this->adjusted_data = chunk_skip(this->adjusted_data, bytes);
-}
-
-METHOD(packet_t, destroy, void,
-       private_packet_t *this)
-{
-       DESTROY_IF(this->source);
-       DESTROY_IF(this->destination);
-       free(this->data.ptr);
-       free(this);
-}
-
-METHOD(packet_t, clone_, packet_t*,
-       private_packet_t *this)
-{
-       packet_t *other;
-
-       other = packet_create();
-       if (this->destination != NULL)
-       {
-               other->set_destination(other, this->destination->clone(this->destination));
-       }
-       if (this->source != NULL)
-       {
-               other->set_source(other, this->source->clone(this->source));
-       }
-       if (this->data.ptr != NULL)
-       {
-               other->set_data(other, chunk_clone(this->adjusted_data));
-       }
-       return other;
-}
-
-/*
- * Documented in header
- */
-packet_t *packet_create(void)
-{
-       private_packet_t *this;
-
-       INIT(this,
-               .public = {
-                       .set_data = _set_data,
-                       .get_data = _get_data,
-                       .set_source = _set_source,
-                       .get_source = _get_source,
-                       .set_destination = _set_destination,
-                       .get_destination = _get_destination,
-                       .skip_bytes = _skip_bytes,
-                       .clone = _clone_,
-                       .destroy = _destroy,
-               },
-       );
-
-       return &this->public;
-}
-
diff --git a/src/libcharon/network/packet.h b/src/libcharon/network/packet.h
deleted file mode 100644 (file)
index c533641..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2012 Tobias Brunner
- * Copyright (C) 2005-2006 Martin Willi
- * Copyright (C) 2005 Jan Hutter
- * Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup packet packet
- * @{ @ingroup network
- */
-
-#ifndef PACKET_H_
-#define PACKET_H_
-
-typedef struct packet_t packet_t;
-
-#include <library.h>
-#include <utils/host.h>
-
-/**
- * Abstraction of an UDP-Packet, contains data, sender and receiver.
- */
-struct packet_t {
-
-       /**
-        * Set the source address.
-        *
-        * Set host_t is now owned by packet_t, it will destroy
-        * it if necessary.
-        *
-        * @param source        address to set as source
-        */
-       void (*set_source) (packet_t *packet, host_t *source);
-
-       /**
-        * Set the destination address.
-        *
-        * Set host_t is now owned by packet_t, it will destroy
-        * it if necessary.
-        *
-        * @param source        address to set as destination
-        */
-       void (*set_destination) (packet_t *packet, host_t *destination);
-
-       /**
-        * Get the source address.
-        *
-        * Set host_t is still owned by packet_t, clone it
-        * if needed.
-        *
-        * @return                      source address
-        */
-       host_t *(*get_source) (packet_t *packet);
-
-       /**
-        * Get the destination address.
-        *
-        * Set host_t is still owned by packet_t, clone it
-        * if needed.
-        *
-        * @return                      destination address
-        */
-       host_t *(*get_destination) (packet_t *packet);
-
-       /**
-        * Get the data from the packet.
-        *
-        * The data pointed by the chunk is still owned
-        * by the packet. Clone it if needed.
-        *
-        * @return                      chunk containing the data
-        */
-       chunk_t (*get_data) (packet_t *packet);
-
-       /**
-        * Set the data in the packet.
-        *
-        * Supplied chunk data is now owned by the
-        * packet. It will free it.
-        *
-        * @param data          chunk with data to set
-        */
-       void (*set_data) (packet_t *packet, chunk_t data);
-
-       /**
-        * Increase the offset where the actual packet data starts.
-        *
-        * @note The offset is reset to 0 when set_data() is called.
-        *
-        * @param bytes         the number of additional bytes to skip
-        */
-       void (*skip_bytes) (packet_t *packet, size_t bytes);
-
-       /**
-        * Clones a packet_t object.
-        *
-        * @param clone         clone of the packet
-        */
-       packet_t* (*clone) (packet_t *packet);
-
-       /**
-        * Destroy the packet, freeing contained data.
-        */
-       void (*destroy) (packet_t *packet);
-};
-
-/**
- * create an empty packet
- *
- * @return packet_t object
- */
-packet_t *packet_create(void);
-
-#endif /** PACKET_H_ @}*/
index 3a52f8d..b270d65 100644 (file)
 
 #include <daemon.h>
 #include <network/socket.h>
-#include <network/packet.h>
 #include <processing/jobs/job.h>
 #include <processing/jobs/process_message_job.h>
 #include <processing/jobs/callback_job.h>
 #include <crypto/hashers/hasher.h>
 #include <threading/mutex.h>
+#include <utils/packet.h>
 
 /** lifetime of a cookie, in seconds */
 #define COOKIE_LIFETIME 10
index 93b3d3c..9e8edee 100644 (file)
@@ -26,8 +26,8 @@
 typedef struct receiver_t receiver_t;
 
 #include <library.h>
-#include <network/packet.h>
 #include <utils/host.h>
+#include <utils/packet.h>
 
 /**
  * Callback called for any received UDP encapsulated ESP packet.
index c4f18d7..9b5c325 100644 (file)
@@ -26,7 +26,7 @@
 typedef struct sender_t sender_t;
 
 #include <library.h>
-#include <network/packet.h>
+#include <utils/packet.h>
 
 /**
  * Callback job responsible for sending IKE packets over the socket.
index 4a4ef52..b8850c6 100644 (file)
@@ -27,7 +27,7 @@
 typedef struct socket_t socket_t;
 
 #include <library.h>
-#include <network/packet.h>
+#include <utils/packet.h>
 #include <utils/enumerator.h>
 #include <plugins/plugin.h>
 
index e523559..de9e0ed 100644 (file)
@@ -43,6 +43,7 @@ typedef struct ike_sa_t ike_sa_t;
 #include <config/peer_cfg.h>
 #include <config/ike_cfg.h>
 #include <credentials/auth_cfg.h>
+#include <utils/packet.h>
 
 /**
  * Timeout in seconds after that a half open IKE_SA gets deleted.
index a7e3fe7..3b447af 100644 (file)
@@ -26,7 +26,7 @@ typedef struct ike_mobike_t ike_mobike_t;
 #include <library.h>
 #include <sa/ike_sa.h>
 #include <sa/task.h>
-#include <network/packet.h>
+#include <utils/packet.h>
 
 /**
  * Task of type ike_mobike, detects and handles MOBIKE extension.
index 8cba588..b6abf15 100644 (file)
@@ -24,7 +24,7 @@ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c
 processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
-utils.c utils/host.c utils/identification.c utils/lexparser.c \
+utils.c utils/host.c utils/packet.c utils/identification.c utils/lexparser.c \
 utils/linked_list.c utils/hashtable.c utils/enumerator.c utils/optionsfrom.c \
 utils/capabilities.c utils/backtrace.c
 
index dc849d6..b21f86f 100644 (file)
@@ -22,7 +22,7 @@ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c
 processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
-utils.c utils/host.c utils/identification.c utils/lexparser.c \
+utils.c utils/host.c utils/packet.c utils/identification.c utils/lexparser.c \
 utils/linked_list.c utils/hashtable.c utils/enumerator.c utils/optionsfrom.c \
 utils/capabilities.c utils/backtrace.c
 
@@ -57,8 +57,9 @@ processing/jobs/callback_job.h processing/processor.h processing/scheduler.h \
 selectors/traffic_selector.h threading/thread.h threading/thread_value.h \
 threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h \
 threading/rwlock.h threading/lock_profiler.h utils.h utils/host.h \
-utils/identification.h utils/lexparser.h utils/linked_list.h utils/hashtable.h \
-utils/enumerator.h utils/optionsfrom.h utils/capabilities.h utils/backtrace.h
+utils/packet.h utils/identification.h utils/lexparser.h utils/linked_list.h \
+utils/hashtable.h utils/enumerator.h utils/optionsfrom.h utils/capabilities.h \
+utils/backtrace.h
 endif
 
 library.lo :   $(top_builddir)/config.status
diff --git a/src/libstrongswan/utils/packet.c b/src/libstrongswan/utils/packet.c
new file mode 100644 (file)
index 0000000..b5716fc
--- /dev/null
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2012 Tobias Brunner
+ * Copyright (C) 2005-2006 Martin Willi
+ * Copyright (C) 2005 Jan Hutter
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "packet.h"
+
+typedef struct private_packet_t private_packet_t;
+
+/**
+ * Private data of an packet_t object.
+ */
+struct private_packet_t {
+
+       /**
+        * Public part of a packet_t object.
+        */
+       packet_t public;
+
+       /**
+        * source address
+        */
+       host_t *source;
+
+       /**
+        * destination address
+        */
+       host_t *destination;
+
+        /**
+         * message data
+         */
+       chunk_t data;
+
+       /**
+        * actual chunk returned from get_data, adjusted when skip_bytes is called
+        */
+       chunk_t adjusted_data;
+};
+
+METHOD(packet_t, set_source, void,
+       private_packet_t *this, host_t *source)
+{
+       DESTROY_IF(this->source);
+       this->source = source;
+}
+
+METHOD(packet_t, set_destination, void,
+       private_packet_t *this, host_t *destination)
+{
+       DESTROY_IF(this->destination);
+       this->destination = destination;
+}
+
+METHOD(packet_t, get_source, host_t*,
+       private_packet_t *this)
+{
+       return this->source;
+}
+
+METHOD(packet_t, get_destination, host_t*,
+       private_packet_t *this)
+{
+       return this->destination;
+}
+
+METHOD(packet_t, get_data, chunk_t,
+       private_packet_t *this)
+{
+       return this->adjusted_data;
+}
+
+METHOD(packet_t, set_data, void,
+       private_packet_t *this, chunk_t data)
+{
+       free(this->data.ptr);
+       this->adjusted_data = this->data = data;
+}
+
+METHOD(packet_t, skip_bytes, void,
+       private_packet_t *this, size_t bytes)
+{
+       this->adjusted_data = chunk_skip(this->adjusted_data, bytes);
+}
+
+METHOD(packet_t, destroy, void,
+       private_packet_t *this)
+{
+       DESTROY_IF(this->source);
+       DESTROY_IF(this->destination);
+       free(this->data.ptr);
+       free(this);
+}
+
+METHOD(packet_t, clone_, packet_t*,
+       private_packet_t *this)
+{
+       packet_t *other;
+
+       other = packet_create();
+       if (this->destination)
+       {
+               other->set_destination(other,
+                                                          this->destination->clone(this->destination));
+       }
+       if (this->source)
+       {
+               other->set_source(other, this->source->clone(this->source));
+       }
+       if (this->data.ptr)
+       {
+               other->set_data(other, chunk_clone(this->adjusted_data));
+       }
+       return other;
+}
+
+/*
+ * Documented in header
+ */
+packet_t *packet_create()
+{
+       private_packet_t *this;
+
+       INIT(this,
+               .public = {
+                       .set_data = _set_data,
+                       .get_data = _get_data,
+                       .set_source = _set_source,
+                       .get_source = _get_source,
+                       .set_destination = _set_destination,
+                       .get_destination = _get_destination,
+                       .skip_bytes = _skip_bytes,
+                       .clone = _clone_,
+                       .destroy = _destroy,
+               },
+       );
+
+       return &this->public;
+}
+
diff --git a/src/libstrongswan/utils/packet.h b/src/libstrongswan/utils/packet.h
new file mode 100644 (file)
index 0000000..9106bbe
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2012 Tobias Brunner
+ * Copyright (C) 2005-2006 Martin Willi
+ * Copyright (C) 2005 Jan Hutter
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup packet packet
+ * @{ @ingroup utils
+ */
+
+#ifndef PACKET_H_
+#define PACKET_H_
+
+typedef struct packet_t packet_t;
+
+#include <library.h>
+#include <utils/host.h>
+
+/**
+ * Abstraction of an IP/UDP-Packet, contains data, sender and receiver.
+ */
+struct packet_t {
+
+       /**
+        * Set the source address.
+        *
+        * @param source        address to set as source (gets owned)
+        */
+       void (*set_source)(packet_t *packet, host_t *source);
+
+       /**
+        * Set the destination address.
+        *
+        * @param source        address to set as destination (gets owned)
+        */
+       void (*set_destination)(packet_t *packet, host_t *destination);
+
+       /**
+        * Get the source address.
+        *
+        * @return                      source address (internal data)
+        */
+       host_t *(*get_source)(packet_t *packet);
+
+       /**
+        * Get the destination address.
+        *
+        * @return                      destination address (internal data)
+        */
+       host_t *(*get_destination)(packet_t *packet);
+
+       /**
+        * Get the data from the packet.
+        *
+        * @return                      chunk containing the data (internal data)
+        */
+       chunk_t (*get_data)(packet_t *packet);
+
+       /**
+        * Set the data in the packet.
+        *
+        * @param data          chunk with data to set (gets owned)
+        */
+       void (*set_data)(packet_t *packet, chunk_t data);
+
+       /**
+        * Increase the offset where the actual packet data starts.
+        *
+        * The total offset applies to future calls of get_data() and clone().
+        *
+        * @note The offset is reset to 0 when set_data() is called.
+        *
+        * @param bytes         the number of additional bytes to skip
+        */
+       void (*skip_bytes)(packet_t *packet, size_t bytes);
+
+       /**
+        * Clones a packet_t object.
+        *
+        * @note Data is cloned without skipped bytes.
+        *
+        * @param clone         clone of the packet
+        */
+       packet_t* (*clone)(packet_t *packet);
+
+       /**
+        * Destroy the packet, freeing contained data.
+        */
+       void (*destroy)(packet_t *packet);
+};
+
+/**
+ * Create an empty packet
+ *
+ * @return packet_t object
+ */
+packet_t *packet_create();
+
+#endif /** PACKET_H_ @}*/