Moved packet_t and tun_device_t to networking folder

diff --git a/src/libcharon/encoding/message.h b/src/libcharon/encoding/message.h
index 6d558daf6a5b85ab38e1d3261393cd8cd9b47e9d..53298387ef810c9e555f12464b64a59470a99a9b 100644 (file)
--- a/src/libcharon/encoding/message.h
+++ b/src/libcharon/encoding/message.h
@@ -31,7 +31,7 @@ typedef struct message_t message_t;
 #include <encoding/payloads/notify_payload.h>
 #include <sa/keymat.h>
 #include <sa/ike_sa_id.h>
-#include <utils/packet.h>
+#include <networking/packet.h>
 #include <utils/linked_list.h>
 
 /**

diff --git a/src/libcharon/network/receiver.c b/src/libcharon/network/receiver.c
index 205bee58e058832a4175b3fc291158584cdeaa1d..f683cf81839d59a3e020a54fb8e1964e6b8de8b0 100644 (file)
--- a/src/libcharon/network/receiver.c
+++ b/src/libcharon/network/receiver.c
@@ -28,7 +28,7 @@
 #include <processing/jobs/callback_job.h>
 #include <crypto/hashers/hasher.h>
 #include <threading/mutex.h>
-#include <utils/packet.h>
+#include <networking/packet.h>
 
 /** lifetime of a cookie, in seconds */
 #define COOKIE_LIFETIME 10

diff --git a/src/libcharon/network/receiver.h b/src/libcharon/network/receiver.h
index 82153613fcf2bba3660a91783a8656a0709f934c..58bfe4a96860f587730d17bc04106c84e933d9cb 100644 (file)
--- a/src/libcharon/network/receiver.h
+++ b/src/libcharon/network/receiver.h
@@ -27,7 +27,7 @@ typedef struct receiver_t receiver_t;
 
 #include <library.h>
 #include <networking/host.h>
-#include <utils/packet.h>
+#include <networking/packet.h>
 
 /**
  * Callback called for any received UDP encapsulated ESP packet.

diff --git a/src/libcharon/network/sender.h b/src/libcharon/network/sender.h
index 9b5c325cc76e567cafc9687e02a564173619a74c..080559b89b869e560a0bf30ad2efc505cc1254af 100644 (file)
--- a/src/libcharon/network/sender.h
+++ b/src/libcharon/network/sender.h
@@ -26,7 +26,7 @@
 typedef struct sender_t sender_t;
 
 #include <library.h>
-#include <utils/packet.h>
+#include <networking/packet.h>
 
 /**
  * Callback job responsible for sending IKE packets over the socket.

diff --git a/src/libcharon/network/socket.h b/src/libcharon/network/socket.h
index b8850c6edd0f117e9d337d4f42fdbf5e49bf385b..2eccc4d3f9e40ec05fbecf9d0d181002447ecb8a 100644 (file)
--- a/src/libcharon/network/socket.h
+++ b/src/libcharon/network/socket.h
@@ -27,7 +27,7 @@
 typedef struct socket_t socket_t;
 
 #include <library.h>
-#include <utils/packet.h>
+#include <networking/packet.h>
 #include <utils/enumerator.h>
 #include <plugins/plugin.h>
 

diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h
index af741c79915e98eb1328d5ff55a5a39e9ddfe5fd..b610055d616691c1a63dc4fe8434909c477ef814 100644 (file)
--- a/src/libcharon/sa/ike_sa.h
+++ b/src/libcharon/sa/ike_sa.h
@@ -43,7 +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>
+#include <networking/packet.h>
 
 /**
  * Timeout in seconds after that a half open IKE_SA gets deleted.

diff --git a/src/libcharon/sa/ikev2/tasks/ike_mobike.h b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
index 3b447af516448f2ee90244474269219be513ed6a..b145a9a8b9be551ff00a5b2cc2a98771176204b0 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_mobike.h
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.h
@@ -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 <utils/packet.h>
+#include <networking/packet.h>
 
 /**
  * Task of type ike_mobike, detects and handles MOBIKE extension.

diff --git a/src/libipsec/esp_packet.h b/src/libipsec/esp_packet.h
index 4586379b0c4b3ad84ae3dfada75779a1c03e23b9..ce8645825f17a0c9996b188bdc9cf927a50073bd 100644 (file)
--- a/src/libipsec/esp_packet.h
+++ b/src/libipsec/esp_packet.h
@@ -28,7 +28,7 @@
 
 #include <library.h>
 #include <networking/host.h>
-#include <utils/packet.h>
+#include <networking/packet.h>
 
 typedef struct esp_packet_t esp_packet_t;
 

diff --git a/src/libipsec/ip_packet.h b/src/libipsec/ip_packet.h
index 722662af78796a4ca53637cad146cd54f0deee9c..de817e23eda862479aa0e1af846b8ed05791358e 100644 (file)
--- a/src/libipsec/ip_packet.h
+++ b/src/libipsec/ip_packet.h
@@ -23,7 +23,7 @@
 
 #include <library.h>
 #include <networking/host.h>
-#include <utils/packet.h>
+#include <networking/packet.h>
 
 typedef struct ip_packet_t ip_packet_t;
 

diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index fb224a28b302b1c7823904c368dbe9633b5f5e46..c627447e3be5f5c5c00bc1289cb8def6062819b6 100644 (file)
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -22,14 +22,15 @@ credentials/sets/cert_cache.c credentials/sets/mem_cred.c \
 credentials/sets/callback_cred.c credentials/auth_cfg.c database/database.c \
 database/database_factory.c fetcher/fetcher.c fetcher/fetcher_manager.c eap/eap.c \
 ipsec/ipsec_types.c \
-networking/host.c networking/host_resolver.c \
+networking/host.c networking/host_resolver.c networking/packet.c \
+networking/tun_device.c \
 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/packet.c utils/identification.c utils/lexparser.c \
+utils.c utils/identification.c utils/lexparser.c \
 utils/linked_list.c utils/blocking_queue.c utils/hashtable.c utils/enumerator.c \
-utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/tun_device.c
+utils/optionsfrom.c utils/capabilities.c utils/backtrace.c
 
 # adding the plugin source files
 

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 4b8279f7a0e0d7c61c71df821bb82edda8af10d6..62649d9ec980380314df946bce13146d3ebed369 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -20,14 +20,15 @@ credentials/sets/cert_cache.c credentials/sets/mem_cred.c \
 credentials/sets/callback_cred.c credentials/auth_cfg.c database/database.c \
 database/database_factory.c fetcher/fetcher.c fetcher/fetcher_manager.c eap/eap.c \
 ipsec/ipsec_types.c \
-networking/host.c networking/host_resolver.c \
+networking/host.c networking/host_resolver.c networking/packet.c \
+networking/tun_device.c \
 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/packet.c utils/identification.c utils/lexparser.c \
+utils.c utils/identification.c utils/lexparser.c \
 utils/linked_list.c utils/blocking_queue.c utils/hashtable.c utils/enumerator.c \
-utils/optionsfrom.c utils/capabilities.c utils/backtrace.c utils/tun_device.c
+utils/optionsfrom.c utils/capabilities.c utils/backtrace.c
 
 if USE_DEV_HEADERS
 strongswan_includedir = ${dev_headers}
@@ -56,16 +57,17 @@ credentials/sets/mem_cred.h credentials/sets/callback_cred.h \
 credentials/auth_cfg.h credentials/credential_set.h credentials/cert_validator.h \
 database/database.h database/database_factory.h fetcher/fetcher.h \
 fetcher/fetcher_manager.h eap/eap.h pen/pen.h ipsec/ipsec_types.h \
-networking/host.h networking/host_resolver.h \
+networking/host.h networking/host_resolver.h networking/packet.h \
+networking/tun_device.h \
 plugins/plugin_loader.h plugins/plugin.h plugins/plugin_feature.h \
 processing/jobs/job.h 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/rwlock_condvar.h threading/lock_profiler.h \
-utils.h utils/packet.h utils/identification.h utils/lexparser.h \
+utils.h utils/identification.h utils/lexparser.h \
 utils/linked_list.h utils/blocking_queue.h utils/hashtable.h utils/enumerator.h \
-utils/optionsfrom.h utils/capabilities.h utils/backtrace.h utils/tun_device.h \
+utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
 utils/leak_detective.h integrity_checker.h
 endif
 

diff --git a/src/libstrongswan/utils/packet.c b/src/libstrongswan/networking/packet.c
similarity index 100%
rename from src/libstrongswan/utils/packet.c
rename to src/libstrongswan/networking/packet.c

diff --git a/src/libstrongswan/utils/packet.h b/src/libstrongswan/networking/packet.h
similarity index 99%
rename from src/libstrongswan/utils/packet.h
rename to src/libstrongswan/networking/packet.h
index b6e28199a702c5957eab5c5691f87bc87ab5326a..6fb9cece219a668c6fa24aefef21c17bb0a53e9a 100644 (file)
--- a/src/libstrongswan/utils/packet.h
+++ b/src/libstrongswan/networking/packet.h
@@ -17,7 +17,7 @@
 
 /**
  * @defgroup packet packet
- * @{ @ingroup utils
+ * @{ @ingroup networking
  */
 
 #ifndef PACKET_H_

diff --git a/src/libstrongswan/utils/tun_device.c b/src/libstrongswan/networking/tun_device.c
similarity index 100%
rename from src/libstrongswan/utils/tun_device.c
rename to src/libstrongswan/networking/tun_device.c

diff --git a/src/libstrongswan/utils/tun_device.h b/src/libstrongswan/networking/tun_device.h
similarity index 99%
rename from src/libstrongswan/utils/tun_device.h
rename to src/libstrongswan/networking/tun_device.h
index be97432ff5836d917a757326d6be005ae1d0000b..b22a5d170e7bf60c7ac166e30bc3e3bd4f599c94 100644 (file)
--- a/src/libstrongswan/utils/tun_device.h
+++ b/src/libstrongswan/networking/tun_device.h
@@ -17,7 +17,7 @@
 
 /**
  * @defgroup tun_device tun_device
- * @{ @ingroup utils
+ * @{ @ingroup networking
  */
 
 #ifndef TUN_DEVICE_H_