From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 5 Mar 2024 19:09:04 +0000 (-0600)
Subject: Move time tracking to the server library to avoid circular dependencies
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66ef0b2f7d1937e506f4d4d722d3bfac1b3d98c7;p=thirdparty%2Ffreeradius-server.git

Move time tracking to the server library to avoid circular dependencies
---

diff --git a/src/lib/io/all.mk b/src/lib/io/all.mk
index 800a1b6c76a..aa1fa0852b6 100644
--- a/src/lib/io/all.mk
+++ b/src/lib/io/all.mk
@@ -12,7 +12,6 @@ SOURCES	:= \
 	queue.c \
 	ring_buffer.c \
 	schedule.c \
-	time_tracking.c \
 	worker.c
 
 TGT_PREREQS	:= libfreeradius-util$(L) $(LIBFREERADIUS_SERVER)
diff --git a/src/lib/io/listen.h b/src/lib/io/listen.h
index 88e56401e6f..e4f5948994e 100644
--- a/src/lib/io/listen.h
+++ b/src/lib/io/listen.h
@@ -16,7 +16,7 @@
  */
 #include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
-#include <freeradius-devel/io/time_tracking.h>
+#include <freeradius-devel/server/time_tracking.h>
 
 /** Describes a path data takes to/from the wire to/from fr_pair_ts
  *
diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c
index 0f2f956e504..9295110077f 100644
--- a/src/lib/io/worker.c
+++ b/src/lib/io/worker.c
@@ -55,12 +55,12 @@ RCSID("$Id$")
 #include <freeradius-devel/io/channel.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/message.h>
-#include <freeradius-devel/io/time_tracking.h>
 #include <freeradius-devel/io/worker.h>
 #include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/unlang/call.h>
 #include <freeradius-devel/unlang/interpret.h>
 #include <freeradius-devel/server/request.h>
+#include <freeradius-devel/server/time_tracking.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/minmax_heap.h>
 
diff --git a/src/lib/server/libfreeradius-server.mk b/src/lib/server/libfreeradius-server.mk
index 0ed6e925387..bfc785e602d 100644
--- a/src/lib/server/libfreeradius-server.mk
+++ b/src/lib/server/libfreeradius-server.mk
@@ -38,6 +38,7 @@ SOURCES	:= \
 	tmpl_dcursor.c \
 	tmpl_eval.c \
 	tmpl_tokenize.c \
+	time_tracking.c \
 	trigger.c \
 	trunk.c \
 	users_file.c \
diff --git a/src/lib/io/time_tracking.c b/src/lib/server/time_tracking.c
similarity index 95%
rename from src/lib/io/time_tracking.c
rename to src/lib/server/time_tracking.c
index 0667f89b4c1..da5497cdc82 100644
--- a/src/lib/io/time_tracking.c
+++ b/src/lib/server/time_tracking.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/io/time_tracking.h>
+#include <freeradius-devel/server/time_tracking.h>
 
 fr_table_num_ordered_t fr_time_tracking_state_table[] = {
 	{ L("STOPPED"),		FR_TIME_TRACKING_STOPPED	},
diff --git a/src/lib/io/time_tracking.h b/src/lib/server/time_tracking.h
similarity index 100%
rename from src/lib/io/time_tracking.h
rename to src/lib/server/time_tracking.h
diff --git a/src/lib/unlang/all.mk b/src/lib/unlang/all.mk
index bfe2efff8d2..2ad383d62c5 100644
--- a/src/lib/unlang/all.mk
+++ b/src/lib/unlang/all.mk
@@ -42,7 +42,7 @@ SOURCES	:=	base.c \
 
 HEADERS		:= $(subst src/lib/,,$(wildcard src/lib/unlang/*.h))
 
-TGT_PREREQS	:= libfreeradius-util$(L) libfreeradius-server$(L) libfreeradius-io$(L)
+TGT_PREREQS	:= libfreeradius-util$(L) libfreeradius-server$(L)
 
 ifneq ($(MAKECMDGOALS),scan)
 SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"