11 files changed, 20 insertions, 14 deletions
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 <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 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
index 1d0614001..1d0614001 100644
--- a/src/libstrongswan/utils/host.c
+++ b/src/libstrongswan/networking/host.c
diff --git a/src/libstrongswan/utils/host.h b/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
index 55b07d318..55b07d318 100644
--- a/src/libstrongswan/host_resolver.c
+++ b/src/libstrongswan/networking/host_resolver.c
diff --git a/src/libstrongswan/host_resolver.h b/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 <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 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 <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 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 <library.h>
-#include <utils/host.h>
+#include <networking/host.h>
 
 typedef struct tun_device_t tun_device_t;