Fix some more overzealous renaming

diff --git a/src/bin/collectd.c b/src/bin/collectd.c
index 7a1e8fafb7b9389d5df435ffccbb0031e05fae3d..c584ec6440eca43d302d3a8a6c9d5fa9745d7a5f 100644 (file)
--- a/src/bin/collectd.c
+++ b/src/bin/collectd.c
@@ -238,7 +238,7 @@ error:
  *
  */
 rs_stats_tmpl_t *rs_stats_collectd_init_latency(TALLOC_CTX *ctx, rs_stats_tmpl_t **out, rs_t *conf,
-                                               char const *type, rs_latency_t *stats, fr_packet_code_t code)
+                                               char const *type, rs_latency_t *stats, fr_radius_packet_code_t code)
 {
        rs_stats_tmpl_t **tmpl = out, *last;
        char *p;
@@ -264,7 +264,7 @@ rs_stats_tmpl_t *rs_stats_collectd_init_latency(TALLOC_CTX *ctx, rs_stats_tmpl_t
        };
 
 #define INIT_STATS(_ti, _v) do {\
-               strlcpy(buffer, fr_packet_names[code], sizeof(buffer)); \
+               strlcpy(buffer, fr_radius_packet_name[code], sizeof(buffer)); \
                for (p = buffer; *p; ++p) *p = tolower((uint8_t) *p);\
                last = *tmpl = rs_stats_collectd_init(ctx, conf, type, _ti, buffer, stats, _v);\
                if (!*tmpl) {\

diff --git a/src/bin/radclient-ng.c b/src/bin/radclient-ng.c
index 2b765ce99b5c9e17d983a5d68d23277262841962..56e463e44578af049adf03aa00cc994b075606ac 100644 (file)
--- a/src/bin/radclient-ng.c
+++ b/src/bin/radclient-ng.c
@@ -273,7 +273,7 @@ static int getport(char const *name)
 /*
  *     Set a port from the request type if we don't already have one
  */
-static void radclient_get_port(fr_packet_code_t type, uint16_t *port)
+static void radclient_get_port(fr_radius_packet_code_t type, uint16_t *port)
 {
        switch (type) {
        default:
@@ -306,7 +306,7 @@ static void radclient_get_port(fr_packet_code_t type, uint16_t *port)
 /*
  *     Resolve a port to a request type
  */
-static fr_packet_code_t radclient_get_code(uint16_t port)
+static fr_radius_packet_code_t radclient_get_code(uint16_t port)
 {
        /*
         *      getport returns 0 if the service doesn't exist
@@ -1017,8 +1017,8 @@ static int recv_one_packet(fr_time_delta_t wait_time)
         */
        if ((request->filter_code != FR_RADIUS_CODE_UNDEFINED) && (request->reply->code != request->filter_code)) {
                if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
-                       REDEBUG("%s: Expected %s got %s", request->name, fr_packet_names[request->filter_code],
-                               fr_packet_names[request->reply->code]);
+                       REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
+                               fr_radius_packet_name[request->reply->code]);
                } else {
                        REDEBUG("%s: Expected %u got %i", request->name, request->filter_code,
                                request->reply->code);

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index 7dea8db28378f258c40c7e648bbc7007e79d70aa..ddd3848f6b0ead7731c99683621e444e4aa8b48b 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -290,7 +290,7 @@ static int getport(char const *name)
 /*
  *     Set a port from the request type if we don't already have one
  */
-static void radclient_get_port(fr_packet_code_t type, uint16_t *port)
+static void radclient_get_port(fr_radius_packet_code_t type, uint16_t *port)
 {
        switch (type) {
        default:
@@ -323,7 +323,7 @@ static void radclient_get_port(fr_packet_code_t type, uint16_t *port)
 /*
  *     Resolve a port to a request type
  */
-static fr_packet_code_t radclient_get_code(uint16_t port)
+static fr_radius_packet_code_t radclient_get_code(uint16_t port)
 {
        /*
         *      getport returns 0 if the service doesn't exist
@@ -1198,8 +1198,8 @@ static int recv_coa_packet(fr_time_delta_t wait_time)
         */
        if (request->reply->code != request->filter_code) {
                if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
-                       REDEBUG("%s: Expected %s got %s", request->name, fr_packet_names[request->filter_code],
-                               fr_packet_names[request->reply->code]);
+                       REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
+                               fr_radius_packet_name[request->reply->code]);
                } else {
                        REDEBUG("%s: Expected %u got %i", request->name, request->filter_code,
                                request->reply->code);
@@ -1394,8 +1394,8 @@ static int recv_one_packet(fr_time_delta_t wait_time)
         */
        if ((request->filter_code != FR_RADIUS_CODE_UNDEFINED) && (request->reply->code != request->filter_code)) {
                if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
-                       REDEBUG("%s: Expected %s got %s", request->name, fr_packet_names[request->filter_code],
-                               fr_packet_names[request->reply->code]);
+                       REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
+                               fr_radius_packet_name[request->reply->code]);
                } else {
                        REDEBUG("%s: Expected %u got %i", request->name, request->filter_code,
                                request->reply->code);

diff --git a/src/bin/radclient.h b/src/bin/radclient.h
index e587c957e06817721131f2ca042479aaca19bd78..e163f780e1ff80a8c78a656abde2207992b45530 100644 (file)
--- a/src/bin/radclient.h
+++ b/src/bin/radclient.h
@@ -92,7 +92,7 @@ struct rc_request {
        fr_pair_list_t          reply_pairs;
 
        fr_pair_list_t          filter;         //!< If the reply passes the filter, then the request passes.
-       fr_packet_code_t        filter_code;    //!< Expected code of the response packet.
+       fr_radius_packet_code_t filter_code;    //!< Expected code of the response packet.
 
        int                     resend;
        int                     tries;

diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index 6da4ea4aeba0e3d170d4b98c271c97ffb6686e24..b3826ae5426d353b3a5cfb93caf254e1b3e872be 100644 (file)
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -338,7 +338,7 @@ static void rs_packet_print_csv(uint64_t count, rs_status_t status, fr_pcap_t *h
        /* Status, Type, Interface, Src, Src port, Dst, Dst port, ID */
        if (FR_RADIUS_PACKET_CODE_VALID(packet->code)) {
                if (fr_sbuff_in_sprintf(&sbuff, "%s,%s,%s,%i,%s,%i,%i,",
-                                       fr_packet_names[packet->code], handle->name,
+                                       fr_radius_packet_name[packet->code], handle->name,
                                        src, packet->socket.inet.src_port, dst, packet->socket.inet.dst_port, packet->id) < 0) return;
        } else {
                if (fr_sbuff_in_sprintf(&sbuff, "%u,%s,%s,%i,%s,%i,%i,", packet->code, handle->name,
@@ -411,7 +411,7 @@ static void rs_packet_print_fancy(uint64_t count, rs_status_t status, fr_pcap_t
 
        if (FR_RADIUS_PACKET_CODE_VALID(packet->code)) {
                len = snprintf(p, s, "%s Id %i %s:%s:%d %s %s:%i ",
-                              fr_packet_names[packet->code],
+                              fr_radius_packet_name[packet->code],
                               packet->id,
                               handle->name,
                               response ? dst : src,
@@ -633,7 +633,7 @@ static void rs_stats_process_counters(rs_latency_t *stats)
        }
 }
 
-static void rs_stats_print_code_fancy(rs_latency_t *stats, fr_packet_code_t code)
+static void rs_stats_print_code_fancy(rs_latency_t *stats, fr_radius_packet_code_t code)
 {
        int i;
        bool have_rt = false;
@@ -643,7 +643,7 @@ static void rs_stats_print_code_fancy(rs_latency_t *stats, fr_packet_code_t code
        if (!stats->interval.received && !have_rt && !stats->interval.reused) return;
 
        if (stats->interval.received || stats->interval.linked) {
-               INFO("%s counters:", fr_packet_names[code]);
+               INFO("%s counters:", fr_radius_packet_name[code]);
                if (stats->interval.received > 0) {
                        INFO("\tTotal     : %.3lf/s" , stats->interval.received);
                }
@@ -652,7 +652,7 @@ static void rs_stats_print_code_fancy(rs_latency_t *stats, fr_packet_code_t code
        if (stats->interval.linked > 0) {
                INFO("\tLinked    : %.3lf/s", stats->interval.linked);
                INFO("\tUnlinked  : %.3lf/s", stats->interval.unlinked);
-               INFO("%s latency:", fr_packet_names[code]);
+               INFO("%s latency:", fr_radius_packet_name[code]);
                INFO("\tHigh      : %.3lfms", stats->interval.latency_high);
                INFO("\tLow       : %.3lfms", stats->interval.latency_low);
                INFO("\tAverage   : %.3lfms", stats->interval.latency_average);
@@ -660,7 +660,7 @@ static void rs_stats_print_code_fancy(rs_latency_t *stats, fr_packet_code_t code
        }
 
        if (have_rt || stats->interval.lost || stats->interval.reused) {
-               INFO("%s retransmits & loss:", fr_packet_names[code]);
+               INFO("%s retransmits & loss:", fr_radius_packet_name[code]);
 
                if (stats->interval.lost)       INFO("\tLost      : %.3lf/s", stats->interval.lost);
                if (stats->interval.reused)     INFO("\tID Reused : %.3lf/s", stats->interval.reused);
@@ -738,7 +738,7 @@ static void rs_stats_print_csv_header(rs_update_t *this)
        }
 
        for (i = 0; i < rs_codes_len; i++) {
-               char const *name = fr_packet_names[rs_useful_codes[i]];
+               char const *name = fr_radius_packet_name[rs_useful_codes[i]];
 
                fprintf(stdout,
                        ",\"%s received/s\""
@@ -2894,7 +2894,7 @@ int main(int argc, char *argv[])
                        DEBUG2("  RADIUS secret           : [%s]", conf->radius_secret);
 
                if (conf->filter_request_code) {
-                       DEBUG2("  RADIUS request code     : [%s]", fr_packet_names[conf->filter_request_code]);
+                       DEBUG2("  RADIUS request code     : [%s]", fr_radius_packet_name[conf->filter_request_code]);
                }
 
                if (!fr_pair_list_empty(&conf->filter_request_vps)){
@@ -2903,7 +2903,7 @@ int main(int argc, char *argv[])
                }
 
                if (conf->filter_response_code) {
-                       DEBUG2("  RADIUS response code    : [%s]", fr_packet_names[conf->filter_response_code]);
+                       DEBUG2("  RADIUS response code    : [%s]", fr_radius_packet_name[conf->filter_response_code]);
                }
 
                if (conf->to_output_dir) {

diff --git a/src/bin/radsniff.h b/src/bin/radsniff.h
index 17d2373a919a1da3e56484daa905476c12aa3edb..10c2de3c134cbcb676f0c24bcb98032b29ee09e7 100644 (file)
--- a/src/bin/radsniff.h
+++ b/src/bin/radsniff.h
@@ -296,8 +296,8 @@ struct rs {
 
        fr_pair_list_t          filter_request_vps;     //!< Sorted filter vps.
        fr_pair_list_t          filter_response_vps;    //!< Sorted filter vps.
-       fr_packet_code_t                        filter_request_code;    //!< Filter request packets by code.
-       fr_packet_code_t                        filter_response_code;   //!< Filter response packets by code.
+       fr_radius_packet_code_t                 filter_request_code;    //!< Filter request packets by code.
+       fr_radius_packet_code_t                 filter_response_code;   //!< Filter response packets by code.
 
        rs_status_t             event_flags;            //!< Events we log and capture on.
        rs_packet_logger_t      logger;                 //!< Packet logger
@@ -352,7 +352,7 @@ struct rs_stats_tmpl
  *     collectd.c - Registration and processing functions
  */
 rs_stats_tmpl_t *rs_stats_collectd_init_latency(TALLOC_CTX *ctx, rs_stats_tmpl_t **out, rs_t *conf,
-                                               char const *type, rs_latency_t *stats, fr_packet_code_t code);
+                                               char const *type, rs_latency_t *stats, fr_radius_packet_code_t code);
 void rs_stats_collectd_do_stats(rs_t *conf, rs_stats_tmpl_t *tmpls, struct timeval *now);
 int rs_stats_collectd_open(rs_t *conf);
 int rs_stats_collectd_close(rs_t *conf);

diff --git a/src/lib/eap/chbind.c b/src/lib/eap/chbind.c
index f5cd6351a37efd1cbce0d0765c32bf856473b561..e4231463aca4b232480625e0e073d726aac6ac27 100644 (file)
--- a/src/lib/eap/chbind.c
+++ b/src/lib/eap/chbind.c
@@ -168,9 +168,9 @@ static size_t chbind_get_data(chbind_packet_t const *packet,
 }
 
 
-fr_packet_code_t chbind_process(request_t *request, CHBIND_REQ *chbind)
+fr_radius_packet_code_t chbind_process(request_t *request, CHBIND_REQ *chbind)
 {
-       fr_packet_code_t                code;
+       fr_radius_packet_code_t         code;
        rlm_rcode_t     rcode;
        request_t       *fake = NULL;
        uint8_t const   *attr_data;

diff --git a/src/lib/eap/chbind.h b/src/lib/eap/chbind.h
index e3b792c2c9272a04a9b4d7dbb970c6d475a4da0a..adc6a9f506a45e036188490dc730001f7b40a226 100644 (file)
--- a/src/lib/eap/chbind.h
+++ b/src/lib/eap/chbind.h
@@ -57,7 +57,7 @@ typedef struct {
 #define CHBIND_CODE_FAILURE             3
 
 /* Channel binding function prototypes */
-fr_packet_code_t chbind_process(request_t *request, CHBIND_REQ *chbind_req);
+fr_radius_packet_code_t chbind_process(request_t *request, CHBIND_REQ *chbind_req);
 
 fr_pair_t *eap_chbind_packet2vp(TALLOC_CTX *ctx, chbind_packet_t *chbind);
 chbind_packet_t *eap_chbind_vp2packet(TALLOC_CTX *ctx, fr_pair_list_t *vps);

diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index a3a4de6d7bdce69cc462378e240e67b74b6ee953..11f39a3f5f82c6bf83acf60e96ec0ca4693f9396 100644 (file)
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -413,7 +413,7 @@ static ssize_t mod_encode(UNUSED void const *instance, request_t *request, uint8
 
        if (RDEBUG_ENABLED) {
                RDEBUG("Sending %s ID %i from %pV:%i to %pV:%i length %zu via socket %s",
-                      fr_packet_names[request->reply->code],
+                      fr_radius_packet_name[request->reply->code],
                       request->reply->id,
                       fr_box_ipaddr(request->reply->socket.inet.src_ipaddr),
                       request->reply->socket.inet.src_port,

diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index 4ae95a59e67754f65c6df839d6d3e945bbe4d8a8..f5939327885a7affc1a248798a930df4732a3e7c 100644 (file)
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -229,7 +229,7 @@ have_packet:
         *      Print out what we received.
         */
        DEBUG2("proto_radius_tcp - Received %s ID %d length %d %s",
-              fr_packet_names[buffer[0]], buffer[1],
+              fr_radius_packet_name[buffer[0]], buffer[1],
               (int) packet_len, thread->name);
 
        return packet_len;

diff --git a/src/listen/radius/proto_radius_udp.c b/src/listen/radius/proto_radius_udp.c
index b0b9ac834095a65a83c5ff4a8ee9ec78fb7a944c..3eafa8043a40661a1c9bd518c1481cbb6d486cf0 100644 (file)
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -190,7 +190,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time
         *      Print out what we received.
         */
        DEBUG2("proto_radius_udp - Received %s ID %d length %d %s",
-              fr_packet_names[buffer[0]], buffer[1],
+              fr_radius_packet_name[buffer[0]], buffer[1],
               (int) packet_len, thread->name);
 
        return packet_len;

diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
index e359c0860c735abc55327eaf3635366fa52e0aae..e25e5279e217829f5a1679e3fdf6b85e21b69591 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
@@ -124,7 +124,7 @@ static void eap_fast_send_error(fr_tls_session_t *tls_session, int error)
        eap_fast_tlv_append(tls_session, attr_eap_fast_error, true, sizeof(value), &value);
 }
 
-static void eap_fast_append_result(fr_tls_session_t *tls_session, fr_packet_code_t code)
+static void eap_fast_append_result(fr_tls_session_t *tls_session, fr_radius_packet_code_t code)
 {
        eap_fast_tunnel_t       *t = talloc_get_type_abort(tls_session->opaque, eap_fast_tunnel_t);
        uint16_t                state;
@@ -567,10 +567,10 @@ static rlm_rcode_t CC_HINT(nonnull) process_reply(UNUSED eap_session_t *eap_sess
        return rcode;
 }
 
-static fr_packet_code_t eap_fast_eap_payload(request_t *request, eap_session_t *eap_session,
+static fr_radius_packet_code_t eap_fast_eap_payload(request_t *request, eap_session_t *eap_session,
                                    fr_tls_session_t *tls_session, fr_pair_t *tlv_eap_payload)
 {
-       fr_packet_code_t                        code = FR_RADIUS_CODE_ACCESS_REJECT;
+       fr_radius_packet_code_t                 code = FR_RADIUS_CODE_ACCESS_REJECT;
        rlm_rcode_t             rcode;
        fr_pair_t               *vp;
        eap_fast_tunnel_t       *t;
@@ -774,7 +774,7 @@ static fr_packet_code_t eap_fast_eap_payload(request_t *request, eap_session_t *
        return code;
 }
 
-static fr_packet_code_t eap_fast_crypto_binding(request_t *request, UNUSED eap_session_t *eap_session,
+static fr_radius_packet_code_t eap_fast_crypto_binding(request_t *request, UNUSED eap_session_t *eap_session,
                                       fr_tls_session_t *tls_session, eap_tlv_crypto_binding_tlv_t *binding)
 {
        uint8_t                 cmac[sizeof(binding->compound_mac)];
@@ -797,7 +797,7 @@ static fr_packet_code_t eap_fast_crypto_binding(request_t *request, UNUSED eap_s
        return FR_RADIUS_CODE_ACCESS_ACCEPT;
 }
 
-static fr_packet_code_t eap_fast_process_tlvs(request_t *request, eap_session_t *eap_session,
+static fr_radius_packet_code_t eap_fast_process_tlvs(request_t *request, eap_session_t *eap_session,
                                     fr_tls_session_t *tls_session, fr_pair_list_t *fast_vps)
 {
        eap_fast_tunnel_t               *t = talloc_get_type_abort(tls_session->opaque, eap_fast_tunnel_t);
@@ -809,7 +809,7 @@ static fr_packet_code_t eap_fast_process_tlvs(request_t *request, eap_session_t
        for (vp = fr_pair_list_head(fast_vps);
             vp;
             vp = fr_pair_list_next(fast_vps, vp)) {
-               fr_packet_code_t code = FR_RADIUS_CODE_ACCESS_REJECT;
+               fr_radius_packet_code_t code = FR_RADIUS_CODE_ACCESS_REJECT;
                if (vp->da->parent == fr_dict_root(dict_eap_fast)) {
                        if (vp->da == attr_eap_fast_eap_payload) {
                                code = eap_fast_eap_payload(request, eap_session, tls_session, vp);
@@ -881,7 +881,7 @@ static fr_packet_code_t eap_fast_process_tlvs(request_t *request, eap_session_t
        }
 
        if (binding) {
-               fr_packet_code_t code = eap_fast_crypto_binding(request, eap_session, tls_session, binding);
+               fr_radius_packet_code_t code = eap_fast_crypto_binding(request, eap_session, tls_session, binding);
                if (code == FR_RADIUS_CODE_ACCESS_ACCEPT) {
                        t->stage = EAP_FAST_PROVISIONING;
                }
@@ -895,9 +895,9 @@ static fr_packet_code_t eap_fast_process_tlvs(request_t *request, eap_session_t
 /*
  * Process the inner tunnel data
  */
-fr_packet_code_t eap_fast_process(request_t *request, eap_session_t *eap_session, fr_tls_session_t *tls_session)
+fr_radius_packet_code_t eap_fast_process(request_t *request, eap_session_t *eap_session, fr_tls_session_t *tls_session)
 {
-       fr_packet_code_t                        code;
+       fr_radius_packet_code_t                 code;
        fr_pair_list_t          fast_vps;
        uint8_t const           *data;
        size_t                  data_len;

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 871de6730df7f2b7f048cf58e8e937775fe8f13d..d54b0f868ec1ca17a463661d313027a7d1598bb5 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
@@ -254,7 +254,7 @@ extern HIDDEN fr_dict_t const *dict_eap_fast;
  */
 void eap_fast_tlv_append(fr_tls_session_t *tls_session, fr_dict_attr_t const *da, bool mandatory,
                         int length, const void *data) CC_HINT(nonnull);
-fr_packet_code_t eap_fast_process(request_t *request, eap_session_t *eap_session, fr_tls_session_t *tls_session) CC_HINT(nonnull);
+fr_radius_packet_code_t eap_fast_process(request_t *request, eap_session_t *eap_session, fr_tls_session_t *tls_session) CC_HINT(nonnull);
 
 /*
  *     A bunch of EAP-FAST helper functions.

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 69537bd1950a94130b8bee68629ba87b484eb159..02eecbca33fd5b9d307addcecbeb5b1d5be2b00f 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -290,7 +290,7 @@ static rlm_rcode_t CC_HINT(nonnull) process_reply(eap_session_t *eap_session, fr
                 *      attributes.
                 */
                if (FR_RADIUS_PACKET_CODE_VALID(reply->code)) {
-                       RDEBUG2("Got tunneled reply %s", fr_packet_names[reply->code]);
+                       RDEBUG2("Got tunneled reply %s", fr_radius_packet_name[reply->code]);
                } else {
                        RDEBUG2("Got tunneled reply code %i", reply->code);
                }

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 cf0685648534f71c093e64c6de4361e0e285deaf..34cc7534c79833851d3e9e675beef2a895bf015a 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
@@ -51,4 +51,4 @@ typedef struct {
 /*
  *     Process the TTLS portion of an EAP-TTLS request.
  */
-fr_packet_code_t eap_ttls_process(request_t *request, eap_session_t *eap_session, fr_tls_session_t *tls_session) CC_HINT(nonnull);
+fr_radius_packet_code_t eap_ttls_process(request_t *request, eap_session_t *eap_session, fr_tls_session_t *tls_session) CC_HINT(nonnull);

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
index 789abbbe995d203feff0d31aafb3c96d3d5c63d9..7f54bb0d2bd3395a9c088b0c09a15b79ce836da1 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -614,9 +614,9 @@ static rlm_rcode_t CC_HINT(nonnull) process_reply(NDEBUG_UNUSED eap_session_t *e
 /*
  *     Process the "diameter" contents of the tunneled data.
  */
-fr_packet_code_t eap_ttls_process(request_t *request, eap_session_t *eap_session, fr_tls_session_t *tls_session)
+fr_radius_packet_code_t eap_ttls_process(request_t *request, eap_session_t *eap_session, fr_tls_session_t *tls_session)
 {
-       fr_packet_code_t                        code = FR_RADIUS_CODE_ACCESS_REJECT;
+       fr_radius_packet_code_t                 code = FR_RADIUS_CODE_ACCESS_REJECT;
        rlm_rcode_t             rcode;
        fr_pair_t               *vp = NULL;
        fr_dcursor_t            cursor;
@@ -723,7 +723,7 @@ fr_packet_code_t eap_ttls_process(request_t *request, eap_session_t *eap_session
         */
        chbind = eap_chbind_vp2packet(request, &request->request_pairs);
        if (chbind) {
-               fr_packet_code_t chbind_code;
+               fr_radius_packet_code_t chbind_code;
                CHBIND_REQ *req = talloc_zero(request, CHBIND_REQ);
 
                RDEBUG2("received chbind request");

diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 71097b51efa19547c020fb54e844447de65c768f..c04c443728feb3ce42241322e8fb2ea6125eee19 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -418,7 +418,7 @@ static unlang_action_t CC_HINT(nonnull) mod_process(rlm_rcode_t *p_result, modul
 
        if (!inst->allowed[request->packet->code]) {
                REDEBUG("Packet code %s is disallowed by the configuration",
-                      fr_packet_names[request->packet->code]);
+                      fr_radius_packet_name[request->packet->code]);
                RETURN_MODULE_FAIL;
        }
 
@@ -503,7 +503,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
         */
        if (inst->replicate && inst->status_check) {
                cf_log_warn(conf, "Ignoring 'status_check = %s' due to 'replicate = true'",
-                           fr_packet_names[inst->status_check]);
+                           fr_radius_packet_name[inst->status_check]);
                inst->status_check = 0;
        }
 
@@ -520,7 +520,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
                } else if (!inst->allowed[inst->status_check]) {
                        cf_log_err(conf, "Using 'status_check = %s' requires also 'type = %s'",
-                                  fr_packet_names[inst->status_check], fr_packet_names[inst->status_check]);
+                                  fr_radius_packet_name[inst->status_check], fr_radius_packet_name[inst->status_check]);
                        return -1;
                }
 

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 0e29eceb8f1119cb136b2cc407cadc179a30553b..033ea277386edb938cfbc178db440b9bcbb1d307 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -411,7 +411,7 @@ static void CC_HINT(nonnull) status_check_alloc(udp_handle_t *h)
        u->code = inst->parent->status_check;
        request->packet->code = u->code;
 
-       DEBUG3("%s - Status check packet type will be %s", h->module_name, fr_packet_names[u->code]);
+       DEBUG3("%s - Status check packet type will be %s", h->module_name, fr_radius_packet_name[u->code]);
        log_request_pair_list(L_DBG_LVL_3, request, NULL, &request->request_pairs, NULL);
 
        MEM(h->status_r = talloc_zero(request, udp_result_t));
@@ -638,7 +638,7 @@ static void conn_writable_status_check(fr_event_list_t *el, UNUSED int fd, UNUSE
        }
 
        DEBUG("%s - Sending %s ID %d length %ld over connection %s",
-             h->module_name, fr_packet_names[u->code], u->id, u->packet_len, h->name);
+             h->module_name, fr_radius_packet_name[u->code], u->id, u->packet_len, h->name);
 
        if (encode(h->inst, h->status_request, u, u->id) < 0) {
        fail:
@@ -651,7 +651,7 @@ static void conn_writable_status_check(fr_event_list_t *el, UNUSED int fd, UNUSE
        slen = write(h->fd, u->packet, u->packet_len);
        if (slen < 0) {
                ERROR("%s - Failed sending %s ID %d length %ld over connection %s: %s",
-                     h->module_name, fr_packet_names[u->code], u->id, u->packet_len, h->name, fr_syserror(errno));
+                     h->module_name, fr_radius_packet_name[u->code], u->id, u->packet_len, h->name, fr_syserror(errno));
                goto fail;
        }
        fr_assert((size_t)slen == u->packet_len);
@@ -1175,7 +1175,7 @@ static decode_fail_t decode(TALLOC_CTX *ctx, fr_pair_list_t *reply, uint8_t *res
        code = data[0];
 
        RDEBUG("Received %s ID %d length %ld reply packet on connection %s",
-              fr_packet_names[code], data[1], data_len, h->name);
+              fr_radius_packet_name[code], data[1], data_len, h->name);
        log_request_pair_list(L_DBG_LVL_2, request, NULL, reply, NULL);
 
        *response_code = code;
@@ -1772,7 +1772,7 @@ static void request_mux(fr_event_list_t *el,
                        u->id = u->rr->id;
 
                        RDEBUG("Sending %s ID %d length %ld over connection %s",
-                              fr_packet_names[u->code], u->id, u->packet_len, h->name);
+                              fr_radius_packet_name[u->code], u->id, u->packet_len, h->name);
 
                        if (encode(h->inst, request, u, u->id) < 0) {
                                /*
@@ -1793,7 +1793,7 @@ static void request_mux(fr_event_list_t *el,
                        (void) radius_track_entry_update(u->rr, u->packet + RADIUS_AUTH_VECTOR_OFFSET);
                } else {
                        RDEBUG("Retransmitting %s ID %d length %ld over connection %s",
-                              fr_packet_names[u->code], u->id, u->packet_len, h->name);
+                              fr_radius_packet_name[u->code], u->id, u->packet_len, h->name);
                }
 
                log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->request_pairs, NULL);
@@ -2001,7 +2001,7 @@ static void request_mux_replicate(UNUSED fr_event_list_t *el,
                }
 
                RDEBUG("Sending %s ID %d length %ld over connection %s",
-                      fr_packet_names[u->code], u->id, u->packet_len, h->name);
+                      fr_radius_packet_name[u->code], u->id, u->packet_len, h->name);
                RHEXDUMP3(u->packet, u->packet_len, "Encoded packet");
 
                h->coalesced[queued].treq = treq;

diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c
index 3a692fd8ed821564a072495cb34d1f23f07a25d1..5d9f42778cf8c7611622a9f3055fd4ed392a568d 100644 (file)
--- a/src/modules/rlm_stats/rlm_stats.c
+++ b/src/modules/rlm_stats/rlm_stats.c
@@ -333,7 +333,7 @@ static unlang_action_t CC_HINT(nonnull) mod_stats(rlm_rcode_t *p_result, module_
 
                if (!local_stats[i]) continue;
 
-               strlcpy(buffer + 18, fr_packet_names[i], sizeof(buffer) - 18);
+               strlcpy(buffer + 18, fr_radius_packet_name[i], sizeof(buffer) - 18);
                da = fr_dict_attr_by_name(NULL, fr_dict_root(dict_radius), buffer);
                if (!da) continue;
 

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 77ce175642ca5c25d416f424923796d993921c18..adf38bd6d20b948a14e961996b87a8a38d13fb87 100644 (file)
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -173,7 +173,7 @@ typedef struct {
 
 #define FR_RADIUS_PROCESS_CODE_VALID(_x) (FR_RADIUS_PACKET_CODE_VALID(_x) || (_x == FR_RADIUS_CODE_DO_NOT_RESPOND))
 
-#define PROCESS_PACKET_TYPE            fr_packet_code_t
+#define PROCESS_PACKET_TYPE            fr_radius_packet_code_t
 #define PROCESS_CODE_MAX               FR_RADIUS_CODE_MAX
 #define PROCESS_CODE_DO_NOT_RESPOND    FR_RADIUS_CODE_DO_NOT_RESPOND
 #define PROCESS_PACKET_CODE_VALID      FR_RADIUS_PROCESS_CODE_VALID
@@ -234,7 +234,7 @@ static void radius_packet_debug(request_t *request, fr_packet_t *packet, fr_pair
 #endif
                       "",
                       received ? "Received" : "Sending",
-                      fr_packet_names[packet->code],
+                      fr_radius_packet_name[packet->code],
                       packet->id,
                       packet->socket.inet.src_ipaddr.af == AF_INET6 ? "[" : "",
                       fr_box_ipaddr(packet->socket.inet.src_ipaddr),

diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c
index 80bcd6370d961b14f18bf79bdf437c1e3b21f9f5..25ada2f570f0b4897db4b26a1d2d7d8cc1604464 100644 (file)
--- a/src/process/ttls/base.c
+++ b/src/process/ttls/base.c
@@ -158,7 +158,7 @@ typedef struct {
        process_ttls_auth_t             auth;           //!< Authentication configuration.
 } process_ttls_t;
 
-#define PROCESS_PACKET_TYPE            fr_packet_code_t
+#define PROCESS_PACKET_TYPE            fr_radius_packet_code_t
 #define PROCESS_CODE_MAX               FR_RADIUS_CODE_MAX
 #define PROCESS_CODE_DO_NOT_RESPOND    FR_RADIUS_CODE_DO_NOT_RESPOND
 #define PROCESS_PACKET_CODE_VALID      FR_RADIUS_PACKET_CODE_VALID
@@ -217,7 +217,7 @@ static void radius_packet_debug(request_t *request, fr_packet_t *packet, fr_pair
 #endif
                       "",
                       received ? "Received" : "Sending",
-                      fr_packet_names[packet->code],
+                      fr_radius_packet_name[packet->code],
                       packet->id,
                       packet->socket.inet.src_ipaddr.af == AF_INET6 ? "[" : "",
                       fr_box_ipaddr(packet->socket.inet.src_ipaddr),

diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c
index 498733d1e7af223db9cf9ba26a4bbdffed5684cc..97665db9c64fcbe1eab944f05f6f5b3e5bbddaa4 100644 (file)
--- a/src/protocols/radius/base.c
+++ b/src/protocols/radius/base.c
@@ -91,7 +91,7 @@ fr_table_num_sorted_t const fr_radius_request_name_table[] = {
 };
 size_t fr_radius_request_name_table_len = NUM_ELEMENTS(fr_radius_request_name_table);
 
-char const *fr_packet_names[FR_RADIUS_CODE_MAX] = {
+char const *fr_radius_packet_name[FR_RADIUS_CODE_MAX] = {
        "",                                     //!< 0
        "Access-Request",
        "Access-Accept",
@@ -151,7 +151,7 @@ char const *fr_packet_names[FR_RADIUS_CODE_MAX] = {
 /** If we get a reply, the request must come from one of a small
  * number of packet types.
  */
-static const fr_packet_code_t allowed_replies[FR_RADIUS_CODE_MAX] = {
+static const fr_radius_packet_code_t allowed_replies[FR_RADIUS_CODE_MAX] = {
        [FR_RADIUS_CODE_ACCESS_ACCEPT]          = FR_RADIUS_CODE_ACCESS_REQUEST,
        [FR_RADIUS_CODE_ACCESS_CHALLENGE]       = FR_RADIUS_CODE_ACCESS_REQUEST,
        [FR_RADIUS_CODE_ACCESS_REJECT]          = FR_RADIUS_CODE_ACCESS_REQUEST,
@@ -1028,7 +1028,7 @@ ssize_t   fr_radius_decode(TALLOC_CTX *ctx, fr_pair_list_t *out,
 
                if (!allowed_replies[code]) {
                        fr_strerror_printf("%s packet received unknown reply code %s",
-                                          fr_packet_names[decode_ctx->request_code], fr_packet_names[code]);
+                                          fr_radius_packet_name[decode_ctx->request_code], fr_radius_packet_name[code]);
                        return DECODE_FAIL_UNKNOWN_PACKET_CODE;
                }
 
@@ -1042,7 +1042,7 @@ ssize_t   fr_radius_decode(TALLOC_CTX *ctx, fr_pair_list_t *out,
                if ((code != FR_RADIUS_CODE_PROTOCOL_ERROR) && (decode_ctx->request_code != FR_RADIUS_CODE_STATUS_SERVER) &&
                    (allowed_replies[code] != decode_ctx->request_code)) {
                        fr_strerror_printf("%s packet received invalid reply code %s",
-                                          fr_packet_names[decode_ctx->request_code], fr_packet_names[code]);
+                                          fr_radius_packet_name[decode_ctx->request_code], fr_radius_packet_name[code]);
                        return DECODE_FAIL_UNKNOWN_PACKET_CODE;
                }
        }

diff --git a/src/protocols/radius/client.c b/src/protocols/radius/client.c
index bb8b383870a992553e75878ea9cfe06956b43e5e..9ee85557ba43cf04fc974b4df204a2aa33c893ef 100644 (file)
--- a/src/protocols/radius/client.c
+++ b/src/protocols/radius/client.c
@@ -115,7 +115,7 @@ int fr_radius_client_fd_bio_write(fr_radius_client_fd_bio_t *my, UNUSED void *pa
        return 0;
 }
 
-static const fr_packet_code_t allowed_replies[FR_RADIUS_CODE_MAX] = {
+static const fr_radius_packet_code_t allowed_replies[FR_RADIUS_CODE_MAX] = {
        [FR_RADIUS_CODE_ACCESS_ACCEPT]          = FR_RADIUS_CODE_ACCESS_REQUEST,
        [FR_RADIUS_CODE_ACCESS_CHALLENGE]       = FR_RADIUS_CODE_ACCESS_REQUEST,
        [FR_RADIUS_CODE_ACCESS_REJECT]          = FR_RADIUS_CODE_ACCESS_REQUEST,

diff --git a/src/protocols/radius/defs.h b/src/protocols/radius/defs.h
index 7bf1107fa6977d662fda1c54bd399b73be380f50..21d3ab5f27f90e3b3e2289703513f509146f83a9 100644 (file)
--- a/src/protocols/radius/defs.h
+++ b/src/protocols/radius/defs.h
@@ -52,7 +52,7 @@ typedef enum {
        FR_RADIUS_CODE_PROTOCOL_ERROR           = 52,   //!< RFC7930 - Protocol-Error (generic NAK)
        FR_RADIUS_CODE_MAX                      = 53,   //!< Maximum possible protocol code
        FR_RADIUS_CODE_DO_NOT_RESPOND           = 256   //!< Special rcode to indicate we will not respond.
-} fr_packet_code_t;
+} fr_radius_packet_code_t;
 
 #define FR_AUTH_UDP_PORT               1812
 #define FR_AUTH_UDP_PORT_ALT           1645

diff --git a/src/protocols/radius/list.c b/src/protocols/radius/list.c
index 38a031627326bcdb6002fdc6ee09275ae8ec2768..258f4007f85fa30e761e5cc7571b1aaa5007eed3 100644 (file)
--- a/src/protocols/radius/list.c
+++ b/src/protocols/radius/list.c
@@ -752,7 +752,7 @@ void fr_packet_header_log(fr_log_t const *log, fr_packet_t *packet, bool receive
 #endif
                       "length %zu\n",
                        received ? "Received" : "Sent",
-                       fr_packet_names[packet->code],
+                       fr_radius_packet_name[packet->code],
                        packet->id,
                        packet->socket.inet.src_ipaddr.af == AF_INET6 ? "[" : "",
                        fr_inet_ntop(src_ipaddr, sizeof(src_ipaddr), &packet->socket.inet.src_ipaddr),

diff --git a/src/protocols/radius/packet.c b/src/protocols/radius/packet.c
index cae9c7e8d24f5ab8abfd0aa80da02bc750f56929..b9b867dee65cdbd5447b06dfd98b3fba10555783 100644 (file)
--- a/src/protocols/radius/packet.c
+++ b/src/protocols/radius/packet.c
@@ -370,7 +370,7 @@ void _fr_packet_log_hex(fr_log_t const *log, fr_packet_t const *packet, char con
        }
 
        if ((packet->data[0] > 0) && (packet->data[0] < FR_RADIUS_CODE_MAX)) {
-               fr_log(log, L_DBG, file, line, "  Code     : %s", fr_packet_names[packet->data[0]]);
+               fr_log(log, L_DBG, file, line, "  Code     : %s", fr_radius_packet_name[packet->data[0]]);
        } else {
                fr_log(log, L_DBG, file, line, "  Code     : %u", packet->data[0]);
        }

diff --git a/src/protocols/radius/radius.h b/src/protocols/radius/radius.h
index 64529cc2f9f8aa47c213fc23ad9fe7d33b5300bb..7a11c757d7aa56cbb5fd42d3726d2bcf74ec4b29 100644 (file)
--- a/src/protocols/radius/radius.h
+++ b/src/protocols/radius/radius.h
@@ -47,7 +47,7 @@
  *     protocols/radius/base.c
  */
 
-extern char const *fr_packet_names[FR_RADIUS_CODE_MAX];
+extern char const *fr_radius_packet_name[FR_RADIUS_CODE_MAX];
 #define FR_RADIUS_PACKET_CODE_VALID(_x) ((_x > 0) && (_x < FR_RADIUS_CODE_MAX))
 
 #define AUTH_PASS_LEN (RADIUS_AUTH_VECTOR_LENGTH)