Re-arrange some includes

diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c
index b35569d6c420c48e9d31d078d7b22c279f72b4fa..60f1ba8ad651a37ec73e5106baf19a97e7fa05ed 100644 (file)
--- a/src/bin/unit_test_map.c
+++ b/src/bin/unit_test_map.c
@@ -22,12 +22,12 @@
 
 RCSID("$Id$")
 
-
 #include <freeradius-devel/server/cf_file.h>
-#include <freeradius-devel/util/atexit.h>
-#include <freeradius-devel/util/file.h>
+#include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/module_rlm.h>
+#include <freeradius-devel/util/atexit.h>
+#include <freeradius-devel/util/file.h>
 
 #include <freeradius-devel/util/conf.h>
 

diff --git a/src/lib/server/client.c b/src/lib/server/client.c
index 98b229227274dda894d2066a6d7944076728025d..7576f56b4742ca84cb0177b11022584418c12433 100644 (file)
--- a/src/lib/server/client.c
+++ b/src/lib/server/client.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cf_file.h>
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/client.h>
+#include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/unlang/call.h>

diff --git a/src/lib/server/paircmp.c b/src/lib/server/paircmp.c
index 82933957060cd66fbd3bf072b51aae59b966629f..15818870fe3daef8df62077af833f34f1e66b3e1 100644 (file)
--- a/src/lib/server/paircmp.c
+++ b/src/lib/server/paircmp.c
@@ -30,9 +30,10 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/paircmp.h>
-#include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/regex.h>
 #include <freeradius-devel/server/request.h>
+#include <freeradius-devel/unlang/xlat.h>
+#include <freeradius-devel/util/debug.h>
 
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>

diff --git a/src/lib/server/request.h b/src/lib/server/request.h
index 8461a0923c05ddda722ebadaba935884e30a8522..9db498072a62fa1864aebb48343130a6d15b955e 100644 (file)
--- a/src/lib/server/request.h
+++ b/src/lib/server/request.h
@@ -43,7 +43,6 @@ typedef struct rad_client RADCLIENT;
 #endif
 
 #include <freeradius-devel/server/log.h>
-#include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/rcode.h>
 #include <freeradius-devel/server/signal.h>
 #include <freeradius-devel/util/event.h>

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index b41e67ae416a3b9697bae57873cfdcc5ad1fad8a..cb5377e133cd25d8e9ef0675e978392ce297517d 100644 (file)
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -255,6 +255,7 @@ typedef struct tmpl_res_rules_s tmpl_res_rules_t;
 typedef struct tmpl_s tmpl_t;
 
 #include <freeradius-devel/unlang/xlat.h>
+#include <freeradius-devel/unlang/xlat_ctx.h>
 #include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/regex.h>

diff --git a/src/lib/unlang/condition.c b/src/lib/unlang/condition.c
index b792c18c28cf76cf32dd72980ef9b3bb5fee1b68..0b4a4218aa592eaf46e44d853aabc55dd9e8c78d 100644 (file)
--- a/src/lib/unlang/condition.c
+++ b/src/lib/unlang/condition.c
@@ -24,6 +24,8 @@
  */
 RCSID("$Id$")
 
+#include <freeradius-devel/server/main_config.h>
+
 #include "condition_priv.h"
 #include "group_priv.h"
 

diff --git a/src/lib/unlang/edit.c b/src/lib/unlang/edit.c
index 7094a5129e17d129f88a8440b455c59b6d7ff54b..82f09b07489083d5bceb7dacb2391a3cc9c831ea 100644 (file)
--- a/src/lib/unlang/edit.c
+++ b/src/lib/unlang/edit.c
@@ -1236,7 +1236,7 @@ static int expanded_lhs_attribute(request_t *request, unlang_frame_state_edit_t
  *             foo := bar              LHS foo
  *             foo = { bar = baz }     LHS bar
  *             foo = { 1, 2, 3, 4 }    LHS 1, 2, etc.
- *             
+ *
  */
 static int expand_lhs(request_t *request, unlang_frame_state_edit_t *state, edit_map_t *current)
 {

diff --git a/src/lib/unlang/interpret.h b/src/lib/unlang/interpret.h
index 17f3849ff33aa3ec1d2971c1028dfcfbc4846bf9..cf2be144fb7005eecdd8c38244a8e9e43b5e9a4b 100644 (file)
--- a/src/lib/unlang/interpret.h
+++ b/src/lib/unlang/interpret.h
@@ -28,6 +28,7 @@
 extern "C" {
 #endif
 
+#include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/request.h>
 #include <freeradius-devel/unlang/action.h>
 

diff --git a/src/lib/unlang/xlat.h b/src/lib/unlang/xlat.h
index abd34c1ce2b580a66cb3faad6491c83b68cc04a9..1465ef04718b2d8ffb5f4f880b2244d2fc5c4e27 100644 (file)
--- a/src/lib/unlang/xlat.h
+++ b/src/lib/unlang/xlat.h
@@ -51,9 +51,13 @@ typedef enum {
 typedef struct xlat_inst xlat_inst_t;
 typedef struct xlat_thread_inst xlat_thread_inst_t;
 
-#include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/request.h>
+
+typedef size_t (*xlat_escape_legacy_t)(request_t *request, char *out, size_t outlen, char const *in, void *arg);
+
+#include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/signal.h>
+#include <freeradius-devel/server/tmpl.h>
 
 #include <freeradius-devel/util/heap.h>
 #include <freeradius-devel/util/pair.h>
@@ -265,8 +269,6 @@ typedef int (*xlat_detach_t)(xlat_inst_ctx_t const *xctx);
  */
 typedef int (*xlat_thread_detach_t)(xlat_thread_inst_ctx_t const *xctx);
 
-typedef size_t (*xlat_escape_legacy_t)(request_t *request, char *out, size_t outlen, char const *in, void *arg);
-
 /** Set the next argument to the next item in the input list or NULL
  *
  * @param[in] _list    we're extracting arguments from.

diff --git a/src/lib/unlang/xlat_priv.h b/src/lib/unlang/xlat_priv.h
index fd5b70eb65e7308c9a144692f9cb75ec6700273d..f55c08aa85b7dfb33160d96d703f5c3623e35857 100644 (file)
--- a/src/lib/unlang/xlat_priv.h
+++ b/src/lib/unlang/xlat_priv.h
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+#include <freeradius-devel/unlang/xlat_ctx.h>
+#include <freeradius-devel/unlang/xlat.h>
 #include <freeradius-devel/io/pair.h>
 
 #ifdef DEBUG_XLAT

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index d8dd04783089264ad3f72fece1222a64ee0da3e3..69fabd8ae3427f799bfe272b3595833501ce14d0 100644 (file)
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -29,7 +29,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/sbuff.h>
-#include <freeradius-devel/server/request.h>
 #include <freeradius-devel/server/regex.h>
 #include <freeradius-devel/unlang/xlat_priv.h>
 

diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index 1d9ce7ffbd4aae56cd12a675ba950ff3ba6453b3..058493eb87f403cac02dcb94c4c07c3b46e599c8 100644 (file)
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -23,11 +23,10 @@
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
 #include <freeradius-devel/io/listen.h>
+#include <freeradius-devel/protocol/vmps/vmps.h>
 #include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
-#include <freeradius-devel/protocol/vmps/vmps.h>
-
 #include "proto_vmps.h"
 
 extern fr_app_t proto_vmps;

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index e63cece6ccd3f5d3cc2136e277e35d3bd7b6a924..5e2383f15d059ee80b1343f57ae52dace64ab5e4 100644 (file)
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -23,15 +23,18 @@
  * @copyright 2021 Network RADIUS SARL (legal@networkradius.com)
  */
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
+
 #include <freeradius-devel/radius/radius.h>
 
+#include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/module.h>
-#include <freeradius-devel/unlang/module.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/server/protocol.h>
+#include <freeradius-devel/server/state.h>
+
+#include <freeradius-devel/unlang/module.h>
 
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/server/state.h>
 
 static fr_dict_t const *dict_freeradius;
 static fr_dict_t const *dict_radius;

diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index 20fdf2e2e2da27dc328a0a32217bbc2b60eb78e7..15717e22a53ccc2a97dfc4fd599d89f0e3a45cae 100644 (file)
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -24,15 +24,16 @@
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
 
+
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/master.h>
+#include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/state.h>
+#include <freeradius-devel/tacacs/tacacs.h>
 #include <freeradius-devel/unlang/call.h>
 #include <freeradius-devel/util/debug.h>
 
-#include <freeradius-devel/tacacs/tacacs.h>
-
 static fr_dict_t const *dict_freeradius;
 static fr_dict_t const *dict_tacacs;
 

diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c
index 69dfedf7356b364e9c9cb4d2f70bcb011e93f8e4..febed435d4526fa7a37ae042335296646019ba17 100644 (file)
--- a/src/process/ttls/base.c
+++ b/src/process/ttls/base.c
@@ -23,15 +23,18 @@
  * @copyright 2021 Network RADIUS SARL (legal@networkradius.com)
  */
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
+
 #include <freeradius-devel/radius/radius.h>
 
+#include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/module.h>
-#include <freeradius-devel/unlang/module.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/server/protocol.h>
+#include <freeradius-devel/server/state.h>
+
+#include <freeradius-devel/unlang/module.h>
 
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/server/state.h>
 
 static fr_dict_t const *dict_freeradius;
 static fr_dict_t const *dict_radius;

diff --git a/src/protocols/vmps/vmps.c b/src/protocols/vmps/vmps.c
index c557a253e6cba5d16269c1335e2d8bc8ec5ceda5..076dd06ca4b31796e8f0adc210292661883c0cc4 100644 (file)
--- a/src/protocols/vmps/vmps.c
+++ b/src/protocols/vmps/vmps.c
@@ -25,10 +25,11 @@
 
 RCSID("$Id$")
 
+#include <freeradius-devel/io/test_point.h>
+#include <freeradius-devel/protocol/vmps/vmps.h>
 #include <freeradius-devel/util/dbuff.h>
+#include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/udp.h>
-#include <freeradius-devel/protocol/vmps/vmps.h>
-#include <freeradius-devel/io/test_point.h>
 
 #include "vmps.h"
 #include "attrs.h"

diff --git a/src/tests/unit/xlat/cond_base.txt b/src/tests/unit/xlat/cond_base.txt
index 78d4397885a60a58a6eea825711aae5917cb43e4..839c711d8530a6a734795a6381aec2013ba199f1 100644 (file)
--- a/src/tests/unit/xlat/cond_base.txt
+++ b/src/tests/unit/xlat/cond_base.txt
@@ -239,7 +239,7 @@ match (&Session-Timeout == '10')
 #  @todo - yuck.  Suppress full path?
 #
 xlat_purify &Event-Timestamp == "January 1, 2012 %{User-Name}"
-match (&Event-Timestamp == %(cast:string "January 1, 2012 %{Request[0].User-Name}"))
+match (&Event-Timestamp == %(cast:string "January 1, 2012 %{request[0].User-Name}"))
 
 # This one is NOT an expansion, so it's parsed into normal form
 xlat_purify &Event-Timestamp == 'January 1 2012'
@@ -278,7 +278,7 @@ match NULL
 
 # @todo - yuck, don't print full path?
 xlat_purify <ipaddr>127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{User-Name}'}
-match (127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{Request[0].User-Name}'})
+match (127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{request[0].User-Name}'})
 
 xlat_purify <ether> 00:11:22:33:44:55 == "00:11:22:33:44:55"
 match true
@@ -522,7 +522,7 @@ match (&User-Name[n] == "bob")
 #match &Foo-Bar
 
 xlat_purify &Acct-Input-Octets > "%{Session-Timeout}"
-match (&Acct-Input-Octets > %(cast:string "%{Request[0].Session-Timeout}"))
+match (&Acct-Input-Octets > %(cast:string "%{request[0].Session-Timeout}"))
 
 xlat_purify &Acct-Input-Octets > &Session-Timeout
 match (&Acct-Input-Octets > &Session-Timeout)