Move the rest of VQP into proto_vmps

FreeRADIUS · Apr 4, 2013 · bf72e29 · bf72e29
1 parent f538ada
commit bf72e29
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/src/lib/all.mk b/src/lib/all.mk
@@ -8,7 +8,7 @@ TARGET		:= libfreeradius-radius.a
 SOURCES		:= dict.c filters.c hash.c hmac.c hmacsha1.c isaac.c log.c \
 		  misc.c missing.c md4.c md5.c print.c radius.c rbtree.c \
 		  sha1.c snprintf.c strlcat.c strlcpy.c token.c udpfromto.c \
-		  valuepair.c fifo.c packet.c event.c getaddrinfo.c vqp.c \
+		  valuepair.c fifo.c packet.c event.c getaddrinfo.c \
 		  heap.c tcp.c base64.c
 
 SRC_CFLAGS	:= -D_LIBRADIUS -I$(top_builddir)/src

diff --git a/src/main/listen.c b/src/main/listen.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 #include <freeradius-devel/radiusd.h>
 #include <freeradius-devel/modules.h>
 #include <freeradius-devel/rad_assert.h>
-#include <freeradius-devel/vqp.h>
 #include <freeradius-devel/process.h>
 #include <freeradius-devel/protocol.h>
 

diff --git a/src/modules/proto_vmps/all.mk b/src/modules/proto_vmps/all.mk
@@ -4,4 +4,5 @@ ifneq "$(TARGETNAME)" ""
 TARGET		:= $(TARGETNAME).a
 endif
 
-SOURCES		:= vmps.c
+SOURCES		:= vmps.c vqp.c
+
diff --git a/src/modules/proto_vmps/vmps.c b/src/modules/proto_vmps/vmps.c
@@ -26,9 +26,10 @@ RCSID("$Id$")
 #include <freeradius-devel/radiusd.h>
 #include <freeradius-devel/protocol.h>
 #include <freeradius-devel/modules.h>
-#include <freeradius-devel/vqp.h>
 #include <freeradius-devel/rad_assert.h>
 
+#include "vqp.h"
+
 static int vmps_process(REQUEST *request)
 {
 	DEBUG2("Doing VMPS");

diff --git a/src/lib/vqp.c → src/modules/proto_vmps/vqp.c b/src/lib/vqp.c → src/modules/proto_vmps/vqp.c
@@ -24,9 +24,8 @@ RCSID("$Id$");
 
 #include	<freeradius-devel/libradius.h>
 #include	<freeradius-devel/udpfromto.h>
-#include	<freeradius-devel/vqp.h>
 
-#ifdef WITH_VMPS
+#include	"vqp.h"
 
 #define MAX_VMPS_LEN (MAX_STRING_LEN - 1)
 
@@ -690,4 +689,3 @@ int vqp_encode(RADIUS_PACKET *packet, RADIUS_PACKET *original)
 
 	return 0;
 }
-#endif
diff --git a/src/include/vqp.h → src/modules/proto_vmps/vqp.h b/src/include/vqp.h → src/modules/proto_vmps/vqp.h