remove radius from src/lib/util/base.h

and fix up everything which needs it.

diff --git a/src/bin/radsniff.h b/src/bin/radsniff.h
index ff163d1b39e53b08d1e021ceeb56ed4dcd1dd6e5..56ed293a16afeb327e3390692c4b93ddcc14c0dc 100644 (file)
--- a/src/bin/radsniff.h
+++ b/src/bin/radsniff.h
@@ -32,6 +32,7 @@ RCSIDH(radsniff_h, "$Id$")
 #include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/pcap.h>
 #include <freeradius-devel/util/event.h>
+#include <freeradius-devel/radius/radius.h>
 
 #ifdef HAVE_COLLECTDC_H
 #  include <collectd/client.h>

diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c
index f2a5435297ec9d8282cda256dac54ae3f2d0398b..2ba965ebfc04d290ec34c41be270fc5792cb1ea8 100644 (file)
--- a/src/bin/radsnmp.c
+++ b/src/bin/radsnmp.c
@@ -30,7 +30,9 @@ RCSID("$Id$")
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/udp.h>
+#include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/radius/list.h>
+
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/uio.h>

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 740ff1f41fc9b2c8b56cbbe4fad60c77d0dc293c..d832993f16e05a16578d97f164715da1e1df8508 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -37,6 +37,7 @@ RCSID("$Id$")
 #include <freeradius-devel/unlang/base.h>
 
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
+#include <freeradius-devel/radius/radius.h>
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>

diff --git a/src/include/all.mk b/src/include/all.mk
index 0306ed1592e78e2ff5329a8fa76516d179a3c8a7..f7b5ce159124bb4193178700fca2a7934d4b124f 100644 (file)
--- a/src/include/all.mk
+++ b/src/include/all.mk
@@ -61,8 +61,8 @@ src/include/$(1): $(2)
        ${Q}test -e $$@ || mkdir -p $$(dir $$@)
        ${Q}echo "#pragma once" > $$@
        ${Q}grep ^PROTOCOL $$< | ${NORMALIZE} | awk '{print "#define FR_PROTOCOL_"$$$$2" " $$$$3 "      //!< AUTOGENERATED PROTOCOL NUMBER DEFINITION"}' >> $$@
-       ${Q}grep ^ATTRIBUTE $$< | ${NORMALIZE} | awk '{print "#define FR_"$$$$2 " " $$$$3 "     //!< AUTOGENERATED ATTRIBUTE DEFINITION"}' >> $$@
-       ${Q}grep ^STRUCT $$< | ${NORMALIZE} | awk '{print "#define FR_"$$$$2 " " $$$$3 "        //!< AUTOGENERATED ATTRIBUTE DEFINITION"}' >> $$@
+       ${Q}grep ^ATTRIBUTE $$< | ${NORMALIZE}  | awk '{print "#define FR_"$$$$2 " " $$$$3 "    //!< AUTOGENERATED ATTRIBUTE DEFINITION"}' >> $$@
+       ${Q}grep ^STRUCT $$< | ${NORMALIZE}  | awk '{print "#define FR_"$$$$2 " " $$$$3 "       //!< AUTOGENERATED ATTRIBUTE DEFINITION"}' >> $$@
        ${Q}grep ^VALUE $$< | ${NORMALIZE} | awk '{print "#define FR_"$$$$2"_VALUE_"$$$$3 " " $$$$4 "   //!< AUTOGENERATED VALUE DEFINITION"}' >> $$@
 endef
 $(foreach x,$(DICT),$(eval $(call DICT_TO_HEADER,$(addsuffix .h,$(subst dictionary.,,$(patsubst share/dictionary/%,protocol/%,$(x)))),$(x))))

diff --git a/src/lib/eap/chbind.c b/src/lib/eap/chbind.c
index 4fcb259840f2029e984cadb532a655b9a81f7948..6bdde077d6a23607b8baff5f7291f0279d84caae 100644 (file)
--- a/src/lib/eap/chbind.c
+++ b/src/lib/eap/chbind.c
@@ -25,6 +25,9 @@
 
 RCSID("$Id$")
 
+#include <freeradius-devel/radius/defs.h>
+#include <freeradius-devel/radius/radius.h>
+
 #include <freeradius-devel/io/pair.h>
 #include "chbind.h"
 #include "attrs.h"

diff --git a/src/lib/eap/chbind.h b/src/lib/eap/chbind.h
index 933c606f7d40856d2976ac723216bd35d3c9b921..0c5c997eca45bfd32706d66c726895d25d03b186 100644 (file)
--- a/src/lib/eap/chbind.h
+++ b/src/lib/eap/chbind.h
@@ -33,6 +33,8 @@ RCSIDH(lib_eap_chbind_h, "$Id$")
 
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/server/base.h>
+#include <freeradius-devel/radius/radius.h>
+#include <freeradius-devel/radius/defs.h>
 
 /* Structure to represent eap channel binding packet format */
 typedef struct {

diff --git a/src/lib/ldap/control.c b/src/lib/ldap/control.c
index e82440ab74206dde9a1354e184dcd364dce0c7f8..e723f313bfb6e5c0314dbf12c64ca6c41d790a54 100644 (file)
--- a/src/lib/ldap/control.c
+++ b/src/lib/ldap/control.c
@@ -27,6 +27,9 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/ldap/base.h>
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+#include <freeradius-devel/radius/radius.h>
+#endif
 
 /** Merge connection and call specific client and server controls
  *
@@ -190,6 +193,9 @@ int fr_ldap_control_add_session_tracking(fr_ldap_connection_t *conn, request_t *
 
        memcpy(&hostname, main_config->name, sizeof(hostname)); /* const / non-const issues */
 
+       /*
+        *      @todo - MULTI_PROTOCOL - switch to auto-loaded dictionaries.
+        */
        for (vp = fr_cursor_init(&cursor, &request->request_pairs);
             vp;
             vp = fr_cursor_next(&cursor)) {

diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c
index 01a1b6f266c9a9d3b936df4c9e2d54adb2aae29c..08d9af237bfa67a18e230b5aa1a880bc90cc0f32 100644 (file)
--- a/src/lib/server/cond_tokenize.c
+++ b/src/lib/server/cond_tokenize.c
@@ -28,6 +28,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cond_eval.h>
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include <ctype.h>
 

diff --git a/src/lib/server/exfile.c b/src/lib/server/exfile.c
index 11435c6fb92c57588c2bdfe90166b12f0f5c2e4f..921a1e095fb0ca6ba1b5fdba864c10947da3e6b5 100644 (file)
--- a/src/lib/server/exfile.c
+++ b/src/lib/server/exfile.c
@@ -26,6 +26,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/exfile.h>
+#include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include <freeradius-devel/util/misc.h>
 

diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index 633ea3a06b8f3483590ffdde3953b4c73dba3273..ef438d134a442d41082d4e4451ed290c262a36da 100644 (file)
--- a/src/lib/server/request.c
+++ b/src/lib/server/request.c
@@ -552,10 +552,16 @@ void request_verify(char const *file, int line, request_t const *request)
 
        if (request->packet) {
                packet_verify(file, line, request, request->packet, "request");
+#if 0
+               /*
+                *      @todo - a multi-protocol server shouldn't have
+                *      hard-coded RADIUS.
+                */
                if ((request->packet->code == FR_CODE_ACCESS_REQUEST) &&
                    (request->reply && !request->reply->code)) {
                        fr_assert(request->state_ctx != NULL);
                }
+#endif
        }
        if (request->reply) packet_verify(file, line, request, request->reply, "reply");
 

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index 4d80080f1a1fec7e392d20ad163cf5a5927be51b..fa1d93923609545025ab49c3e1e21bf1524102b6 100644 (file)
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/tmpl.h>
 #include <freeradius-devel/server/base.h>
+#include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/hex.h>

diff --git a/src/lib/server/trigger.c b/src/lib/server/trigger.c
index 35f75c1bc57ee5211347be9efe512f5ed58441df..66b36712d43585a25775c44792a1ee81fea668f1 100644 (file)
--- a/src/lib/server/trigger.c
+++ b/src/lib/server/trigger.c
@@ -29,6 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/unlang/interpret.h>
+#include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 /*
  *     Public "thunk" API so that the various binaries can link to

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index 5a107c70b0ed47e30b39c6f60cff18ffcd30e024..0d23ca27f477034ebcbf871fb841f6aa330747c7 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -34,6 +34,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/virtual_servers.h>
+#include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index e4d11803febeec9d3cc50e16f4ab064fe0944a1f..f8083c135cb21d1418f96b123bc50726eaab1939 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -28,6 +28,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/unlang/base.h>
+#include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include "call_priv.h"
 #include "caller_priv.h"

diff --git a/src/lib/util/base.h b/src/lib/util/base.h
index 994ef27e428b2940aac7b74d3a47d4bb776bea9a..0b95eabc726f43e7411df03b8b6ba38b46e5cc46 100644 (file)
--- a/src/lib/util/base.h
+++ b/src/lib/util/base.h
@@ -32,9 +32,6 @@ RCSIDH(libradius_h, "$Id$")
 
 #include <freeradius-devel/missing.h>
 
-#include <freeradius-devel/radius/defs.h>
-#include <freeradius-devel/radius/radius.h>
-
 #include <freeradius-devel/util/ascend.h>
 #include <freeradius-devel/util/base64.h>
 #include <freeradius-devel/util/conf.h>

diff --git a/src/modules/proto_dhcpv4/dhcpclient.c b/src/modules/proto_dhcpv4/dhcpclient.c
index 77baa26b73bdd46a7b0265aaeba4b13ce6b3d60c..ac2c1339fd4eb2449b2dab3b84bbd20505ff0061 100644 (file)
--- a/src/modules/proto_dhcpv4/dhcpclient.c
+++ b/src/modules/proto_dhcpv4/dhcpclient.c
@@ -110,9 +110,9 @@ fr_dict_attr_autoload_t dhcpclient_dict_attr[] = {
 };
 
 static fr_table_num_sorted_t const request_types[] = {
-       { L("auto"),                    FR_CODE_UNDEFINED       },
+       { L("auto"),            0       },
        { L("decline"),         FR_DHCP_DECLINE         },
-       { L("discover"),                FR_DHCP_DISCOVER        },
+       { L("discover"),        FR_DHCP_DISCOVER        },
        { L("inform"),          FR_DHCP_INFORM          },
        { L("lease_query"),     FR_DHCP_LEASE_QUERY     },
        { L("release"),         FR_DHCP_RELEASE         },

diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c
index 151c82431d1a60abedfead9648e69447a7783cec..7360bb0717306c3ed61fe1956a1802392a0cc87f 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps.c
+++ b/src/modules/proto_vmps/proto_vmps.c
@@ -172,7 +172,7 @@ static int mod_decode(void const *instance, request_t *request, uint8_t *const d
        fr_radius_packet_t *packet = request->packet;
        fr_cursor_t cursor;
 
-       fr_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE);
+       fr_assert(data[0] < FR_VQP_MAX_CODE);
 
        RHEXDUMP3(data, data_len, "proto_vmps decode packet");
 
@@ -247,7 +247,7 @@ static ssize_t mod_encode(void const *instance, request_t *request, uint8_t *buf
         *      "Do not respond"
         */
        if ((request->reply->code == FR_CODE_DO_NOT_RESPOND) ||
-           (request->reply->code == 0) || (request->reply->code >= FR_RADIUS_MAX_PACKET_CODE)) {
+           (request->reply->code >= FR_VQP_MAX_CODE)) {
                *buffer = false;
                return 1;
        }

diff --git a/src/modules/proto_vmps/proto_vmps_udp.c b/src/modules/proto_vmps/proto_vmps_udp.c
index 13f7382acd9b30fd0f0a4189a84d1358fa5e7bf1..f36692d74b9f7af297a82e0325ed663cb59adf54 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_udp.c
+++ b/src/modules/proto_vmps/proto_vmps_udp.c
@@ -256,14 +256,6 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, UNUSED fr_time_t req
         */
        if (data_size <= 0) return data_size;
 
-       /*
-        *      Root through the reply to determine any
-        *      connection-level negotiation data.
-        */
-       if (track->packet[0] == FR_CODE_STATUS_SERVER) {
-//             status_check_reply(inst, buffer, buffer_len);
-       }
-
        return data_size;
 }
 

diff --git a/src/modules/rlm_cache/rlm_cache.h b/src/modules/rlm_cache/rlm_cache.h
index bd15d67c183dac43900b1b1ca0a58efbcafc26c9..d62c6af09c017bb0f79e3aa675616666de351fda 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.h
+++ b/src/modules/rlm_cache/rlm_cache.h
@@ -28,6 +28,7 @@ RCSIDH(cache_h, "$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/dl_module.h>
 #include <freeradius-devel/server/map.h>
+#include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 typedef struct rlm_cache_driver_s rlm_cache_driver_t;
 

diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index 0f4a8ee00a7e8be17bad67561bc040dbed077a2e..65e50037fc9fa48084e63262d04399ed91f5f9f5 100644 (file)
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -29,6 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/password.h>
 #include <freeradius-devel/server/module.h>
+#include <freeradius-devel/radius/radius.h>
 
 typedef struct {
        char const              *name;          //!< Auth-Type value for this module instance.

diff --git a/src/modules/rlm_eap/rlm_eap.h b/src/modules/rlm_eap/rlm_eap.h
index 3d77cac94e7d60c556a4ebc04d6440664c2aa834..b4c4af6e26662ff20aa8594ad6fdd0f4bfb34de6 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.h
+++ b/src/modules/rlm_eap/rlm_eap.h
@@ -28,6 +28,7 @@ RCSIDH(rlm_eap_h, "$Id$")
 
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/state.h>
+#include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/eap/types.h>
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.h b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.h
index 17d9b6fcf8fcd74c23cb23a2d77e2da50f7e561b..ff01ad7486e04ba55f241f0db622f155e7bfb29c 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.h
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.h
@@ -28,6 +28,7 @@
 RCSIDH(eap_fast_h, "$Id$")
 
 #include <freeradius-devel/eap/tls.h>
+#include <freeradius-devel/radius/radius.h>
 
 #define EAP_FAST_VERSION                       1
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index 9613246d81f7518f498ba0dc6c1b56d095bd0bd2..3cc6ceaa0bf5c93f4abbc9701e04497008a70ced 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -25,6 +25,9 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/unlang/base.h>
+#include <freeradius-devel/radius/radius.h>
+#include <freeradius-devel/radius/defs.h>
+
 #include "eap_peap.h"
 
 static int setup_fake_request(request_t *request, request_t *fake, peap_tunnel_t *t);

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h b/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h
index a47012a22bf479632cbf813d8ca2a494dce1a855..3862fc876e037d78fc114c15ab3f19c6a754fdbe 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h
@@ -26,6 +26,8 @@
 RCSIDH(eap_ttls_h, "$Id$")
 
 #include <freeradius-devel/eap/tls.h>
+#include <freeradius-devel/radius/radius.h>
+#include <freeradius-devel/radius/defs.h>
 
 extern fr_dict_attr_t const *attr_eap_tls_require_client_cert;
 extern fr_dict_attr_t const *attr_proxy_to_realm;

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index d9a4975071d7389290aca4ff0f25732fb3dd58e7..d2fd1d160af88622eae372f823305e6f7122af84 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -32,6 +32,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/password.h>
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/radius/defs.h>
 
 #include <freeradius-devel/util/hex.h>
 #include <freeradius-devel/util/md4.h>

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 50941e454cb9d5c684abe237e6323d9005099e2f..f842338771aa09276d51f01066e282ccd3ac168b 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -29,6 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/radius/radius.h>
 
 #ifdef INADDR_ANY
 #  undef INADDR_ANY

diff --git a/src/modules/rlm_radius/rlm_radius.h b/src/modules/rlm_radius/rlm_radius.h
index ac53908d48a42024ba0386d2a955689c743fb582..cdc6d7f3b7d814195e3497b4d5a9bb410ca3c294 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.h
+++ b/src/modules/rlm_radius/rlm_radius.h
@@ -22,6 +22,7 @@
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/retry.h>
 #include <freeradius-devel/unlang/module.h>
+#include <freeradius-devel/radius/radius.h>
 
 /*
  * $Id$

diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c
index 9b90907fa11412278a34fdd30b276f411685d8a7..bf0c18ced433c5b10ecb10061eb7d69e3221de44 100644 (file)
--- a/src/modules/rlm_radutmp/rlm_radutmp.c
+++ b/src/modules/rlm_radutmp/rlm_radutmp.c
@@ -27,6 +27,7 @@ RCSID("$Id$")
 #include       <freeradius-devel/server/radutmp.h>
 #include       <freeradius-devel/server/module.h>
 #include       <freeradius-devel/util/debug.h>
+#include       <freeradius-devel/radius/radius.h>
 
 #include       <fcntl.h>
 
@@ -196,6 +197,8 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo
        char                    *filename = NULL;
        char                    *expanded = NULL;
 
+       if (request->dict != dict_radius) RETURN_MODULE_NOOP;
+
        if (request->packet->socket.inet.src_ipaddr.af != AF_INET) {
                RDEBUG2("IPv6 not supported!");
                RETURN_MODULE_NOOP;

diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
index 8e181826539e9102478318708a0a133bd8afe008..c25af2791b080c5a88aa9918b7d373456f28ffbd 100644 (file)
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
@@ -48,6 +48,8 @@ RCSID("$Id$")
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/hex.h>
 
+#include <freeradius-devel/radius/radius.h>
+
 #include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 #include "redis_ippool.h"

diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c
index f138af9f62c20100f9e911a3ecb53dd403ec6579..8c83c9032109eeef96b6295bcf72dc56b107f805 100644 (file)
--- a/src/modules/rlm_soh/rlm_soh.c
+++ b/src/modules/rlm_soh/rlm_soh.c
@@ -26,6 +26,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
+#include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/soh/base.h>
 
 typedef struct {

diff --git a/src/modules/rlm_sometimes/rlm_sometimes.c b/src/modules/rlm_sometimes/rlm_sometimes.c
index 612a7b99543a5c27471baa915d4490b9c7a399e6..9a0dba23ded6bf45436defa90ac787b66c34c470 100644 (file)
--- a/src/modules/rlm_sometimes/rlm_sometimes.c
+++ b/src/modules/rlm_sometimes/rlm_sometimes.c
@@ -25,6 +25,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
+#include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/util/debug.h>
 
 /*
@@ -112,6 +113,8 @@ static unlang_action_t sometimes_return(rlm_rcode_t *p_result, void const *insta
        /*
         *      If we're returning "handled", then set the packet
         *      code in the reply, so that the server responds.
+        *
+        *      @todo - MULTI_PROTOCOL - make this protocol agnostic
         */
        if ((inst->rcode == RLM_MODULE_HANDLED) && reply) {
                switch (packet->code) {

diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 389082e69b77524db114da10039ac0c7eeda2997..0ef5be21fe7001a2698c3a048717b6cbac153fb1 100644 (file)
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 
 #include <rlm_sql.h>
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/radius/radius.h>
 
 #include <ctype.h>
 
@@ -816,7 +817,6 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo
        }
        acct_status_type = vp->vp_uint32;
 
-
        switch (acct_status_type) {
        case FR_STATUS_START:
        case FR_STATUS_ALIVE:

diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c
index a737096474f97783c8d302bbe665e296d81f39b0..89406bc6133b04c6828b4f3bfa0b02e9c9bf9f7f 100644 (file)
--- a/src/modules/rlm_stats/rlm_stats.c
+++ b/src/modules/rlm_stats/rlm_stats.c
@@ -28,6 +28,7 @@ RCSID("$Id$")
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/radius/radius.h>
 
 #include <freeradius-devel/protocol/radius/freeradius.h>
 
@@ -40,6 +41,11 @@ RCSID("$Id$")
 
 #include <pthread.h>
 
+/*
+ *     @todo - MULTI_PROTOCOL - make this protocol agnostic.
+ *     Perhaps keep stats in a hash table by (request->dict, request->code) ?
+ */
+
 typedef struct {
        pthread_mutex_t         mutex;
        fr_dict_attr_t const    *type_da;                       //!< FreeRADIUS-Stats4-Type

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 99081591c2ca55af326a99626c763a5623fdcfdc..8d405dcdc3a6b6016b12c563de23feb990cc9d63 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -36,6 +36,7 @@ USES_APPLE_DEPRECATED_API
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/sysutmp.h>
+#include <freeradius-devel/radius/radius.h>
 
 #include <grp.h>
 #include <pwd.h>
@@ -379,7 +380,7 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo
        status = vp->vp_uint32;
 
        /*
-        *      FIXME: handle FR_STATUS_ALIVE like 1.5.4.3 did.
+        *      Maybe handle ALIVE, too?
         */
        if (status != FR_STATUS_START &&
            status != FR_STATUS_STOP)

diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c
index c193dddb27313aaf79c4852cb496f8299f65daee..73673462c5ed95e1500d16496764cc74b1c11aeb 100644 (file)
--- a/src/modules/rlm_yubikey/rlm_yubikey.c
+++ b/src/modules/rlm_yubikey/rlm_yubikey.c
@@ -25,6 +25,7 @@
  */
 RCSID("$Id$")
 
+#include <freeradius-devel/radius/radius.h>
 #include "rlm_yubikey.h"
 
 #ifdef HAVE_YKCLIENT
@@ -263,7 +264,7 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(rlm_rcode_t *p_result, mod
                 *      Don't print out debugging messages if we know
                 *      they're useless.
                 */
-               if (request->packet->code != FR_CODE_ACCESS_CHALLENGE) {
+               if ((request->dict == dict_radius) && request->packet->code != FR_CODE_ACCESS_CHALLENGE) {
                        RDEBUG2("No cleartext password in the request. Can't do Yubikey authentication");
                }
 

diff --git a/src/protocols/radius/list.c b/src/protocols/radius/list.c
index 57d0b4e5dbff21062b9c7c6e347b1d884045e9e5..afbffb228a0a806f141a39dab790ca1355e40a96 100644 (file)
--- a/src/protocols/radius/list.c
+++ b/src/protocols/radius/list.c
@@ -25,6 +25,7 @@
 
 RCSID("$Id$")
 
+#include "radius.h"
 #include "list.h"
 
 #include <freeradius-devel/util/base.h>

diff --git a/src/protocols/vmps/vmps.h b/src/protocols/vmps/vmps.h
index 23f042811cfa0673a656ae9063b1b63b0a889948..60b806e97c20fc9d1d468ae40a4dbbe855e10b19 100644 (file)
--- a/src/protocols/vmps/vmps.h
+++ b/src/protocols/vmps/vmps.h
@@ -32,6 +32,7 @@ extern "C" {
 #endif
 
 #define FR_VQP_MAX_CODE (5)
+#define FR_CODE_DO_NOT_RESPOND (0)
 #define FR_VQP_HDR_LEN (8)
 #define FR_VQP_VERSION (1)