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 5355ab74cfbc080e0e636c7379770120ade6ee2e..d85da519b5be079b7c6ce8515b2f798fee0e06c3 100644 (file)
--- 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 1f0a0d46416ff29f81b06a53f315dacdbbe20df1..e3d8e10aeeb921b98316877d02c2ca8d00d50b61 100644 (file)
--- 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 6a38436da1fee4b8294ece94ddc1080b3e8b5be1..873a9f65527d5df7f41c65a47a71c4d7eae24869 100644 (file)
--- 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 3745ddb1a6caeef71f73859b9f40962a1aca966e..6367759f016410b93695a334d76aa36fabfefc14 100644 (file)
--- 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 2cddc9b1b95863e7eca60499288ed01ba648ee53..84e2446b28d5a5b1b791846c180420c97152bc9a 100644 (file)
--- 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 3f318826b34db7db62b7171680d7c05d9e1b7945..ad4285b4ce0bcd9c630b23a9ed46ea5013d6446b 100644 (file)
--- 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 ae0c05085307777dcae378e03498242d7ac007bd..4aefbbc97da0c536ebd728dfb3a8c24f38b6dc80 100644 (file)
--- 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 5ac121800f2d283709654b5158044518f7ff1930..e71887d4dc62efb89916235704fd8b88b86e5c20 100644 (file)
--- 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"