clean up includes.

tcp.h is used only in src/protocols/radius, and so shouldn't be in
src/lib/server, or in src/listen

many things in src/protocols included server/base.h, which makes
no sense, as nothing in them uses any of the server functions

many things included util/base.h, when they only used a tiny
subset of the headers.

Removing dozens of includes from each C file should speed up
compilation.

diff --git a/src/lib/server/base.h b/src/lib/server/base.h
index d933bcb79e12012ea6e50bcd3bd969b00d4bea6f..8f02ecab77c1f78acb1380ce59b3fe9cc1b765d3 100644 (file)
--- a/src/lib/server/base.h
+++ b/src/lib/server/base.h
@@ -61,7 +61,6 @@ RCSIDH(base_h, "$Id$")
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/stats.h>
 #include <freeradius-devel/server/sysutmp.h>
-#include <freeradius-devel/server/tcp.h>
 #include <freeradius-devel/server/tmpl.h>
 #include <freeradius-devel/server/trigger.h>
 #include <freeradius-devel/server/util.h>

diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index 6784d52d25d93e7f7c3ac2bf5cc64ee3ea6a6063..bc84f95b640337c949fdc659a858e93f92c92086 100644 (file)
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -25,7 +25,7 @@
 #include <netdb.h>
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
-#include <freeradius-devel/server/tcp.h>
+#include <freeradius-devel/radius/tcp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/base.h>

diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c
index b41be30e39462e961c3c9b9fe1ee489bfed99b3a..90ec551df849c872757f4204db94dd745413e2fd 100644 (file)
--- a/src/listen/tacacs/proto_tacacs_tcp.c
+++ b/src/listen/tacacs/proto_tacacs_tcp.c
@@ -27,7 +27,6 @@
 #include <netdb.h>
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
-#include <freeradius-devel/server/tcp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>

diff --git a/src/protocols/dhcpv4/base.c b/src/protocols/dhcpv4/base.c
index 3cfbd9f32b5327b1434e7685b8f426c44d82ea84..1b8b98a55ac25e0d13fdfd0a12e0c7b6535c339e 100644 (file)
--- a/src/protocols/dhcpv4/base.c
+++ b/src/protocols/dhcpv4/base.c
@@ -25,10 +25,10 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
 #include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/pcap.h>
+#include <freeradius-devel/util/proto.h>
 #include "attrs.h"
 
 static uint32_t instance_count = 0;

diff --git a/src/protocols/dhcpv4/decode.c b/src/protocols/dhcpv4/decode.c
index 8ae0514e51825165dcefd4fa62788ce0da6cd242..25648693cc5de55eaf8f58a9c1b5e899375cdaa1 100644 (file)
--- a/src/protocols/dhcpv4/decode.c
+++ b/src/protocols/dhcpv4/decode.c
@@ -24,8 +24,6 @@
  * @copyright 2008 Alan DeKok (aland@deployingradius.com)
  * @copyright 2015,2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include <stdint.h>
-#include <stddef.h>
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/proto.h>

diff --git a/src/protocols/dhcpv4/encode.c b/src/protocols/dhcpv4/encode.c
index 3c63763261591704ffd8d983f511215b3cdbbc25..4e3b13e3c6b561cd6e216198d012c5eb5379babb 100644 (file)
--- a/src/protocols/dhcpv4/encode.c
+++ b/src/protocols/dhcpv4/encode.c
@@ -24,9 +24,6 @@
  * @copyright 2008 Alan DeKok (aland@deployingradius.com)
  * @copyright 2015,2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include <stdint.h>
-#include <stddef.h>
-
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/util/dbuff.h>
 #include <freeradius-devel/util/pair.h>

diff --git a/src/protocols/dhcpv4/packet.c b/src/protocols/dhcpv4/packet.c
index 8bef0fc23eadb1412575412cb26437554cdbceeb..397e70fa20b20252cb8fd5a00a4031ca976f761f 100644 (file)
--- a/src/protocols/dhcpv4/packet.c
+++ b/src/protocols/dhcpv4/packet.c
@@ -23,15 +23,12 @@
  * @copyright 2008,2017 The FreeRADIUS server project
  * @copyright 2008 Alan DeKok (aland@deployingradius.com)
  */
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/types.h>
 #include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/protocol/dhcpv4/rfc2131.h>
 
-#include <stdint.h>
-#include <stddef.h>
-
 #include "dhcpv4.h"
 #include "attrs.h"
 

diff --git a/src/protocols/dns/base.c b/src/protocols/dns/base.c
index f9fd9ce4eeffe0049d1539a7717391bfb655d476..ee1d54767afa6c3801bb201f8a907dedb376cb11 100644 (file)
--- a/src/protocols/dns/base.c
+++ b/src/protocols/dns/base.c
@@ -25,8 +25,6 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
-
 #include "dns.h"
 #include "attrs.h"
 

diff --git a/src/protocols/dns/decode.c b/src/protocols/dns/decode.c
index 93a72637fc6c154c182d4028ae234742a68b55a9..1bbc4a5bc000ac784586fbe79c3eb2e065f15b64 100644 (file)
--- a/src/protocols/dns/decode.c
+++ b/src/protocols/dns/decode.c
@@ -25,9 +25,6 @@
  * @copyright 2021 The FreeRADIUS server project
  * @copyright 2021 NetworkRADIUS SARL (legal@networkradius.com)
  */
-#include <stdint.h>
-#include <stddef.h>
-
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/util/dns.h>
 #include <freeradius-devel/util/pair.h>

diff --git a/src/protocols/dns/encode.c b/src/protocols/dns/encode.c
index 4a60c797c0a8d5a251a62f595a7a6ae4ca0904c2..f8e3406146b2d085b6637051f2cd035d55de6fca 100644 (file)
--- a/src/protocols/dns/encode.c
+++ b/src/protocols/dns/encode.c
@@ -24,8 +24,6 @@
  *
  * @copyright 2021 NetworkRADIUS SARL (legal@networkradius.com)
  */
-#include <stdint.h>
-#include <stddef.h>
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/util/dbuff.h>
 #include <freeradius-devel/util/dns.h>

diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c
index e3a5f05d6a800c8bcfa271007914178059e8c5f5..a31c3cdc1a092b870f068d6e7dc3d58b5092195f 100644 (file)
--- a/src/protocols/radius/base.c
+++ b/src/protocols/radius/base.c
@@ -28,11 +28,9 @@ RCSID("$Id$")
 #include <fcntl.h>
 #include <ctype.h>
 
-
 #include "attrs.h"
 
 #include <freeradius-devel/io/pair.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/talloc.h>

diff --git a/src/protocols/radius/decode.c b/src/protocols/radius/decode.c
index 2806c6755d4d2faca5f543e8f8840d7ee3ab82d3..3bb9a9d1c4f7d6031837b46c9f45a6b038c1152d 100644 (file)
--- a/src/protocols/radius/decode.c
+++ b/src/protocols/radius/decode.c
@@ -24,7 +24,6 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/struct.h>
 #include <freeradius-devel/io/test_point.h>

diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c
index 9d2d521e6c52b642a0e2bf509d26749551b8df14..4d09d34fed5e2a4863a7f428ea90fa9c7c7c851f 100644 (file)
--- a/src/protocols/radius/encode.c
+++ b/src/protocols/radius/encode.c
@@ -24,7 +24,6 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/dbuff.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/struct.h>

diff --git a/src/protocols/radius/list.c b/src/protocols/radius/list.c
index 160e697b4a22fee590423bc419e0ff7c6211e5f3..1141efa8cc7e9888ff5e5671167e06b2efc6c6c4 100644 (file)
--- a/src/protocols/radius/list.c
+++ b/src/protocols/radius/list.c
@@ -26,13 +26,12 @@
 RCSID("$Id$")
 
 #include "radius.h"
+#include "tcp.h"
 #include "list.h"
 
 #include <fcntl.h>
-#include <freeradius-devel/server/request.h>
-#include <freeradius-devel/server/tcp.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/udp.h>
+#include <freeradius-devel/util/syserror.h>
 
 /*
  *     See if two packets are identical.

diff --git a/src/protocols/radius/packet.c b/src/protocols/radius/packet.c
index 5e4cf6151e851975d9f4ec02d8c11283c5632925..e6e442d858fa58cb7dc64134dd48c68ac9ddaf3b 100644 (file)
--- a/src/protocols/radius/packet.c
+++ b/src/protocols/radius/packet.c
@@ -26,9 +26,9 @@ RCSID("$Id$")
 
 #include "attrs.h"
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/udpfromto.h>
+#include <freeradius-devel/util/syserror.h>
 
 #include <fcntl.h>
 #include <ctype.h>

diff --git a/src/protocols/radius/tcp.c b/src/protocols/radius/tcp.c
index f3a36e2f68f9083496a29f9a393958c0094da615..b08fc6c43cdfe5e14c5aeb0acb2e5420f3eb9500 100644 (file)
--- a/src/protocols/radius/tcp.c
+++ b/src/protocols/radius/tcp.c
@@ -24,9 +24,8 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/server/tcp.h>
+#include "tcp.h"
 
 fr_radius_packet_t *fr_tcp_recv(int sockfd, int flags)
 {

diff --git a/src/lib/server/tcp.h b/src/protocols/radius/tcp.h
similarity index 96%
rename from src/lib/server/tcp.h
rename to src/protocols/radius/tcp.h
index f218da6b6fb4ef970e3da0405bdfae0b295f06d9..08673e3078a34db24ee366922d3677b601c0600a 100644 (file)
--- a/src/lib/server/tcp.h
+++ b/src/protocols/radius/tcp.h
@@ -18,7 +18,7 @@
 /**
  * $Id$
  *
- * @file lib/server/tcp.h
+ * @file protocols/radius/tcp.h
  * @brief RADIUS over TCP
  *
  * @copyright 2009 Dante http://dante.net

diff --git a/src/protocols/tacacs/base.c b/src/protocols/tacacs/base.c
index be574990bed268945c834d3aca73a148ee30759d..9fce4df8d4b1a73a7d8bc89c8959fad28f3a2486 100644 (file)
--- a/src/protocols/tacacs/base.c
+++ b/src/protocols/tacacs/base.c
@@ -23,15 +23,10 @@
  * @copyright 2017 The FreeRADIUS server project
  * @copyright 2017 Network RADIUS SARL (legal@networkradius.com)
  */
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/net.h>
-#include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/log.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/struct.h>
-#include <freeradius-devel/protocol/tacacs/dictionary.h>
-#include <freeradius-devel/protocol/tacacs/freeradius.internal.h>
 
 #include "tacacs.h"
 #include "attrs.h"

diff --git a/src/protocols/tacacs/decode.c b/src/protocols/tacacs/decode.c
index bc115dcbbf6ef6a85185a46e65c400610964c60b..a1b0af3e460becc5fb97d62f6680689490e05d66 100644 (file)
--- a/src/protocols/tacacs/decode.c
+++ b/src/protocols/tacacs/decode.c
@@ -26,9 +26,6 @@
 
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/protocol/tacacs/tacacs.h>
-#include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/log.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/struct.h>

diff --git a/src/protocols/tacacs/encode.c b/src/protocols/tacacs/encode.c
index e80365c118517119016daae1b11ca3ace0b29c9a..6f32777a2f5f135cd50b55bab7b847e50b287249 100644 (file)
--- a/src/protocols/tacacs/encode.c
+++ b/src/protocols/tacacs/encode.c
@@ -26,12 +26,10 @@
 
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/protocol/tacacs/tacacs.h>
-#include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/log.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/dbuff.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/net.h>
+#include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/struct.h>
 
 #include "tacacs.h"

diff --git a/src/protocols/tftp/base.c b/src/protocols/tftp/base.c
index f2648f0bad6d2fe0ebe7b3e09e12c2ca951091dc..9b3105c5566a9251e8355c62ba09773062e9f70e 100644 (file)
--- a/src/protocols/tftp/base.c
+++ b/src/protocols/tftp/base.c
@@ -26,7 +26,8 @@
 
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
+#include <freeradius-devel/util/pair.h>
+
 #include "tftp.h"
 #include "attrs.h"
 

diff --git a/src/protocols/tftp/tftp.c b/src/protocols/tftp/tftp.c
index f07774b539ef600ed0ef0956312acf19acb3c376..da4313ec3077a8412d4fcb1d3e46dc7c7b7426d2 100644 (file)
--- a/src/protocols/tftp/tftp.c
+++ b/src/protocols/tftp/tftp.c
@@ -25,7 +25,6 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/dbuff.h>
 #include <freeradius-devel/util/udp.h>
 

diff --git a/src/protocols/vmps/base.c b/src/protocols/vmps/base.c
index b0cb43d836a735e00c54422a865e5466ee43a80c..c96015252024d63ede39e6f4468301e571e55b09 100644 (file)
--- a/src/protocols/vmps/base.c
+++ b/src/protocols/vmps/base.c
@@ -25,7 +25,7 @@
 
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
+#include <freeradius-devel/util/pair.h>
 #include "vmps.h"
 #include "attrs.h"
 

diff --git a/src/protocols/vmps/vmps.c b/src/protocols/vmps/vmps.c
index a614722bc22ce2fe6478d1d9efd574ac2b9dc2f8..1dc36c5cf79a8b86698c408412eef3d2b627d2b4 100644 (file)
--- a/src/protocols/vmps/vmps.c
+++ b/src/protocols/vmps/vmps.c
@@ -25,7 +25,6 @@
 
 RCSID("$Id$")
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/dbuff.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/protocol/vmps/vmps.h>