From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 15 Jan 2018 15:34:44 +0000 (-0500)
Subject: move tracking to proto_radius
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a88e09f8e7137461e164bd1be73c8f6edaabbc2;p=thirdparty%2Ffreeradius-server.git

move tracking to proto_radius
---

diff --git a/src/lib/io/all.mk b/src/lib/io/all.mk
index 9434dbfc143..2190aed8514 100644
--- a/src/lib/io/all.mk
+++ b/src/lib/io/all.mk
@@ -1,6 +1,6 @@
 TARGET	:= libfreeradius-io.a
 
-SOURCES	:=	ring_buffer.c message.c atomic_queue.c queue.c time.c channel.c track.c worker.c \
+SOURCES	:=	ring_buffer.c message.c atomic_queue.c queue.c time.c channel.c worker.c \
 		schedule.c network.c control.c
 
 TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-util.la
diff --git a/src/modules/proto_radius/proto_radius_udp.c b/src/modules/proto_radius/proto_radius_udp.c
index ef40d68942f..21b5a6e97ae 100644
--- a/src/modules/proto_radius/proto_radius_udp.c
+++ b/src/modules/proto_radius/proto_radius_udp.c
@@ -30,11 +30,11 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/io.h>
 #include <freeradius-devel/io/application.h>
-#include <freeradius-devel/io/track.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/rad_assert.h>
 #include "proto_radius.h"
+#include "track.h"
 
 typedef struct {
 	int				if_index;
diff --git a/src/modules/proto_radius/proto_radius_udp.mk b/src/modules/proto_radius/proto_radius_udp.mk
index 7c9f315820e..a169a7028c8 100644
--- a/src/modules/proto_radius/proto_radius_udp.mk
+++ b/src/modules/proto_radius/proto_radius_udp.mk
@@ -4,6 +4,6 @@ ifneq "$(TARGETNAME)" ""
 TARGET		:= $(TARGETNAME).a
 endif
 
-SOURCES		:= proto_radius_udp.c
+SOURCES		:= proto_radius_udp.c track.c
 
 TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
diff --git a/src/lib/io/track.c b/src/modules/proto_radius/track.c
similarity index 99%
rename from src/lib/io/track.c
rename to src/modules/proto_radius/track.c
index 413521b0c4f..e4d5423409b 100644
--- a/src/lib/io/track.c
+++ b/src/modules/proto_radius/track.c
@@ -24,9 +24,9 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/io/track.h>
 #include <freeradius-devel/rbtree.h>
 #include <freeradius-devel/rad_assert.h>
+#include "track.h"
 
 /**
  *  RADIUS-specific tracking table.
diff --git a/src/lib/io/track.h b/src/modules/proto_radius/track.h
similarity index 100%
rename from src/lib/io/track.h
rename to src/modules/proto_radius/track.h
diff --git a/src/modules/proto_vmps/proto_vmps_udp.c b/src/modules/proto_vmps/proto_vmps_udp.c
index 7c17e4a3461..61c7c2baf54 100644
--- a/src/modules/proto_vmps/proto_vmps_udp.c
+++ b/src/modules/proto_vmps/proto_vmps_udp.c
@@ -28,7 +28,6 @@
 #include <freeradius-devel/udp.h>
 #include <freeradius-devel/io/io.h>
 #include <freeradius-devel/io/application.h>
-#include <freeradius-devel/io/track.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/rad_assert.h>
 #include "proto_vmps.h"