From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 11 Oct 2018 19:32:52 +0000 (-0400)
Subject: move struct.[ch] to src/lib/util
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7253eaa4009bfdf83f31e8a0917b3f00eb8938e4;p=thirdparty%2Ffreeradius-server.git

move struct.[ch] to src/lib/util

which is where most things need it to be
---

diff --git a/src/bin/radclient.mk b/src/bin/radclient.mk
index 5355ab74cfb..d85da519b5b 100644
--- a/src/bin/radclient.mk
+++ b/src/bin/radclient.mk
@@ -2,7 +2,7 @@ TARGET		:= radclient
 SOURCES		:= radclient.c ${top_srcdir}/src/modules/rlm_mschap/smbdes.c \
 		   ${top_srcdir}/src/modules/rlm_mschap/mschap.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 
 SRC_CFLAGS	:= -I${top_srcdir}/src/modules/rlm_mschap
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/bin/radsniff.mk b/src/bin/radsniff.mk
index 1f0a0d46416..e3d8e10aeeb 100644
--- a/src/bin/radsniff.mk
+++ b/src/bin/radsniff.mk
@@ -8,6 +8,6 @@ endif
 
 SOURCES		:= radsniff.c collectd.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 TGT_LDLIBS	:= $(LIBS) $(PCAP_LIBS) $(COLLECTDC_LIBS)
 TGT_LDFLAGS     := $(LDFLAGS) $(PCAP_LDFLAGS) $(COLLECTDC_LDFLAGS)
diff --git a/src/bin/radsnmp.mk b/src/bin/radsnmp.mk
index 6a38436da1f..873a9f65527 100644
--- a/src/bin/radsnmp.mk
+++ b/src/bin/radsnmp.mk
@@ -1,6 +1,6 @@
 TARGET		:= radsnmp
 SOURCES		:= radsnmp.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/lib/io/all.mk b/src/lib/io/all.mk
index 3745ddb1a6c..6367759f016 100644
--- a/src/lib/io/all.mk
+++ b/src/lib/io/all.mk
@@ -1,7 +1,7 @@
 TARGET	:= libfreeradius-io.a
 
 SOURCES	:=	ring_buffer.c message.c atomic_queue.c queue.c time.c channel.c worker.c \
-		schedule.c network.c control.c master.c app_io.c struct.c
+		schedule.c network.c control.c master.c app_io.c
 
 TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.la
 TGT_LDLIBS	:= $(LIBS)
diff --git a/src/lib/util/all.mk b/src/lib/util/all.mk
index 2cddc9b1b95..84e2446b28d 100644
--- a/src/lib/util/all.mk
+++ b/src/lib/util/all.mk
@@ -42,6 +42,7 @@ SOURCES		:= \
 		   strerror.c \
 		   strlcat.c \
 		   strlcpy.c \
+		   struct.c \
 		   syserror.c \
 		   talloc.c \
 		   token.c \
diff --git a/src/lib/io/struct.c b/src/lib/util/struct.c
similarity index 99%
rename from src/lib/io/struct.c
rename to src/lib/util/struct.c
index 3f318826b34..ad4285b4ce0 100644
--- a/src/lib/io/struct.c
+++ b/src/lib/util/struct.c
@@ -16,7 +16,7 @@
 
 /** Functions to encode / decode structures on the wire
  *
- * @file src/lib/io/struct.c
+ * @file src/lib/util/struct.c
  *
  * @copyright 2018 The FreeRADIUS server project
  * @copyright 2018 Alan DeKok <aland@freeradius.org>
diff --git a/src/lib/io/struct.h b/src/lib/util/struct.h
similarity index 97%
rename from src/lib/io/struct.h
rename to src/lib/util/struct.h
index ae0c0508530..4aefbbc97da 100644
--- a/src/lib/io/struct.h
+++ b/src/lib/util/struct.h
@@ -17,7 +17,7 @@
 
 /** Boxed value structures and functions to manipulate them
  *
- * @file src/lib/io/struct.h
+ * @file src/lib/util/struct.h
  *
  * @copyright 2018 Alan DeKok <aland@freeradius.org>
  */
diff --git a/src/protocols/radius/decode.c b/src/protocols/radius/decode.c
index 5ac121800f2..e71887d4dc6 100644
--- a/src/protocols/radius/decode.c
+++ b/src/protocols/radius/decode.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/md5.h>
-#include <freeradius-devel/io/struct.h>
+#include <freeradius-devel/util/struct.h>
 #include <freeradius-devel/io/test_point.h>
 #include "attrs.h"