From 5e644203ec2251e04a609683209d6433030dc75c Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Wed, 23 Nov 2005 16:17:28 +0000
Subject: [PATCH] - moved host_t from util to network

---
 Source/charon/config/configuration_manager.h | 2 +-
 Source/charon/network/Makefile.network       | 8 ++++++--
 Source/charon/{utils => network}/host.c      | 0
 Source/charon/{utils => network}/host.h      | 0
 Source/charon/network/packet.h               | 2 +-
 Source/charon/utils/Makefile.utils           | 4 ----
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename Source/charon/{utils => network}/host.c (100%)
 rename Source/charon/{utils => network}/host.h (100%)

diff --git a/Source/charon/config/configuration_manager.h b/Source/charon/config/configuration_manager.h
index b192c0cf7..a3bc099fd 100644
--- a/Source/charon/config/configuration_manager.h
+++ b/Source/charon/config/configuration_manager.h
@@ -25,7 +25,7 @@
 
 #include <types.h>
 #include <utils/linked_list.h>
-#include <utils/host.h>
+#include <network/host.h>
 #include <encoding/payloads/transform_substructure.h>
 #include <transforms/prfs/prf.h>
 #include <transforms/signers/signer.h>
diff --git a/Source/charon/network/Makefile.network b/Source/charon/network/Makefile.network
index 3d600aced..034468354 100644
--- a/Source/charon/network/Makefile.network
+++ b/Source/charon/network/Makefile.network
@@ -18,7 +18,11 @@ NETWORK_DIR= $(MAIN_DIR)network/
 OBJS+= $(BUILD_DIR)packet.o
 $(BUILD_DIR)packet.o :		$(NETWORK_DIR)packet.c $(NETWORK_DIR)packet.h
 							$(CC) $(CFLAGS) -c -o $@ $<
-				
+
 OBJS+= $(BUILD_DIR)socket.o
 $(BUILD_DIR)socket.o :		$(NETWORK_DIR)socket.c $(NETWORK_DIR)socket.h
-							$(CC) $(CFLAGS) -c -o $@ $<				
\ No newline at end of file
+							$(CC) $(CFLAGS) -c -o $@ $<
+
+OBJS+= $(BUILD_DIR)host.o
+$(BUILD_DIR)host.o :		$(NETWORK_DIR)host.c $(NETWORK_DIR)host.h
+							$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/Source/charon/utils/host.c b/Source/charon/network/host.c
similarity index 100%
rename from Source/charon/utils/host.c
rename to Source/charon/network/host.c
diff --git a/Source/charon/utils/host.h b/Source/charon/network/host.h
similarity index 100%
rename from Source/charon/utils/host.h
rename to Source/charon/network/host.h
diff --git a/Source/charon/network/packet.h b/Source/charon/network/packet.h
index 10488e0aa..b91756a03 100644
--- a/Source/charon/network/packet.h
+++ b/Source/charon/network/packet.h
@@ -25,7 +25,7 @@
 
 
 #include <types.h>
-#include <utils/host.h>
+#include <network/host.h>
 
 
 
diff --git a/Source/charon/utils/Makefile.utils b/Source/charon/utils/Makefile.utils
index 20ea9f7b0..e66a0601f 100644
--- a/Source/charon/utils/Makefile.utils
+++ b/Source/charon/utils/Makefile.utils
@@ -23,10 +23,6 @@ OBJS+= $(BUILD_DIR)gmp_helper.o
 $(BUILD_DIR)gmp_helper.o :		$(UTILS_DIR)gmp_helper.c $(UTILS_DIR)gmp_helper.h
 								$(CC) $(CFLAGS) -c -o $@ $<
 
-OBJS+= $(BUILD_DIR)host.o
-$(BUILD_DIR)host.o :			$(UTILS_DIR)host.c $(UTILS_DIR)host.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
 OBJS+= $(BUILD_DIR)linked_list.o
 $(BUILD_DIR)linked_list.o :		$(UTILS_DIR)linked_list.c $(UTILS_DIR)linked_list.h
 								$(CC) $(CFLAGS) -c -o $@ $<