diff --git a/src/libcharon/encoding/message.h b/src/libcharon/encoding/message.h index 6d558daf6..53298387e 100644 --- a/src/libcharon/encoding/message.h +++ b/src/libcharon/encoding/message.h @@ -31,7 +31,7 @@ typedef struct message_t message_t; #include #include #include -#include +#include #include /** diff --git a/src/libcharon/network/receiver.c b/src/libcharon/network/receiver.c index 205bee58e..f683cf818 100644 --- a/src/libcharon/network/receiver.c +++ b/src/libcharon/network/receiver.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include /** 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 82153613f..58bfe4a96 100644 --- a/src/libcharon/network/receiver.h +++ b/src/libcharon/network/receiver.h @@ -27,7 +27,7 @@ typedef struct receiver_t receiver_t; #include #include -#include +#include /** * Callback called for any received UDP encapsulated ESP packet. diff --git a/src/libcharon/network/sender.h b/src/libcharon/network/sender.h index 9b5c325cc..080559b89 100644 --- a/src/libcharon/network/sender.h +++ b/src/libcharon/network/sender.h @@ -26,7 +26,7 @@ typedef struct sender_t sender_t; #include -#include +#include /** * 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 b8850c6ed..2eccc4d3f 100644 --- a/src/libcharon/network/socket.h +++ b/src/libcharon/network/socket.h @@ -27,7 +27,7 @@ typedef struct socket_t socket_t; #include -#include +#include #include #include diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h index af741c799..b610055d6 100644 --- 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 #include #include -#include +#include /** * 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 3b447af51..b145a9a8b 100644 --- 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 #include #include -#include +#include /** * 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 4586379b0..ce8645825 100644 --- a/src/libipsec/esp_packet.h +++ b/src/libipsec/esp_packet.h @@ -28,7 +28,7 @@ #include #include -#include +#include typedef struct esp_packet_t esp_packet_t; diff --git a/src/libipsec/ip_packet.h b/src/libipsec/ip_packet.h index 722662af7..de817e23e 100644 --- a/src/libipsec/ip_packet.h +++ b/src/libipsec/ip_packet.h @@ -23,7 +23,7 @@ #include #include -#include +#include typedef struct ip_packet_t ip_packet_t; diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index fb224a28b..c627447e3 100644 --- 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 4b8279f7a..62649d9ec 100644 --- 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 b6e28199a..6fb9cece2 100644 --- 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 be97432ff..b22a5d170 100644 --- 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_