Moved host_t and host_resolver_t to a new networking subfolder

diff --git a/scripts/tls_test.c b/scripts/tls_test.c
index 560c4a4ba001652a241d66952ef95d55f005a30b..3bdb345298b78bb908250951783352fb649237b6 100644 (file)
--- a/scripts/tls_test.c
+++ b/scripts/tls_test.c
@@ -24,7 +24,7 @@
 #include <library.h>
 #include <debug.h>
 #include <tls_socket.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <credentials/sets/mem_cred.h>
 
 /**

diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
index 1eeaccaf68ba80a0d783e9a1450f05eff8d61510..6fa5e51a42d7f7c34400b39b3b27a521a93962a8 100644 (file)
--- 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 <daemon.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/identification.h>
 #include <config/peer_cfg.h>
 #include <credentials/certificates/x509.h>

diff --git a/src/dumm/iface.h b/src/dumm/iface.h
index e96ee508c9fbf9a9b5ec1b34221a53a4d32039f4..c43113abdeddb12985458f1cd91e297bcf0b06fd 100644 (file)
--- a/src/dumm/iface.h
+++ b/src/dumm/iface.h
@@ -18,7 +18,7 @@
 
 #include <library.h>
 #include <utils/enumerator.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 #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 634816405e2dcfd35b8d291e37701c4c37850df6..a35103b8950ed59e13b45c8cfab37ca5c5621160 100644 (file)
--- 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 <jni.h>
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 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 82efd05f738e7bd52f8805110ceebac545df6660..209090896d7a38b7cefff8479674348ed8dac683 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/vpnservice_builder.h
+++ b/src/frontends/android/jni/libandroidbridge/vpnservice_builder.h
@@ -26,7 +26,7 @@
 #include <jni.h>
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 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 463a57bac91be85e3f345c8a8589011860252faf..cc8ef8785e15bc857e88631ccac8a419ac35e8ab 100644 (file)
--- 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/identification.h>
 #include <config/ike_cfg.h>
 #include <config/peer_cfg.h>

diff --git a/src/libcharon/config/ike_cfg.h b/src/libcharon/config/ike_cfg.h
index 5f48e9660c2a4e75aa3bbaaf57ab6af6ffc56a5d..dc58329278422b299c60a70b9745f9cc17880d6f 100644 (file)
--- 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/linked_list.h>
 #include <utils/identification.h>
 #include <config/proposal.h>

diff --git a/src/libcharon/config/proposal.h b/src/libcharon/config/proposal.h
index 33abf006ccd23d8e4ea7eb508deab0794ee9f1ea..ff6267dae17d0fbe71b84ee58badea4eba0f2a20 100644 (file)
--- a/src/libcharon/config/proposal.h
+++ b/src/libcharon/config/proposal.h
@@ -28,7 +28,7 @@ typedef struct proposal_t proposal_t;
 #include <library.h>
 #include <utils/identification.h>
 #include <utils/linked_list.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <crypto/transform.h>
 #include <crypto/crypters/crypter.h>
 #include <crypto/signers/signer.h>

diff --git a/src/libcharon/encoding/payloads/traffic_selector_substructure.h b/src/libcharon/encoding/payloads/traffic_selector_substructure.h
index 1ad5fb526c963c6572125fbf6cae1877d1320e2c..d3fbe84768ce5a19d7a66643b0bfd317a1602114 100644 (file)
--- 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <selectors/traffic_selector.h>
 #include <encoding/payloads/payload.h>
 

diff --git a/src/libcharon/network/receiver.h b/src/libcharon/network/receiver.h
index 9e8edee459ad51b628cef9f0a2910dd8ebd5f2f7..82153613fcf2bba3660a91783a8656a0709f934c 100644 (file)
--- a/src/libcharon/network/receiver.h
+++ b/src/libcharon/network/receiver.h
@@ -26,7 +26,7 @@
 typedef struct receiver_t receiver_t;
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/packet.h>
 
 /**

diff --git a/src/libcharon/plugins/android/android_handler.c b/src/libcharon/plugins/android/android_handler.c
index c5f51ef04a14c24e3d033ca1ba61c77abfa7d98e..c5e98d315d7f2d65f2713eb371028b210b8cb217 100644 (file)
--- 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 <utils/host.h>
+#include <networking/host.h>
 #include <utils/linked_list.h>
 
 #include <cutils/properties.h>

diff --git a/src/libcharon/plugins/dhcp/dhcp_transaction.h b/src/libcharon/plugins/dhcp/dhcp_transaction.h
index 19c163f88c807b17625df4cc08c09214403c3691..35f08e83643fdeb8c8f6c68ea8c3c12318e31c2c 100644 (file)
--- 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 <utils/host.h>
+#include <networking/host.h>
 #include <utils/identification.h>
 #include <attributes/attributes.h>
 

diff --git a/src/libcharon/plugins/farp/farp_listener.h b/src/libcharon/plugins/farp/farp_listener.h
index 3155f60e25ae5fa166559c205ec94fcc787ef9d4..c7dc56a10c6dbb8639e177c1cd10cbe7b867812f 100644 (file)
--- 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 <utils/host.h>
+#include <networking/host.h>
 #include <bus/listeners/listener.h>
 
 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 8cd30f7115cfe7c3a5d0b5f0e9939b0233176161..2ccb1fc55ef90e2c62e1da3c2fa5719c208582d4 100644 (file)
--- 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/identification.h>
 #include <sa/ike_sa_id.h>
 #include <selectors/traffic_selector.h>

diff --git a/src/libcharon/plugins/ha/ha_socket.c b/src/libcharon/plugins/ha/ha_socket.c
index 5196a5dc7d6bf9ff4fbaec38842d9e245b82d187..e41e78bbf03f6ca46967f4c28b3a04e6a2ab7680 100644 (file)
--- a/src/libcharon/plugins/ha/ha_socket.c
+++ b/src/libcharon/plugins/ha/ha_socket.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include <daemon.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <threading/thread.h>
 #include <processing/jobs/callback_job.h>
 

diff --git a/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.h b/src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.h
index 4bf421e332c1575fd28e03205945e6b8e0e4a8c3..4efdc779f35e7c7dcf930ef4055b2261a721c4f1 100644 (file)
--- 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <sa/ike_sa.h>
 
 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 09679c734019fab1e3b02eb905d683bc9709c7ed..30c0ad0ac56d5de2b41d4fa43af421441007b7a0 100644 (file)
--- 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <selectors/traffic_selector.h>
 #include <kernel/kernel_ipsec.h>
 #include <processing/jobs/job.h>

diff --git a/src/libcharon/processing/jobs/update_sa_job.h b/src/libcharon/processing/jobs/update_sa_job.h
index e2344fcc41f211cfd91927fc504559a5ad13919f..55a3df83edf928b93ad60f14a0e7c1756f538413 100644 (file)
--- 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <processing/jobs/job.h>
 
 /**

diff --git a/src/libhydra/attributes/attribute_provider.h b/src/libhydra/attributes/attribute_provider.h
index e5e556fc4867a7fcf4ddc525f24293c35554b07e..82d0ee3c2095923999199fcfe060db2dbcc993f3 100644 (file)
--- 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 <utils/host.h>
+#include <networking/host.h>
 #include <utils/identification.h>
 #include <utils/linked_list.h>
 

diff --git a/src/libhydra/attributes/mem_pool.h b/src/libhydra/attributes/mem_pool.h
index fa4e6485c72c78e51fb20c7e91abbb57b5f83b39..692885ecd4496c931d49b7c347c0ff9be42abeb7 100644 (file)
--- 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 <utils/host.h>
+#include <networking/host.h>
 #include <utils/identification.h>
 
 /**

diff --git a/src/libhydra/kernel/kernel_interface.h b/src/libhydra/kernel/kernel_interface.h
index 88d4a5bce36b018fb021487659b373991c8deb21..7058466b18bb9da7515c599b63344717e52794e9 100644 (file)
--- 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 <utils/host.h>
+#include <networking/host.h>
 #include <crypto/prf_plus.h>
 
 #include <kernel/kernel_listener.h>

diff --git a/src/libhydra/kernel/kernel_ipsec.h b/src/libhydra/kernel/kernel_ipsec.h
index ee0ade2aa13a101296a296d36e1a7b461374e503..1da0805cb9dd382016604bb790055fcf88925aa2 100644 (file)
--- 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 <utils/host.h>
+#include <networking/host.h>
 #include <ipsec/ipsec_types.h>
 #include <selectors/traffic_selector.h>
 #include <plugins/plugin.h>

diff --git a/src/libhydra/kernel/kernel_listener.h b/src/libhydra/kernel/kernel_listener.h
index 5db297b6fe6e04b2d19fd128495c2ba9f0b6bd6f..27ea947ebc9d1960c3fbdb1519baa84bcae4c3dd 100644 (file)
--- 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 <kernel/kernel_ipsec.h>
 #include <selectors/traffic_selector.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 /**
  * Interface for components interested in kernel events.

diff --git a/src/libhydra/kernel/kernel_net.h b/src/libhydra/kernel/kernel_net.h
index 10350d644f94f148a4792c5b81cd508fef44aa73..0de93eaeedc5bd5bc0be825302023dc9b5fb15b6 100644 (file)
--- 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 <utils/enumerator.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <plugins/plugin.h>
 
 /**

diff --git a/src/libhydra/plugins/attr_sql/pool.c b/src/libhydra/plugins/attr_sql/pool.c
index a2000cffe83288d4ebdcf12ca9f32b9382e72233..1d5fddbb7cbc484472176c519b6d2b45b4e0490c 100644 (file)
--- a/src/libhydra/plugins/attr_sql/pool.c
+++ b/src/libhydra/plugins/attr_sql/pool.c
@@ -23,7 +23,7 @@
 
 #include <debug.h>
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/identification.h>
 #include <attributes/attributes.h>
 

diff --git a/src/libhydra/plugins/attr_sql/pool_attributes.c b/src/libhydra/plugins/attr_sql/pool_attributes.c
index d3fc06eeb984fc038e6ec91a39da5a471bb08312..5dcfe85edaeb55fe63d116ac5035b782b0d1dcef 100644 (file)
--- a/src/libhydra/plugins/attr_sql/pool_attributes.c
+++ b/src/libhydra/plugins/attr_sql/pool_attributes.c
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 #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 b099bc714205036b6f492395fdbd00308f8ca76f..ed541ad67ca08a374aa1a865701c71cebf2ffd59 100644 (file)
--- 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 <hydra.h>
 #include <debug.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/linked_list.h>
 #include <utils/hashtable.h>
 #include <threading/thread.h>

diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
index 47a8829f79863ef48b899af759ef795fe5b19a6c..0ead657858f93d9df88a9bcbe6fdcd6dd6dd836d 100644 (file)
--- 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 <hydra.h>
 #include <debug.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>

diff --git a/src/libipsec/esp_packet.h b/src/libipsec/esp_packet.h
index a1d1602c1db4786a258020f9413954cc816ba8ba..4586379b0c4b3ad84ae3dfada75779a1c03e23b9 100644 (file)
--- a/src/libipsec/esp_packet.h
+++ b/src/libipsec/esp_packet.h
@@ -27,7 +27,7 @@
 #include "esp_context.h"
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/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 b4fc298ff348d6b70a7e2a42104924f4fba90229..722662af78796a4ca53637cad146cd54f0deee9c 100644 (file)
--- a/src/libipsec/ip_packet.h
+++ b/src/libipsec/ip_packet.h
@@ -22,7 +22,7 @@
 #define IP_PACKET_H_
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/packet.h>
 
 typedef struct ip_packet_t ip_packet_t;

diff --git a/src/libipsec/ipsec_policy.h b/src/libipsec/ipsec_policy.h
index 67ad0b0ed3e7f2ddc841b53bf8a62ae5b15767d9..23a9ea99d21b8dfbe2dd4dc763682d7b750c523a 100644 (file)
--- a/src/libipsec/ipsec_policy.h
+++ b/src/libipsec/ipsec_policy.h
@@ -26,7 +26,7 @@
 #include "ip_packet.h"
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <ipsec/ipsec_types.h>
 #include <selectors/traffic_selector.h>
 

diff --git a/src/libipsec/ipsec_policy_mgr.h b/src/libipsec/ipsec_policy_mgr.h
index d3ee1074f13b925643ea2627c27eadbc568bbf0d..ae0a29868f9c6f5428a62eed1b84b74c374155de 100644 (file)
--- a/src/libipsec/ipsec_policy_mgr.h
+++ b/src/libipsec/ipsec_policy_mgr.h
@@ -27,7 +27,7 @@
 #include "ip_packet.h"
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/linked_list.h>
 #include <ipsec/ipsec_types.h>
 #include <selectors/traffic_selector.h>

diff --git a/src/libipsec/ipsec_sa.h b/src/libipsec/ipsec_sa.h
index 271e0129fe8d9c252d1e22df4481416d1fe82dc9..dec688e687e79e73f3078952d75e54b83352017c 100644 (file)
--- a/src/libipsec/ipsec_sa.h
+++ b/src/libipsec/ipsec_sa.h
@@ -26,7 +26,7 @@
 #include "esp_context.h"
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <selectors/traffic_selector.h>
 #include <ipsec/ipsec_types.h>
 

diff --git a/src/libipsec/ipsec_sa_mgr.h b/src/libipsec/ipsec_sa_mgr.h
index db30a86bbb66d2285af6e544e9eabbf2ed83a58a..3ff0920382ead537f71e88a82338c12724ee85ee 100644 (file)
--- a/src/libipsec/ipsec_sa_mgr.h
+++ b/src/libipsec/ipsec_sa_mgr.h
@@ -28,7 +28,7 @@
 #include <library.h>
 #include <ipsec/ipsec_types.h>
 #include <selectors/traffic_selector.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 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 acdac78c9f9f5712b61aa3693b4d0a9f55b46c3c..143cfa1a53d0f61054808e86772f79340b790a65 100644 (file)
--- a/src/libradius/radius_client.c
+++ b/src/libradius/radius_client.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 
 #include <debug.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/linked_list.h>
 #include <threading/condvar.h>
 #include <threading/mutex.h>

diff --git a/src/libradius/radius_socket.h b/src/libradius/radius_socket.h
index 07d642c08fffc8837fb6d41679ba130e6ee8157c..eb510ea89837bd43e92068894e8a2337ba3c5db5 100644 (file)
--- 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 <utils/host.h>
+#include <networking/host.h>
 
 /**
  * RADIUS socket to a server.

diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 9c7ef1d0a1917b90983603ceddafcee6f3601235..fb224a28b302b1c7823904c368dbe9633b5f5e46 100644 (file)
--- 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 4017bfcc2f98150a45666c5c975ea54033e47f2a..4b8279f7a0e0d7c61c71df821bb82edda8af10d6 100644 (file)
--- 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 a42d68cbcb2cf4a677fd76f12e969a0b07216cf8..90a865a7867f8144460aa779aaaa98e25c74e496 100644 (file)
--- a/src/libstrongswan/library.c
+++ b/src/libstrongswan/library.c
@@ -21,7 +21,7 @@
 #include <debug.h>
 #include <threading/thread.h>
 #include <utils/identification.h>
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/hashtable.h>
 #include <utils/backtrace.h>
 #include <selectors/traffic_selector.h>

diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index 5bd0d67ebd653e0e8b0491de67cad3d7190a49c9..a2de74986c3aee29c28b178dcaebe4e51270c014 100644 (file)
--- 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 a8b01054494f00b12cde1453617a06f0668b1ed1..cae2a4ff0b18d42d496b21adab84cd3e80ffbb9c 100644 (file)
--- 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 f7b8c7e9fdc8539f5922d4fbd8903a1ad32740a7..f944a9cdf6680f51d1d674bc4f911e1a0e743e0c 100644 (file)
--- 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 39b8879fd567dd9c1ffcf03dde165b866b24e5ab..b6da391aa14b22293bc39cbfd647004c74e18ea3 100644 (file)
--- 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 /**
  * Traffic selector types.

diff --git a/src/libstrongswan/utils/packet.h b/src/libstrongswan/utils/packet.h
index 5c4440115f31301a4716b377ea054d7df088697a..b6e28199a702c5957eab5c5691f87bc87ab5326a 100644 (file)
--- a/src/libstrongswan/utils/packet.h
+++ b/src/libstrongswan/utils/packet.h
@@ -26,7 +26,7 @@
 typedef struct packet_t packet_t;
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 /**
  * 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 71af0386b4eb5472b878d08780281eeac1fb5737..be97432ff5836d917a757326d6be005ae1d0000b 100644 (file)
--- a/src/libstrongswan/utils/tun_device.h
+++ b/src/libstrongswan/utils/tun_device.h
@@ -24,7 +24,7 @@
 #define TUN_DEVICE_H_
 
 #include <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 typedef struct tun_device_t tun_device_t;
 

diff --git a/src/manager/gateway.h b/src/manager/gateway.h
index db44a2ffa692b323f30d9009229a49b5dbb0ddd6..99e79eef5ebaf3494abbed1d63e3ddecf4972d06 100644 (file)
--- a/src/manager/gateway.h
+++ b/src/manager/gateway.h
@@ -21,7 +21,7 @@
 #ifndef GATEWAY_H_
 #define GATEWAY_H_
 
-#include <utils/host.h>
+#include <networking/host.h>
 #include <utils/enumerator.h>
 
 typedef struct gateway_t gateway_t;