Move RADIUS to it's own protocol directory

debian/control.in

@@ -93,7 +93,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends}
 Conflicts: libfreeradius3
 Description: FreeRADIUS shared library
- The FreeRADIUS projects' libfreeradius-util and libfreeradius-eap, used by
+ The FreeRADIUS projects' libfreeradius-util, libfreeradius-radius and libfreeradius-eap, used by
  the FreeRADIUS server and some of the utilities.
 
 Package: libfreeradius-dev

debian/libfreeradius-dev.install

@@ -1,3 +1,4 @@
 usr/lib/freeradius/libfreeradius-util.a
+usr/lib/freeradius/libfreeradius-radius.a
 usr/lib/freeradius/libfreeradius-eap.a
 usr/include/freeradius/*.h

debian/libfreeradius4.install

@@ -1,3 +1,4 @@
 usr/lib/freeradius/libfreeradius-server.so
 usr/lib/freeradius/libfreeradius-util.so
+usr/lib/freeradius/libfreeradius-radius.so
 usr/lib/freeradius/libfreeradius-eap.so

src/all.mk

@@ -1,4 +1,4 @@
 # add this dependency BEFORE including the other submakefiles.
 all:
 
-SUBMAKEFILES := include/all.mk lib/all.mk modules/all.mk main/all.mk tests/all.mk
+SUBMAKEFILES := $(filter-out %/freeradius-devel/all.mk,$(wildcard ${top_srcdir}/src/*/all.mk))

src/lib/util/all.mk

@@ -31,10 +31,6 @@ SOURCES		:= base64.c \
 		   pcap.c \
 		   print.c \
 		   proto.c \
-		   radius.c \
-		   radius_packet.c \
-		   radius_encode.c \
-		   radius_decode.c \
 		   rand.c \
 		   rbtree.c \
 		   regex.c \
@@ -51,8 +47,7 @@ SOURCES		:= base64.c \
 		   udpfromto.c \
 		   udp.c \
 		   value.c \
-		   version.c \
-		   packet.c
+		   version.c
 
 SRC_CFLAGS	:= -D_LIBRADIUS -I$(top_builddir)/src
 

src/main/radclient.mk

@@ -2,7 +2,7 @@ TARGET		:= radclient
 SOURCES		:= radclient.c ${top_srcdir}/src/modules/rlm_mschap/smbdes.c \
 		   ${top_srcdir}/src/modules/rlm_mschap/mschap.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 
 SRC_CFLAGS	:= -I${top_srcdir}/src/modules/rlm_mschap
 TGT_LDLIBS	:= $(LIBS)

src/main/radiusd.mk

@@ -31,7 +31,7 @@ SRC_CFLAGS	:=
 TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS	:= $(LIBS) $(LCRYPT) $(SYSTEMD_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(SYSTEMD_LDFLAGS)
-TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a libfreeradius-radius.a
 
 # Libraries can't depend on libraries (oops), so make the binary
 # depend on the EAP code...

src/main/radsniff.mk.in

@@ -8,6 +8,6 @@ endif
 
 SOURCES		:= radsniff.c collectd.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 TGT_LDLIBS	:= $(LIBS) $(PCAP_LIBS) $(COLLECTDC_LIBS)
 TGT_LDFLAGS     := $(LDFLAGS) $(PCAP_LDFLAGS) $(COLLECTDC_LDFLAGS)

src/main/radsnmp.mk

@@ -1,6 +1,6 @@
 TARGET		:= radsnmp
 SOURCES		:= radsnmp.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 
 TGT_LDLIBS	:= $(LIBS)

src/main/radwho.mk

@@ -1,5 +1,5 @@
 TARGET		:= radwho
 SOURCES		:= radwho.c
 
-TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a libfreeradius-radius.a
 TGT_LDLIBS	:= $(LIBS)

src/main/unit_test_attribute.mk

@@ -1,5 +1,5 @@
 TARGET		:= unit_test_attribute
 SOURCES		:= unit_test_attribute.c
 
-TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a libfreeradius-dhcp.a libfreeradius-tacacs.a
+TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a libfreeradius-radius.a libfreeradius-dhcp.a libfreeradius-tacacs.a
 TGT_LDLIBS	:= $(LIBS)

src/main/unit_test_map.mk

@@ -1,5 +1,5 @@
 TARGET		:= unit_test_map
 SOURCES		:= unit_test_map.c ${top_srcdir}/src/main/unlang_compile.c ${top_srcdir}/src/main/unlang_interpret.c
 
-TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a libfreeradius-radius.a
 TGT_LDLIBS	:= $(LIBS)

src/main/unit_test_module.mk

@@ -23,7 +23,7 @@ endif
 
 TGT_INSTALLDIR  :=
 TGT_LDLIBS	:= $(LIBS) $(LCRYPT)
-TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-server.a libfreeradius-util.a libfreeradius-radius.a
 
 # Libraries can't depend on libraries (oops), so make the binary
 # depend on the EAP code...

src/modules/proto_detail/all.mk

@@ -6,4 +6,4 @@ endif
 
 SOURCES		:= proto_detail.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a

src/modules/proto_radius/proto_radius_acct.mk

@@ -6,5 +6,5 @@ endif
 
 SOURCES		:= proto_radius_acct.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 

src/modules/proto_radius/proto_radius_auth.mk

@@ -6,5 +6,5 @@ endif
 
 SOURCES		:= proto_radius_auth.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 

src/modules/proto_radius/proto_radius_coa.mk

@@ -6,5 +6,5 @@ endif
 
 SOURCES		:= proto_radius_coa.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 

src/modules/proto_radius/proto_radius_status.mk

@@ -6,5 +6,5 @@ endif
 
 SOURCES		:= proto_radius_status.c
 
-TGT_PREREQS	:= libfreeradius-util.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a
 

src/lib/util/packet.c → src/radius/packet.c

@@ -1019,4 +1019,3 @@ void fr_packet_header_print(FILE *fp, RADIUS_PACKET *packet, bool received)
 		        packet->data_len);
 	}
 }
-

src/lib/util/radius_encode.c → src/radius/radius_encode.c

@@ -630,10 +630,10 @@ static ssize_t encode_tlv_hdr_internal(uint8_t *out, size_t outlen,
 		if (!fr_pair_cursor_current(cursor) || (vp == fr_pair_cursor_current(cursor))) break;
 
 		/*
-	 	 *	We can encode multiple sub TLVs, if after
-	 	 *	rebuilding the TLV Stack, the attribute
-	 	 *	at this depth is the same.
-	 	 */
+		 *	We can encode multiple sub TLVs, if after
+		 *	rebuilding the TLV Stack, the attribute
+		 *	at this depth is the same.
+		 */
 		if (da != tlv_stack[depth]) break;
 		vp = fr_pair_cursor_current(cursor);
 
@@ -1705,4 +1705,3 @@ ssize_t fr_radius_encode_pair(uint8_t *out, size_t outlen, vp_cursor_t *cursor,
 
 	return ret;
 }
-

src/tests/util/radius1_test.mk

@@ -2,5 +2,5 @@ TARGET := radius1_test
 
 SOURCES		:= radius1_test.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-server.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a libfreeradius-server.a libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)

src/tests/util/radius_schedule_test.mk

@@ -2,6 +2,6 @@ TARGET := radius_schedule_test
 
 SOURCES		:= radius_schedule_test.c
 
-TGT_PREREQS	:= libfreeradius-util.a libfreeradius-server.a libfreeradius-io.a
+TGT_PREREQS	:= libfreeradius-util.a libfreeradius-radius.a libfreeradius-server.a libfreeradius-io.a
 TGT_LDLIBS	:= $(LIBS)