From: Alan T. DeKok Date: Wed, 20 Oct 2021 14:22:10 +0000 (-0400) Subject: clean up includes. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbe4b32a89901afc870c396158432acb520e2e22;p=thirdparty%2Ffreeradius-server.git 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 d933bcb79e1..8f02ecab77c 100644 --- a/src/lib/server/base.h +++ b/src/lib/server/base.h @@ -61,7 +61,6 @@ RCSIDH(base_h, "$Id$") #include #include #include -#include #include #include #include diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c index 6784d52d25d..bc84f95b640 100644 --- a/src/listen/radius/proto_radius_tcp.c +++ b/src/listen/radius/proto_radius_tcp.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c index b41be30e394..90ec551df84 100644 --- a/src/listen/tacacs/proto_tacacs_tcp.c +++ b/src/listen/tacacs/proto_tacacs_tcp.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/src/protocols/dhcpv4/base.c b/src/protocols/dhcpv4/base.c index 3cfbd9f32b5..1b8b98a55ac 100644 --- a/src/protocols/dhcpv4/base.c +++ b/src/protocols/dhcpv4/base.c @@ -25,10 +25,10 @@ */ RCSID("$Id$") -#include #include #include #include +#include #include "attrs.h" static uint32_t instance_count = 0; diff --git a/src/protocols/dhcpv4/decode.c b/src/protocols/dhcpv4/decode.c index 8ae0514e518..25648693cc5 100644 --- 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 -#include #include #include #include diff --git a/src/protocols/dhcpv4/encode.c b/src/protocols/dhcpv4/encode.c index 3c637632615..4e3b13e3c6b 100644 --- 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 -#include - #include #include #include diff --git a/src/protocols/dhcpv4/packet.c b/src/protocols/dhcpv4/packet.c index 8bef0fc23ea..397e70fa20b 100644 --- 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 #include +#include #include #include #include -#include -#include - #include "dhcpv4.h" #include "attrs.h" diff --git a/src/protocols/dns/base.c b/src/protocols/dns/base.c index f9fd9ce4eef..ee1d54767af 100644 --- a/src/protocols/dns/base.c +++ b/src/protocols/dns/base.c @@ -25,8 +25,6 @@ */ RCSID("$Id$") -#include - #include "dns.h" #include "attrs.h" diff --git a/src/protocols/dns/decode.c b/src/protocols/dns/decode.c index 93a72637fc6..1bbc4a5bc00 100644 --- 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 -#include - #include #include #include diff --git a/src/protocols/dns/encode.c b/src/protocols/dns/encode.c index 4a60c797c0a..f8e3406146b 100644 --- a/src/protocols/dns/encode.c +++ b/src/protocols/dns/encode.c @@ -24,8 +24,6 @@ * * @copyright 2021 NetworkRADIUS SARL (legal@networkradius.com) */ -#include -#include #include #include #include diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c index e3a5f05d6a8..a31c3cdc1a0 100644 --- a/src/protocols/radius/base.c +++ b/src/protocols/radius/base.c @@ -28,11 +28,9 @@ RCSID("$Id$") #include #include - #include "attrs.h" #include -#include #include #include #include diff --git a/src/protocols/radius/decode.c b/src/protocols/radius/decode.c index 2806c6755d4..3bb9a9d1c4f 100644 --- a/src/protocols/radius/decode.c +++ b/src/protocols/radius/decode.c @@ -24,7 +24,6 @@ */ RCSID("$Id$") -#include #include #include #include diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c index 9d2d521e6c5..4d09d34fed5 100644 --- a/src/protocols/radius/encode.c +++ b/src/protocols/radius/encode.c @@ -24,7 +24,6 @@ */ RCSID("$Id$") -#include #include #include #include diff --git a/src/protocols/radius/list.c b/src/protocols/radius/list.c index 160e697b4a2..1141efa8cc7 100644 --- 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 -#include -#include -#include #include +#include /* * See if two packets are identical. diff --git a/src/protocols/radius/packet.c b/src/protocols/radius/packet.c index 5e4cf6151e8..e6e442d858f 100644 --- a/src/protocols/radius/packet.c +++ b/src/protocols/radius/packet.c @@ -26,9 +26,9 @@ RCSID("$Id$") #include "attrs.h" -#include #include #include +#include #include #include diff --git a/src/protocols/radius/tcp.c b/src/protocols/radius/tcp.c index f3a36e2f68f..b08fc6c43cd 100644 --- a/src/protocols/radius/tcp.c +++ b/src/protocols/radius/tcp.c @@ -24,9 +24,8 @@ */ RCSID("$Id$") -#include #include -#include +#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 f218da6b6fb..08673e3078a 100644 --- 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 be574990bed..9fce4df8d4b 100644 --- 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 #include -#include -#include #include #include #include -#include -#include #include "tacacs.h" #include "attrs.h" diff --git a/src/protocols/tacacs/decode.c b/src/protocols/tacacs/decode.c index bc115dcbbf6..a1b0af3e460 100644 --- a/src/protocols/tacacs/decode.c +++ b/src/protocols/tacacs/decode.c @@ -26,9 +26,6 @@ #include #include -#include -#include -#include #include #include #include diff --git a/src/protocols/tacacs/encode.c b/src/protocols/tacacs/encode.c index e80365c1185..6f32777a2f5 100644 --- a/src/protocols/tacacs/encode.c +++ b/src/protocols/tacacs/encode.c @@ -26,12 +26,10 @@ #include #include -#include -#include -#include #include #include #include +#include #include #include "tacacs.h" diff --git a/src/protocols/tftp/base.c b/src/protocols/tftp/base.c index f2648f0bad6..9b3105c5566 100644 --- a/src/protocols/tftp/base.c +++ b/src/protocols/tftp/base.c @@ -26,7 +26,8 @@ RCSID("$Id$") -#include +#include + #include "tftp.h" #include "attrs.h" diff --git a/src/protocols/tftp/tftp.c b/src/protocols/tftp/tftp.c index f07774b539e..da4313ec307 100644 --- a/src/protocols/tftp/tftp.c +++ b/src/protocols/tftp/tftp.c @@ -25,7 +25,6 @@ */ RCSID("$Id$") -#include #include #include diff --git a/src/protocols/vmps/base.c b/src/protocols/vmps/base.c index b0cb43d836a..c9601525202 100644 --- a/src/protocols/vmps/base.c +++ b/src/protocols/vmps/base.c @@ -25,7 +25,7 @@ RCSID("$Id$") -#include +#include #include "vmps.h" #include "attrs.h" diff --git a/src/protocols/vmps/vmps.c b/src/protocols/vmps/vmps.c index a614722bc22..1dc36c5cf79 100644 --- a/src/protocols/vmps/vmps.c +++ b/src/protocols/vmps/vmps.c @@ -25,7 +25,6 @@ RCSID("$Id$") -#include #include #include #include