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 800a1b6c76a7968e7b4c777e0cb587cc1d8c316f..aa1fa0852b69ffce6b029375455756b3c41b17d8 100644 (file)
--- 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 88e56401e6f55f193c8954fe84c92f81f2e8e506..e4f5948994e85c9193ef057eb04fe597e3df5341 100644 (file)
--- 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 0f2f956e504a8196fc8fb29100157a27ae6f7383..9295110077f8588545aef3a545a818258b473873 100644 (file)
--- 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 0ed6e925387f0c206ec73e3b67e80b5b38102447..bfc785e602d93809a90d34463e876ef083f9383e 100644 (file)
--- 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 0667f89b4c10fe8664942434c8c71bd9aa7108d0..da5497cdc82f01b50d6a1ec5c41ca2f171f25daa 100644 (file)
--- 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 bfe2efff8d237066b8c3350d2bbca584360225f3..2ad383d62c593a4f0ec5d789e34a8348017458bf 100644 (file)
--- 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)\"