From 2e7cc07ecde933f52d2d16bf84596ba6da66ebc9 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 16 Oct 2012 14:29:18 +0200 Subject: [PATCH] Moved host_t and host_resolver_t to a new networking subfolder --- scripts/tls_test.c | 2 +- src/charon-nm/nm/nm_service.c | 2 +- src/dumm/iface.h | 2 +- .../jni/libandroidbridge/kernel/network_manager.h | 2 +- .../android/jni/libandroidbridge/vpnservice_builder.h | 2 +- src/libcharon/config/backend_manager.h | 2 +- src/libcharon/config/ike_cfg.h | 2 +- src/libcharon/config/proposal.h | 2 +- .../encoding/payloads/traffic_selector_substructure.h | 2 +- src/libcharon/network/receiver.h | 2 +- src/libcharon/plugins/android/android_handler.c | 2 +- src/libcharon/plugins/dhcp/dhcp_transaction.h | 2 +- src/libcharon/plugins/farp/farp_listener.h | 2 +- src/libcharon/plugins/ha/ha_message.h | 2 +- src/libcharon/plugins/ha/ha_socket.c | 2 +- src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.h | 8 ++++---- src/libcharon/processing/jobs/migrate_job.h | 2 +- src/libcharon/processing/jobs/update_sa_job.h | 2 +- src/libhydra/attributes/attribute_provider.h | 2 +- src/libhydra/attributes/mem_pool.h | 2 +- src/libhydra/kernel/kernel_interface.h | 2 +- src/libhydra/kernel/kernel_ipsec.h | 2 +- src/libhydra/kernel/kernel_listener.h | 2 +- src/libhydra/kernel/kernel_net.h | 2 +- src/libhydra/plugins/attr_sql/pool.c | 2 +- src/libhydra/plugins/attr_sql/pool_attributes.c | 2 +- src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 2 +- .../plugins/kernel_pfroute/kernel_pfroute_net.c | 2 +- src/libipsec/esp_packet.h | 2 +- src/libipsec/ip_packet.h | 2 +- src/libipsec/ipsec_policy.h | 2 +- src/libipsec/ipsec_policy_mgr.h | 2 +- src/libipsec/ipsec_sa.h | 2 +- src/libipsec/ipsec_sa_mgr.h | 2 +- src/libradius/radius_client.c | 2 +- src/libradius/radius_socket.h | 2 +- src/libstrongswan/Android.mk | 5 +++-- src/libstrongswan/Makefile.am | 10 ++++++---- src/libstrongswan/library.c | 2 +- src/libstrongswan/library.h | 5 ++++- src/libstrongswan/{utils => networking}/host.c | 0 src/libstrongswan/{utils => networking}/host.h | 2 +- src/libstrongswan/{ => networking}/host_resolver.c | 0 src/libstrongswan/{ => networking}/host_resolver.h | 4 ++-- src/libstrongswan/selectors/traffic_selector.h | 2 +- src/libstrongswan/utils/packet.h | 2 +- src/libstrongswan/utils/tun_device.h | 2 +- src/manager/gateway.h | 2 +- 48 files changed, 60 insertions(+), 54 deletions(-) rename src/libstrongswan/{utils => networking}/host.c (100%) rename src/libstrongswan/{utils => networking}/host.h (99%) rename src/libstrongswan/{ => networking}/host_resolver.c (100%) rename src/libstrongswan/{ => networking}/host_resolver.h (96%) diff --git a/scripts/tls_test.c b/scripts/tls_test.c index 560c4a4ba..3bdb34529 100644 --- a/scripts/tls_test.c +++ b/scripts/tls_test.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include /** diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c index 1eeaccaf6..6fa5e51a4 100644 --- a/src/charon-nm/nm/nm_service.c +++ b/src/charon-nm/nm/nm_service.c @@ -18,7 +18,7 @@ #include "nm_service.h" #include -#include +#include #include #include #include diff --git a/src/dumm/iface.h b/src/dumm/iface.h index e96ee508c..c43113abd 100644 --- a/src/dumm/iface.h +++ b/src/dumm/iface.h @@ -18,7 +18,7 @@ #include #include -#include +#include #define TAP_DEVICE "/dev/net/tun" diff --git a/src/frontends/android/jni/libandroidbridge/kernel/network_manager.h b/src/frontends/android/jni/libandroidbridge/kernel/network_manager.h index 634816405..a35103b89 100644 --- a/src/frontends/android/jni/libandroidbridge/kernel/network_manager.h +++ b/src/frontends/android/jni/libandroidbridge/kernel/network_manager.h @@ -24,7 +24,7 @@ #include #include -#include +#include typedef struct network_manager_t network_manager_t; diff --git a/src/frontends/android/jni/libandroidbridge/vpnservice_builder.h b/src/frontends/android/jni/libandroidbridge/vpnservice_builder.h index 82efd05f7..209090896 100644 --- a/src/frontends/android/jni/libandroidbridge/vpnservice_builder.h +++ b/src/frontends/android/jni/libandroidbridge/vpnservice_builder.h @@ -26,7 +26,7 @@ #include #include -#include +#include typedef struct vpnservice_builder_t vpnservice_builder_t; diff --git a/src/libcharon/config/backend_manager.h b/src/libcharon/config/backend_manager.h index 463a57bac..cc8ef8785 100644 --- a/src/libcharon/config/backend_manager.h +++ b/src/libcharon/config/backend_manager.h @@ -24,7 +24,7 @@ typedef struct backend_manager_t backend_manager_t; #include -#include +#include #include #include #include diff --git a/src/libcharon/config/ike_cfg.h b/src/libcharon/config/ike_cfg.h index 5f48e9660..dc5832927 100644 --- a/src/libcharon/config/ike_cfg.h +++ b/src/libcharon/config/ike_cfg.h @@ -26,7 +26,7 @@ typedef enum ike_version_t ike_version_t; typedef struct ike_cfg_t ike_cfg_t; #include -#include +#include #include #include #include diff --git a/src/libcharon/config/proposal.h b/src/libcharon/config/proposal.h index 33abf006c..ff6267dae 100644 --- a/src/libcharon/config/proposal.h +++ b/src/libcharon/config/proposal.h @@ -28,7 +28,7 @@ typedef struct proposal_t proposal_t; #include #include #include -#include +#include #include #include #include diff --git a/src/libcharon/encoding/payloads/traffic_selector_substructure.h b/src/libcharon/encoding/payloads/traffic_selector_substructure.h index 1ad5fb526..d3fbe8476 100644 --- a/src/libcharon/encoding/payloads/traffic_selector_substructure.h +++ b/src/libcharon/encoding/payloads/traffic_selector_substructure.h @@ -25,7 +25,7 @@ typedef struct traffic_selector_substructure_t traffic_selector_substructure_t; #include -#include +#include #include #include diff --git a/src/libcharon/network/receiver.h b/src/libcharon/network/receiver.h index 9e8edee45..82153613f 100644 --- a/src/libcharon/network/receiver.h +++ b/src/libcharon/network/receiver.h @@ -26,7 +26,7 @@ typedef struct receiver_t receiver_t; #include -#include +#include #include /** diff --git a/src/libcharon/plugins/android/android_handler.c b/src/libcharon/plugins/android/android_handler.c index c5f51ef04..c5e98d315 100644 --- a/src/libcharon/plugins/android/android_handler.c +++ b/src/libcharon/plugins/android/android_handler.c @@ -16,7 +16,7 @@ #include "android_handler.h" -#include +#include #include #include diff --git a/src/libcharon/plugins/dhcp/dhcp_transaction.h b/src/libcharon/plugins/dhcp/dhcp_transaction.h index 19c163f88..35f08e836 100644 --- a/src/libcharon/plugins/dhcp/dhcp_transaction.h +++ b/src/libcharon/plugins/dhcp/dhcp_transaction.h @@ -21,7 +21,7 @@ #ifndef DHCP_TRANSACTION_H_ #define DHCP_TRANSACTION_H_ -#include +#include #include #include diff --git a/src/libcharon/plugins/farp/farp_listener.h b/src/libcharon/plugins/farp/farp_listener.h index 3155f60e2..c7dc56a10 100644 --- a/src/libcharon/plugins/farp/farp_listener.h +++ b/src/libcharon/plugins/farp/farp_listener.h @@ -21,7 +21,7 @@ #ifndef FARP_LISTENER_H_ #define FARP_LISTENER_H_ -#include +#include #include typedef struct farp_listener_t farp_listener_t; diff --git a/src/libcharon/plugins/ha/ha_message.h b/src/libcharon/plugins/ha/ha_message.h index 8cd30f711..2ccb1fc55 100644 --- a/src/libcharon/plugins/ha/ha_message.h +++ b/src/libcharon/plugins/ha/ha_message.h @@ -22,7 +22,7 @@ #define HA_MESSAGE_H_ #include -#include +#include #include #include #include diff --git a/src/libcharon/plugins/ha/ha_socket.c b/src/libcharon/plugins/ha/ha_socket.c index 5196a5dc7..e41e78bbf 100644 --- a/src/libcharon/plugins/ha/ha_socket.c +++ b/src/libcharon/plugins/ha/ha_socket.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.h b/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.h index 4bf421e33..4efdc779f 100644 --- a/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.h +++ b/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.h @@ -15,14 +15,14 @@ /** * @defgroup tnc_ifmap_soap tnc_ifmap_soap - * @{ @ingroup tnc_ifmap + * @{ @ingroup tnc_ifmap */ #ifndef TNC_IFMAP_SOAP_H_ #define TNC_IFMAP_SOAP_H_ #include -#include +#include #include typedef struct tnc_ifmap_soap_t tnc_ifmap_soap_t; @@ -47,7 +47,7 @@ struct tnc_ifmap_soap_t { bool (*purgePublisher)(tnc_ifmap_soap_t *this); /** - * Publish metadata about established/deleted IKE_SAs + * Publish metadata about established/deleted IKE_SAs * * @param ike_sa IKE_SA for which metadate is published * @param up TRUE if IKE_SEA is up, FALSE if down @@ -56,7 +56,7 @@ struct tnc_ifmap_soap_t { bool (*publish_ike_sa)(tnc_ifmap_soap_t *this, ike_sa_t *ike_sa, bool up); /** - * Publish PEP device-ip metadata + * Publish PEP device-ip metadata * * @param host IP address of local endpoint * @return TRUE if command was successful diff --git a/src/libcharon/processing/jobs/migrate_job.h b/src/libcharon/processing/jobs/migrate_job.h index 09679c734..30c0ad0ac 100644 --- a/src/libcharon/processing/jobs/migrate_job.h +++ b/src/libcharon/processing/jobs/migrate_job.h @@ -24,7 +24,7 @@ typedef struct migrate_job_t migrate_job_t; #include -#include +#include #include #include #include diff --git a/src/libcharon/processing/jobs/update_sa_job.h b/src/libcharon/processing/jobs/update_sa_job.h index e2344fcc4..55a3df83e 100644 --- a/src/libcharon/processing/jobs/update_sa_job.h +++ b/src/libcharon/processing/jobs/update_sa_job.h @@ -24,7 +24,7 @@ typedef struct update_sa_job_t update_sa_job_t; #include -#include +#include #include /** diff --git a/src/libhydra/attributes/attribute_provider.h b/src/libhydra/attributes/attribute_provider.h index e5e556fc4..82d0ee3c2 100644 --- a/src/libhydra/attributes/attribute_provider.h +++ b/src/libhydra/attributes/attribute_provider.h @@ -21,7 +21,7 @@ #ifndef ATTRIBUTE_PROVIDER_H_ #define ATTRIBUTE_PROVIDER_H_ -#include +#include #include #include diff --git a/src/libhydra/attributes/mem_pool.h b/src/libhydra/attributes/mem_pool.h index fa4e6485c..692885ecd 100644 --- a/src/libhydra/attributes/mem_pool.h +++ b/src/libhydra/attributes/mem_pool.h @@ -24,7 +24,7 @@ typedef struct mem_pool_t mem_pool_t; typedef enum mem_pool_op_t mem_pool_op_t; -#include +#include #include /** diff --git a/src/libhydra/kernel/kernel_interface.h b/src/libhydra/kernel/kernel_interface.h index 88d4a5bce..7058466b1 100644 --- a/src/libhydra/kernel/kernel_interface.h +++ b/src/libhydra/kernel/kernel_interface.h @@ -48,7 +48,7 @@ typedef struct kernel_interface_t kernel_interface_t; -#include +#include #include #include diff --git a/src/libhydra/kernel/kernel_ipsec.h b/src/libhydra/kernel/kernel_ipsec.h index ee0ade2aa..1da0805cb 100644 --- a/src/libhydra/kernel/kernel_ipsec.h +++ b/src/libhydra/kernel/kernel_ipsec.h @@ -26,7 +26,7 @@ typedef struct kernel_ipsec_t kernel_ipsec_t; -#include +#include #include #include #include diff --git a/src/libhydra/kernel/kernel_listener.h b/src/libhydra/kernel/kernel_listener.h index 5db297b6f..27ea947eb 100644 --- a/src/libhydra/kernel/kernel_listener.h +++ b/src/libhydra/kernel/kernel_listener.h @@ -25,7 +25,7 @@ typedef struct kernel_listener_t kernel_listener_t; #include #include -#include +#include /** * Interface for components interested in kernel events. diff --git a/src/libhydra/kernel/kernel_net.h b/src/libhydra/kernel/kernel_net.h index 10350d644..0de93eaee 100644 --- a/src/libhydra/kernel/kernel_net.h +++ b/src/libhydra/kernel/kernel_net.h @@ -26,7 +26,7 @@ typedef struct kernel_net_t kernel_net_t; typedef enum kernel_address_type_t kernel_address_type_t; #include -#include +#include #include /** diff --git a/src/libhydra/plugins/attr_sql/pool.c b/src/libhydra/plugins/attr_sql/pool.c index a2000cffe..1d5fddbb7 100644 --- a/src/libhydra/plugins/attr_sql/pool.c +++ b/src/libhydra/plugins/attr_sql/pool.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/src/libhydra/plugins/attr_sql/pool_attributes.c b/src/libhydra/plugins/attr_sql/pool_attributes.c index d3fc06eeb..5dcfe85ed 100644 --- a/src/libhydra/plugins/attr_sql/pool_attributes.c +++ b/src/libhydra/plugins/attr_sql/pool_attributes.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include "pool_attributes.h" #include "pool_usage.h" diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index b099bc714..ed541ad67 100644 --- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -59,7 +59,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c index 47a8829f7..0ead65785 100644 --- a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c +++ b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/libipsec/esp_packet.h b/src/libipsec/esp_packet.h index a1d1602c1..4586379b0 100644 --- a/src/libipsec/esp_packet.h +++ b/src/libipsec/esp_packet.h @@ -27,7 +27,7 @@ #include "esp_context.h" #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 b4fc298ff..722662af7 100644 --- a/src/libipsec/ip_packet.h +++ b/src/libipsec/ip_packet.h @@ -22,7 +22,7 @@ #define IP_PACKET_H_ #include -#include +#include #include typedef struct ip_packet_t ip_packet_t; diff --git a/src/libipsec/ipsec_policy.h b/src/libipsec/ipsec_policy.h index 67ad0b0ed..23a9ea99d 100644 --- a/src/libipsec/ipsec_policy.h +++ b/src/libipsec/ipsec_policy.h @@ -26,7 +26,7 @@ #include "ip_packet.h" #include -#include +#include #include #include diff --git a/src/libipsec/ipsec_policy_mgr.h b/src/libipsec/ipsec_policy_mgr.h index d3ee1074f..ae0a29868 100644 --- a/src/libipsec/ipsec_policy_mgr.h +++ b/src/libipsec/ipsec_policy_mgr.h @@ -27,7 +27,7 @@ #include "ip_packet.h" #include -#include +#include #include #include #include diff --git a/src/libipsec/ipsec_sa.h b/src/libipsec/ipsec_sa.h index 271e0129f..dec688e68 100644 --- a/src/libipsec/ipsec_sa.h +++ b/src/libipsec/ipsec_sa.h @@ -26,7 +26,7 @@ #include "esp_context.h" #include -#include +#include #include #include diff --git a/src/libipsec/ipsec_sa_mgr.h b/src/libipsec/ipsec_sa_mgr.h index db30a86bb..3ff092038 100644 --- a/src/libipsec/ipsec_sa_mgr.h +++ b/src/libipsec/ipsec_sa_mgr.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include typedef struct ipsec_sa_mgr_t ipsec_sa_mgr_t; diff --git a/src/libradius/radius_client.c b/src/libradius/radius_client.c index acdac78c9..143cfa1a5 100644 --- a/src/libradius/radius_client.c +++ b/src/libradius/radius_client.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/libradius/radius_socket.h b/src/libradius/radius_socket.h index 07d642c08..eb510ea89 100644 --- a/src/libradius/radius_socket.h +++ b/src/libradius/radius_socket.h @@ -25,7 +25,7 @@ typedef struct radius_socket_t radius_socket_t; #include "radius_message.h" -#include +#include /** * RADIUS socket to a server. diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index 9c7ef1d0a..fb224a28b 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) # copy-n-paste from Makefile.am LOCAL_SRC_FILES := \ -library.c chunk.c debug.c enum.c host_resolver.c settings.c printf_hook.c \ +library.c chunk.c debug.c enum.c settings.c printf_hook.c \ asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \ crypto/crypters/crypter.c crypto/hashers/hasher.c crypto/pkcs7.c crypto/pkcs9.c \ crypto/proposal/proposal_keywords.c crypto/proposal/proposal_keywords_static.c \ @@ -22,11 +22,12 @@ 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 \ 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/packet.c utils/identification.c utils/lexparser.c \ +utils.c utils/packet.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 diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 4017bfcc2..4b8279f7a 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -1,7 +1,7 @@ ipseclib_LTLIBRARIES = libstrongswan.la libstrongswan_la_SOURCES = \ -library.c chunk.c debug.c enum.c host_resolver.c settings.c printf_hook.c \ +library.c chunk.c debug.c enum.c settings.c printf_hook.c \ asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \ crypto/crypters/crypter.c crypto/hashers/hasher.c crypto/pkcs7.c crypto/pkcs9.c \ crypto/proposal/proposal_keywords.c crypto/proposal/proposal_keywords_static.c \ @@ -20,18 +20,19 @@ 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 \ 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/packet.c utils/identification.c utils/lexparser.c \ +utils.c utils/packet.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 if USE_DEV_HEADERS strongswan_includedir = ${dev_headers} nobase_strongswan_include_HEADERS = \ -library.h chunk.h debug.h enum.h host_resolver.h settings.h printf_hook.h \ +library.h chunk.h debug.h enum.h settings.h printf_hook.h \ asn1/asn1.h asn1/asn1_parser.h asn1/oid.h bio/bio_reader.h bio/bio_writer.h \ crypto/crypters/crypter.h crypto/hashers/hasher.h crypto/mac.h \ crypto/pkcs7.h crypto/pkcs9.h crypto/proposal/proposal_keywords.h \ @@ -55,13 +56,14 @@ 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 \ 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/host.h utils/packet.h utils/identification.h utils/lexparser.h \ +utils.h utils/packet.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/leak_detective.h integrity_checker.h diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c index a42d68cbc..90a865a78 100644 --- a/src/libstrongswan/library.c +++ b/src/libstrongswan/library.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h index 5bd0d67eb..a2de74986 100644 --- a/src/libstrongswan/library.h +++ b/src/libstrongswan/library.h @@ -46,6 +46,9 @@ * @defgroup ipsec ipsec * @ingroup libstrongswan * + * @defgroup networking networking + * @ingroup libstrongswan + * * @defgroup plugins plugins * @ingroup libstrongswan * @@ -77,9 +80,9 @@ #include "printf_hook.h" #include "utils.h" #include "chunk.h" -#include "host_resolver.h" #include "settings.h" #include "integrity_checker.h" +#include "networking/host_resolver.h" #include "processing/processor.h" #include "processing/scheduler.h" #include "crypto/crypto_factory.h" diff --git a/src/libstrongswan/utils/host.c b/src/libstrongswan/networking/host.c similarity index 100% rename from src/libstrongswan/utils/host.c rename to src/libstrongswan/networking/host.c diff --git a/src/libstrongswan/utils/host.h b/src/libstrongswan/networking/host.h similarity index 99% rename from src/libstrongswan/utils/host.h rename to src/libstrongswan/networking/host.h index a8b010544..cae2a4ff0 100644 --- a/src/libstrongswan/utils/host.h +++ b/src/libstrongswan/networking/host.h @@ -18,7 +18,7 @@ /** * @defgroup host host - * @{ @ingroup utils + * @{ @ingroup networking */ #ifndef HOST_H_ diff --git a/src/libstrongswan/host_resolver.c b/src/libstrongswan/networking/host_resolver.c similarity index 100% rename from src/libstrongswan/host_resolver.c rename to src/libstrongswan/networking/host_resolver.c diff --git a/src/libstrongswan/host_resolver.h b/src/libstrongswan/networking/host_resolver.h similarity index 96% rename from src/libstrongswan/host_resolver.h rename to src/libstrongswan/networking/host_resolver.h index f7b8c7e9f..f944a9cdf 100644 --- a/src/libstrongswan/host_resolver.h +++ b/src/libstrongswan/networking/host_resolver.h @@ -15,13 +15,13 @@ /** * @defgroup host_resolver host_resolver - * @{ @ingroup libstrongswan + * @{ @ingroup networking */ #ifndef HOST_RESOLVER_H_ #define HOST_RESOLVER_H_ -#include "utils/host.h" +#include "host.h" typedef struct host_resolver_t host_resolver_t; diff --git a/src/libstrongswan/selectors/traffic_selector.h b/src/libstrongswan/selectors/traffic_selector.h index 39b8879fd..b6da391aa 100644 --- a/src/libstrongswan/selectors/traffic_selector.h +++ b/src/libstrongswan/selectors/traffic_selector.h @@ -27,7 +27,7 @@ typedef enum ts_type_t ts_type_t; typedef struct traffic_selector_t traffic_selector_t; #include -#include +#include /** * Traffic selector types. diff --git a/src/libstrongswan/utils/packet.h b/src/libstrongswan/utils/packet.h index 5c4440115..b6e28199a 100644 --- a/src/libstrongswan/utils/packet.h +++ b/src/libstrongswan/utils/packet.h @@ -26,7 +26,7 @@ typedef struct packet_t packet_t; #include -#include +#include /** * Abstraction of an IP/UDP-Packet, contains data, sender and receiver. diff --git a/src/libstrongswan/utils/tun_device.h b/src/libstrongswan/utils/tun_device.h index 71af0386b..be97432ff 100644 --- a/src/libstrongswan/utils/tun_device.h +++ b/src/libstrongswan/utils/tun_device.h @@ -24,7 +24,7 @@ #define TUN_DEVICE_H_ #include -#include +#include typedef struct tun_device_t tun_device_t; diff --git a/src/manager/gateway.h b/src/manager/gateway.h index db44a2ffa..99e79eef5 100644 --- a/src/manager/gateway.h +++ b/src/manager/gateway.h @@ -21,7 +21,7 @@ #ifndef GATEWAY_H_ #define GATEWAY_H_ -#include +#include #include typedef struct gateway_t gateway_t;