clean up RADIUS names

perl -p -i -e 's/fr_packet_codes/fr_radius_packet_names/g' $(find . -name "*.[ch]" -print)

diff --git a/src/bin/collectd.c b/src/bin/collectd.c
index 495a6d839f29f3d2702041526465fbf5dd666603..aa5684ce2bf0e7b4aa58a74828548e6cc154d626 100644 (file)
--- a/src/bin/collectd.c
+++ b/src/bin/collectd.c
@@ -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_codes[code], sizeof(buffer)); \
+               strlcpy(buffer, fr_radius_packet_names[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.c b/src/bin/radclient.c
index 8927ef0b127c60e1c2c64f6fd5d7bf5707d1a417..f7b2b4a7f2df5ec85f1bf2e6e28be0e4359c39bb 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -1160,8 +1160,8 @@ static int recv_coa_packet(fr_time_delta_t wait_time)
         */
        if (request->reply->code != request->filter_code) {
                if (is_radius_code(request->reply->code)) {
-                       REDEBUG("%s: Expected %s got %s", request->name, fr_packet_codes[request->filter_code],
-                               fr_packet_codes[request->reply->code]);
+                       REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_names[request->filter_code],
+                               fr_radius_packet_names[request->reply->code]);
                } else {
                        REDEBUG("%s: Expected %u got %i", request->name, request->filter_code,
                                request->reply->code);
@@ -1355,8 +1355,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 (is_radius_code(request->reply->code)) {
-                       REDEBUG("%s: Expected %s got %s", request->name, fr_packet_codes[request->filter_code],
-                               fr_packet_codes[request->reply->code]);
+                       REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_names[request->filter_code],
+                               fr_radius_packet_names[request->reply->code]);
                } else {
                        REDEBUG("%s: Expected %u got %i", request->name, request->filter_code,
                                request->reply->code);

diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index 66bf76c862d3be93d8db14145d1d64a5b219b45f..160c5d7f7a29dd5d68af3dbb7906a0fb7c93739b 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 (is_radius_code(packet->code)) {
                if (fr_sbuff_in_sprintf(&sbuff, "%s,%s,%s,%i,%s,%i,%i,",
-                                       fr_packet_codes[packet->code], handle->name,
+                                       fr_radius_packet_names[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 (is_radius_code(packet->code)) {
                len = snprintf(p, s, "%s Id %i %s:%s:%d %s %s:%i ",
-                              fr_packet_codes[packet->code],
+                              fr_radius_packet_names[packet->code],
                               packet->id,
                               handle->name,
                               response ? dst : src,
@@ -643,7 +643,7 @@ static void rs_stats_print_code_fancy(rs_latency_t *stats, fr_radius_packet_code
        if (!stats->interval.received && !have_rt && !stats->interval.reused) return;
 
        if (stats->interval.received || stats->interval.linked) {
-               INFO("%s counters:", fr_packet_codes[code]);
+               INFO("%s counters:", fr_radius_packet_names[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_radius_packet_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_codes[code]);
+               INFO("%s latency:", fr_radius_packet_names[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_radius_packet_code
        }
 
        if (have_rt || stats->interval.lost || stats->interval.reused) {
-               INFO("%s retransmits & loss:", fr_packet_codes[code]);
+               INFO("%s retransmits & loss:", fr_radius_packet_names[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_codes[rs_useful_codes[i]];
+               char const *name = fr_radius_packet_names[rs_useful_codes[i]];
 
                fprintf(stdout,
                        ",\"%s received/s\""
@@ -2860,7 +2860,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_codes[conf->filter_request_code]);
+                       DEBUG2("  RADIUS request code     : [%s]", fr_radius_packet_names[conf->filter_request_code]);
                }
 
                if (!fr_pair_list_empty(&conf->filter_request_vps)){
@@ -2869,7 +2869,7 @@ int main(int argc, char *argv[])
                }
 
                if (conf->filter_response_code) {
-                       DEBUG2("  RADIUS response code    : [%s]", fr_packet_codes[conf->filter_response_code]);
+                       DEBUG2("  RADIUS response code    : [%s]", fr_radius_packet_names[conf->filter_response_code]);
                }
 
                if (conf->to_output_dir) {

diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index 60e0441a3903323b36d88ffdf5ac117d66090f31..07c3b534d04904ab657a6f780ab02be8366501ee 100644 (file)
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -408,7 +408,7 @@ static ssize_t mod_encode(void const *instance, request_t *request, uint8_t *buf
 
        if (RDEBUG_ENABLED) {
                RDEBUG("Sending %s ID %i from %pV:%i to %pV:%i length %zu via socket %s",
-                      fr_packet_codes[request->reply->code],
+                      fr_radius_packet_names[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 002a52600472547c1bb1fce549f11a6123eb7b28..4d517286af0762ac9115a5f70f5b00b7997d17d6 100644 (file)
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -194,7 +194,7 @@ static ssize_t mod_read(fr_listen_t *li, UNUSED void **packet_ctx, fr_time_t *re
         */
        /* coverity[tainted_data] */
        DEBUG2("proto_radius_tcp - Received %s ID %d length %d %s",
-              fr_packet_codes[buffer[0]], buffer[1],
+              fr_radius_packet_names[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 78541c14545ad098f556857513e4ed5217be2bc0..6b9c0ea3b939e77b17086a68003b271153c26ff9 100644 (file)
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -197,7 +197,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_codes[buffer[0]], buffer[1],
+              fr_radius_packet_names[buffer[0]], buffer[1],
               (int) packet_len, thread->name);
 
        return packet_len;

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 10f1b26a4a5f2e17f7da034c2e7d73ecc5cb24bb..c5c4237f5b51768996733d10e8db7d4cba1585c1 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -378,7 +378,7 @@ static rlm_rcode_t CC_HINT(nonnull) process_reply(eap_session_t *eap_session, fr
                 *      attributes.
                 */
                if (is_radius_code(reply->code)) {
-                       RDEBUG2("Got tunneled reply %s", fr_packet_codes[reply->code]);
+                       RDEBUG2("Got tunneled reply %s", fr_radius_packet_names[reply->code]);
                } else {
                        RDEBUG2("Got tunneled reply code %i", reply->code);
                }

diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 188cdd60d4b3ef15616b7b9a9d5ca95284173f49..5afc73fe2947f0ca07e3defabb64edb8e48da266 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_codes[request->packet->code]);
+                      fr_radius_packet_names[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_codes[inst->status_check]);
+                           fr_radius_packet_names[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_codes[inst->status_check], fr_packet_codes[inst->status_check]);
+                                  fr_radius_packet_names[inst->status_check], fr_radius_packet_names[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 7b1b247d57819f6c6e6e3a8ac6eacea595e6d3a7..ee25d9c2afed2f1e59b8c03ea6b68213718e79c8 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -423,7 +423,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_codes[u->code]);
+       DEBUG3("%s - Status check packet type will be %s", h->module_name, fr_radius_packet_names[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));
@@ -648,7 +648,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_codes[u->code], u->id, u->packet_len, h->name);
+             h->module_name, fr_radius_packet_names[u->code], u->id, u->packet_len, h->name);
 
        if (encode(h->inst, h->status_request, u, u->id) < 0) {
        fail:
@@ -661,7 +661,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_codes[u->code], u->id, u->packet_len, h->name, fr_syserror(errno));
+                     h->module_name, fr_radius_packet_names[u->code], u->id, u->packet_len, h->name, fr_syserror(errno));
                goto fail;
        }
        fr_assert((size_t)slen == u->packet_len);
@@ -1182,7 +1182,7 @@ static decode_fail_t decode(TALLOC_CTX *ctx, fr_pair_list_t *reply, uint8_t *res
 
        if (!allowed_replies[code]) {
                REDEBUG("%s packet received invalid reply code %s",
-                       fr_packet_codes[u->code], fr_packet_codes[code]);
+                       fr_radius_packet_names[u->code], fr_radius_packet_names[code]);
                return DECODE_FAIL_UNKNOWN_PACKET_CODE;
        }
 
@@ -1195,7 +1195,7 @@ static decode_fail_t decode(TALLOC_CTX *ctx, fr_pair_list_t *reply, uint8_t *res
        if (!u->status_check && (code != FR_RADIUS_CODE_PROTOCOL_ERROR)) {
                if (allowed_replies[code] != (fr_radius_packet_code_t) u->code) {
                        REDEBUG("%s packet received invalid reply code %s",
-                               fr_packet_codes[u->code], fr_packet_codes[code]);
+                               fr_radius_packet_names[u->code], fr_radius_packet_names[code]);
                        return DECODE_FAIL_UNKNOWN_PACKET_CODE;
                }
        }
@@ -1213,7 +1213,7 @@ static decode_fail_t decode(TALLOC_CTX *ctx, fr_pair_list_t *reply, uint8_t *res
        }
 
        RDEBUG("Received %s ID %d length %ld reply packet on connection %s",
-              fr_packet_codes[code], code, packet_len, h->name);
+              fr_radius_packet_names[code], code, packet_len, h->name);
        log_request_pair_list(L_DBG_LVL_2, request, NULL, reply, NULL);
 
        *response_code = code;
@@ -1823,7 +1823,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_codes[u->code], u->id, u->packet_len, h->name);
+                              fr_radius_packet_names[u->code], u->id, u->packet_len, h->name);
 
                        if (encode(h->inst, request, u, u->id) < 0) {
                                /*
@@ -1844,7 +1844,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_codes[u->code], u->id, u->packet_len, h->name);
+                              fr_radius_packet_names[u->code], u->id, u->packet_len, h->name);
                }
 
                log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->request_pairs, NULL);
@@ -2052,7 +2052,7 @@ static void request_mux_replicate(UNUSED fr_event_list_t *el,
                }
 
                RDEBUG("Sending %s ID %d length %ld over connection %s",
-                      fr_packet_codes[u->code], u->id, u->packet_len, h->name);
+                      fr_radius_packet_names[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 822a9479215c765f40ff9f572412ea5bc2d5642c..188d8aaaa35fa5070008cba93299efaafaa474cd 100644 (file)
--- a/src/modules/rlm_stats/rlm_stats.c
+++ b/src/modules/rlm_stats/rlm_stats.c
@@ -331,7 +331,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_codes[i], sizeof(buffer) - 18);
+               strlcpy(buffer + 18, fr_radius_packet_names[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 9b5703e1f732eb7ce2212af963a7351395c4d8ab..a9402c9eb3005ab2a2dcb2ef3218e30b715a01c5 100644 (file)
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -212,7 +212,7 @@ static void radius_packet_debug(request_t *request, fr_radius_packet_t *packet,
 #endif
                       "",
                       received ? "Received" : "Sending",
-                      fr_packet_codes[packet->code],
+                      fr_radius_packet_names[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 b0498c83329219b772357567d978f1047056fe09..ea28669ef745820c0cbef28398697d70f2fd290b 100644 (file)
--- a/src/process/ttls/base.c
+++ b/src/process/ttls/base.c
@@ -210,7 +210,7 @@ static void radius_packet_debug(request_t *request, fr_radius_packet_t *packet,
 #endif
                       "",
                       received ? "Received" : "Sending",
-                      fr_packet_codes[packet->code],
+                      fr_radius_packet_names[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 8f7efdc95ada05cf2e3165c15c04657363da3638..4d544d1b4154804a3a9b8f2967d9e1e5ed73f95f 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_request_types[] = {
 };
 size_t fr_request_types_len = NUM_ELEMENTS(fr_request_types);
 
-char const *fr_packet_codes[FR_RADIUS_CODE_MAX] = {
+char const *fr_radius_packet_names[FR_RADIUS_CODE_MAX] = {
        "",                                     //!< 0
        "Access-Request",
        "Access-Accept",

diff --git a/src/protocols/radius/list.c b/src/protocols/radius/list.c
index 750192d989049d1e2ba9eed350a3739ac871389b..ad2723ea7081fc6bffaab26bbbd4f0f7b4b6d60c 100644 (file)
--- a/src/protocols/radius/list.c
+++ b/src/protocols/radius/list.c
@@ -749,7 +749,7 @@ void fr_packet_header_log(fr_log_t const *log, fr_radius_packet_t *packet, bool
 #endif
                       "length %zu\n",
                        received ? "Received" : "Sent",
-                       fr_packet_codes[packet->code],
+                       fr_radius_packet_names[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 5aa8578aa3949c4f2cfe58c906059049e6c58a52..b843763a612765e9e7b1de452449663e5f076309 100644 (file)
--- a/src/protocols/radius/packet.c
+++ b/src/protocols/radius/packet.c
@@ -526,7 +526,7 @@ void _fr_radius_packet_log_hex(fr_log_t const *log, fr_radius_packet_t const *pa
        }
 
        if ((packet->data[0] > 0) && (packet->data[0] < FR_RADIUS_CODE_MAX)) {
-               fr_log(log, L_DBG, file, line, "  Code     : %s", fr_packet_codes[packet->data[0]]);
+               fr_log(log, L_DBG, file, line, "  Code     : %s", fr_radius_packet_names[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 b959b4aeeaaa86f6284601e6d7cc744b4e29d9d4..4fc8d8aa91d390e7be451e0a1ee607b18c90832d 100644 (file)
--- a/src/protocols/radius/radius.h
+++ b/src/protocols/radius/radius.h
@@ -48,7 +48,7 @@
  *     protocols/radius/base.c
  */
 
-extern char const *fr_packet_codes[FR_RADIUS_CODE_MAX];
+extern char const *fr_radius_packet_names[FR_RADIUS_CODE_MAX];
 #define is_radius_code(_x) ((_x > 0) && (_x < FR_RADIUS_CODE_MAX))
 
 #define AUTH_PASS_LEN (RADIUS_AUTH_VECTOR_LENGTH)