move tracking to proto_radius

diff --git a/src/lib/io/all.mk b/src/lib/io/all.mk
index 9434dbfc143df8451255662c2224bf65a4bf0a3d..2190aed8514e2f38ae13ae150c0b202e43260348 100644 (file)
--- 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 ef40d68942fd4789bd12c56c82dbd3689060f14e..21b5a6e97aedd0382a37baad9ffef213c3d3cac4 100644 (file)
--- 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 7c9f315820e39438b82819001ce0da2edcff8388..a169a7028c80290f2463ebf184b63423d3f7fa18 100644 (file)
--- 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 413521b0c4ff17842ae58068eb4acdfa47ac940f..e4d5423409bf19c56a8ad971047ce3037cbee38d 100644 (file)
--- 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 7c17e4a3461552087ebe8af6b6458c442d684a3e..61c7c2baf544a295b2adafda172d6bff676e9dc6 100644 (file)
--- 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"