From: Arran Cudbard-Bell Date: Mon, 13 Apr 2020 21:57:58 +0000 (-0500) Subject: Fixup assert macros X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeb8d49ba823ee69f8a032b25d1bbf3a1b0c5018;p=thirdparty%2Ffreeradius-server.git Fixup assert macros # Conflicts: # src/lib/unlang/tmpl.c --- diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c index 1ff4206cd0e..dd15e982ff0 100644 --- a/src/bin/radiusd.c +++ b/src/bin/radiusd.c @@ -33,7 +33,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include #include diff --git a/src/bin/radmin.c b/src/bin/radmin.c index ae42f637b24..11afd0e65e0 100644 --- a/src/bin/radmin.c +++ b/src/bin/radmin.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -192,10 +192,10 @@ radmin_completion(const char *text, int start, UNUSED int end) rl_attempted_completion_over = 1; - rad_assert(radmin_buffer != NULL); - rad_assert(radmin_partial_line != NULL); - rad_assert(radmin_partial_line >= radmin_buffer); - rad_assert(radmin_partial_line < (radmin_buffer + 8192)); + fr_assert(radmin_buffer != NULL); + fr_assert(radmin_partial_line != NULL); + fr_assert(radmin_partial_line >= radmin_buffer); + fr_assert(radmin_partial_line < (radmin_buffer + 8192)); offset = (radmin_partial_line - radmin_buffer); @@ -261,8 +261,8 @@ static void *fr_radmin(UNUSED void *input_ctx) while (true) { char *line; - rad_assert(context >= 0); - rad_assert(context_offset[context] >= 0); + fr_assert(context >= 0); + fr_assert(context_offset[context] >= 0); radmin_partial_line = radmin_buffer + context_offset[context]; line = readline(prompt); if (stop) break; @@ -344,7 +344,7 @@ static void *fr_radmin(UNUSED void *input_ctx) if (!info->runnable) { size_t len; - rad_assert(argc > 0); + fr_assert(argc > 0); len = strlen(line); /* @@ -703,7 +703,7 @@ static int cmd_show_config_section(FILE *fp, FILE *fp_err, UNUSED void *ctx, fr_ { CONF_ITEM *item; - rad_assert(info->argc > 0); + fr_assert(info->argc > 0); item = cf_reference_item(radmin_main_config->root_cs, radmin_main_config->root_cs, info->box[0]->vb_strvalue); @@ -734,7 +734,7 @@ static int cmd_show_config_item(FILE *fp, FILE *fp_err, UNUSED void *ctx, fr_cmd CONF_ITEM *item; CONF_PAIR *cp; - rad_assert(info->argc > 0); + fr_assert(info->argc > 0); item = cf_reference_item(radmin_main_config->root_cs, radmin_main_config->root_cs, info->box[0]->vb_strvalue); diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c index 3ba4a8a4e88..af405e40f58 100644 --- a/src/bin/unit_test_attribute.c +++ b/src/bin/unit_test_attribute.c @@ -2244,7 +2244,7 @@ size_t process_line(command_result_t *result, command_ctx_t *cc, char *data, siz */ if (result->error_to_data) data_used = strerror_concat(data, COMMAND_OUTPUT_MAX); - rad_assert((size_t)data_used < COMMAND_OUTPUT_MAX); + fr_assert((size_t)data_used < COMMAND_OUTPUT_MAX); data[data_used] = '\0'; /* Ensure the data buffer is \0 terminated */ if (data_used) { diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c index 9fbda9f0301..4b7c64460cb 100644 --- a/src/bin/unit_test_module.c +++ b/src/bin/unit_test_module.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -161,10 +161,10 @@ static RADCLIENT *client_alloc(TALLOC_CTX *ctx, char const *ip, char const *name client = client_afrom_cs(ctx, cs, NULL); if (!client) { PERROR("Failed creating test client"); - rad_assert(0); + fr_assert(0); } talloc_steal(client, cs); - rad_assert(client); + fr_assert(client); return client; } @@ -215,7 +215,7 @@ static REQUEST *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *el request->master_state = REQUEST_ACTIVE; request->server_cs = virtual_server_find("default"); - rad_assert(request->server_cs != NULL); + fr_assert(request->server_cs != NULL); request->config = main_config; @@ -361,7 +361,7 @@ static REQUEST *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *el ERROR("Expected VALUE_PAIR pointer got \"%s\"", talloc_get_name(vp)); fr_log_talloc_report(vp); - rad_assert(0); + fr_assert(0); } fr_log(&default_log, L_DBG, __FILE__, __LINE__, "%pP", vp); @@ -434,7 +434,7 @@ static void print_packet(FILE *fp, RADIUS_PACKET *packet) ERROR("Expected VALUE_PAIR pointer got \"%s\"", talloc_get_name(vp)); fr_log_talloc_report(vp); - rad_assert(0); + fr_assert(0); } fr_log(&default_log, L_DBG, __FILE__, __LINE__, "%pP", vp); @@ -576,7 +576,7 @@ static void process(REQUEST *request) /* * Simulate an authorize section */ - rad_assert(request->server_cs != NULL); + fr_assert(request->server_cs != NULL); unlang = cf_section_find(request->server_cs, "recv", "Access-Request"); if (!unlang) { REDEBUG("Failed to find 'recv Access-Request' section"); @@ -973,7 +973,7 @@ int main(int argc, char *argv[]) * Create a dummy event list */ el = fr_event_list_alloc(NULL, NULL, NULL); - rad_assert(el != NULL); + fr_assert(el != NULL); /* * Simulate thread specific instantiation diff --git a/src/lib/curl/io.c b/src/lib/curl/io.c index 19f1f0eb2d2..f0bd5a026ff 100644 --- a/src/lib/curl/io.c +++ b/src/lib/curl/io.c @@ -23,7 +23,7 @@ */ #include #include -#include +#include #include #include @@ -64,7 +64,7 @@ static inline void _fr_curl_io_demux(fr_curl_handle_t *mhandle, CURLM *mandle) CURL *candle = m->easy_handle; CURLcode ret; - rad_assert(candle); + fr_assert(candle); mhandle->transfers--; @@ -350,7 +350,7 @@ static int _fr_curl_io_event_modify(UNUSED CURL *easy, curl_socket_t fd, int wha break; default: - rad_assert(0); + fr_assert(0); return -1; } diff --git a/src/lib/eap/base.c b/src/lib/eap/base.c index ae42b919d59..4ee1e7c31f1 100644 --- a/src/lib/eap/base.c +++ b/src/lib/eap/base.c @@ -63,7 +63,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_eap - " #include -#include +#include #include #include "types.h" #include "attrs.h" diff --git a/src/lib/eap/base.h b/src/lib/eap/base.h index 4a4476b71ad..9a775cd7a95 100644 --- a/src/lib/eap/base.h +++ b/src/lib/eap/base.h @@ -28,7 +28,7 @@ RCSIDH(lib_eap_base_h, "$Id$") #include #include -#include +#include #include #include diff --git a/src/lib/eap/chbind.c b/src/lib/eap/chbind.c index 59df8b30c05..151fc45f956 100644 --- a/src/lib/eap/chbind.c +++ b/src/lib/eap/chbind.c @@ -165,7 +165,7 @@ FR_CODE chbind_process(REQUEST *request, CHBIND_REQ *chbind) VALUE_PAIR *vp; /* check input parameters */ - rad_assert((request != NULL) && + fr_assert((request != NULL) && (chbind != NULL) && (chbind->request != NULL) && (chbind->response == NULL)); @@ -190,7 +190,7 @@ FR_CODE chbind_process(REQUEST *request, CHBIND_REQ *chbind) if (data_len) { fr_cursor_t cursor; - rad_assert(data_len <= talloc_array_length((uint8_t const *) chbind->request)); + fr_assert(data_len <= talloc_array_length((uint8_t const *) chbind->request)); fr_cursor_init(&cursor, &fake->packet->vps); while (data_len > 0) { diff --git a/src/lib/eap/compose.c b/src/lib/eap/compose.c index 2bd8bff1870..144bf125de4 100644 --- a/src/lib/eap/compose.c +++ b/src/lib/eap/compose.c @@ -217,8 +217,8 @@ rlm_rcode_t eap_compose(eap_session_t *eap_session) if (((eap_round->request->code == FR_EAP_CODE_REQUEST) || (eap_round->request->code == FR_EAP_CODE_RESPONSE)) && (eap_round->request->type.num == 0)) { - rad_assert(eap_session->type >= FR_EAP_METHOD_MD5); - rad_assert(eap_session->type < FR_EAP_METHOD_MAX); + fr_assert(eap_session->type >= FR_EAP_METHOD_MD5); + fr_assert(eap_session->type < FR_EAP_METHOD_MAX); eap_round->request->type.num = eap_session->type; } diff --git a/src/lib/eap/session.c b/src/lib/eap/session.c index aa185d70788..4e1fa304e5f 100644 --- a/src/lib/eap/session.c +++ b/src/lib/eap/session.c @@ -124,7 +124,7 @@ void eap_session_destroy(eap_session_t **eap_session) * associated with the request, or it matches the one we're * about to free. */ - rad_assert(!in_request || (*eap_session == in_request)); + fr_assert(!in_request || (*eap_session == in_request)); } #else (void) request_data_get((*eap_session)->request, NULL, REQUEST_DATA_EAP_SESSION); @@ -154,7 +154,7 @@ void eap_session_freeze(eap_session_t **eap_session) { if (!*eap_session) return; - rad_assert((*eap_session)->request); + fr_assert((*eap_session)->request); (*eap_session)->request = NULL; *eap_session = NULL; } @@ -191,7 +191,7 @@ eap_session_t *eap_session_thaw(REQUEST *request) if (!fr_cond_assert(eap_session->inst)) return NULL; - rad_assert(!eap_session->request); /* If triggered, something didn't freeze the session */ + fr_assert(!eap_session->request); /* If triggered, something didn't freeze the session */ eap_session->request = request; eap_session->updated = request->packet->timestamp; diff --git a/src/lib/eap/tls.c b/src/lib/eap/tls.c index 6ea78f6ff68..169a8b31656 100644 --- a/src/lib/eap/tls.c +++ b/src/lib/eap/tls.c @@ -117,7 +117,7 @@ int eap_tls_compose(REQUEST *request, eap_session_t *eap_session, eap_tls_status uint8_t *p; size_t len = 1; /* Flags */ - rad_assert(request->parent); /* must be a subrequest */ + fr_assert(request->parent); /* must be a subrequest */ /* * First output the flags (for debugging) @@ -204,7 +204,7 @@ int eap_tls_compose(REQUEST *request, eap_session_t *eap_session, eap_tls_status default: /* Should never enter here */ - rad_assert(0); + fr_assert(0); break; } @@ -237,7 +237,7 @@ int eap_tls_start(REQUEST *request, eap_session_t *eap_session) { eap_tls_session_t *eap_tls_session = talloc_get_type_abort(eap_session->opaque, eap_tls_session_t); - rad_assert(request->parent); /* must be a subrequest */ + fr_assert(request->parent); /* must be a subrequest */ return eap_tls_compose(request, eap_session, EAP_TLS_START_SEND, SET_START(eap_tls_session->base_flags), NULL, 0, 0); @@ -270,7 +270,7 @@ int eap_tls_success(REQUEST *request, eap_session_t *eap_session, eap_tls_session_t *eap_tls_session = talloc_get_type_abort(eap_session->opaque, eap_tls_session_t); fr_tls_session_t *tls_session = eap_tls_session->tls_session; - rad_assert(request->parent); /* must be a subrequest */ + fr_assert(request->parent); /* must be a subrequest */ eap_session->finished = true; @@ -350,7 +350,7 @@ int eap_tls_fail(REQUEST *request, eap_session_t *eap_session) eap_tls_session_t *eap_tls_session = talloc_get_type_abort(eap_session->opaque, eap_tls_session_t); fr_tls_session_t *tls_session = eap_tls_session->tls_session; - rad_assert(request->parent); /* must be a subrequest */ + fr_assert(request->parent); /* must be a subrequest */ eap_session->finished = true; @@ -491,7 +491,7 @@ static int eap_tls_ack(REQUEST *request, eap_session_t *eap_session) { eap_tls_session_t *eap_tls_session = talloc_get_type_abort(eap_session->opaque, eap_tls_session_t); - rad_assert(request->parent); /* must be a subrequest */ + fr_assert(request->parent); /* must be a subrequest */ RDEBUG2("ACKing Peer's TLS record fragment"); return eap_tls_compose(request, eap_session, EAP_TLS_ACK_SEND, @@ -587,7 +587,7 @@ static eap_tls_status_t eap_tls_verify(REQUEST *request, eap_session_t *eap_sess eap_tls_data_t *eap_tls_data; size_t frag_len, header_len; - rad_assert(request->parent); /* must be a subrequest */ + fr_assert(request->parent); /* must be a subrequest */ /* * All EAP-TLS packets must contain type and flags fields. @@ -911,7 +911,7 @@ eap_tls_status_t eap_tls_process(REQUEST *request, eap_session_t *eap_session) uint8_t *data; size_t data_len; - rad_assert(request->parent); /* must be a subrequest */ + fr_assert(request->parent); /* must be a subrequest */ RDEBUG2("Continuing EAP-TLS"); @@ -1069,7 +1069,7 @@ eap_tls_session_t *eap_tls_session_init(REQUEST *request, eap_session_t *eap_ses eap_tls_session_t *eap_tls_session; fr_tls_session_t *tls_session; - rad_assert(request->parent); /* must be a subrequest */ + fr_assert(request->parent); /* must be a subrequest */ /* * This EAP session is associated with a TLS session diff --git a/src/lib/eap_aka_sim/attrs.h b/src/lib/eap_aka_sim/attrs.h index 847c1a30830..c2a0b1de9cc 100644 --- a/src/lib/eap_aka_sim/attrs.h +++ b/src/lib/eap_aka_sim/attrs.h @@ -20,7 +20,7 @@ * * @copyright 2003-2016 The FreeRADIUS server project */ -#include +#include #include #include #include diff --git a/src/lib/eap_aka_sim/base.c b/src/lib/eap_aka_sim/base.c index 360b0c34a94..1d921c92314 100644 --- a/src/lib/eap_aka_sim/base.c +++ b/src/lib/eap_aka_sim/base.c @@ -30,7 +30,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include diff --git a/src/lib/eap_aka_sim/crypto.c b/src/lib/eap_aka_sim/crypto.c index 7bfbe6b12a7..53fbe5e4672 100644 --- a/src/lib/eap_aka_sim/crypto.c +++ b/src/lib/eap_aka_sim/crypto.c @@ -343,7 +343,7 @@ ssize_t fr_aka_sim_crypto_sign_packet(uint8_t out[static AKA_SIM_MAC_DIGEST_SIZE return 0; case -1: - rad_assert(0); /* Should have been checked by encoder or decoder */ + fr_assert(0); /* Should have been checked by encoder or decoder */ goto error; } } diff --git a/src/lib/eap_aka_sim/decode.c b/src/lib/eap_aka_sim/decode.c index b75e03a20ae..28d1911a464 100644 --- a/src/lib/eap_aka_sim/decode.c +++ b/src/lib/eap_aka_sim/decode.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include #include @@ -309,8 +309,8 @@ static ssize_t sim_decode_array(TALLOC_CTX *ctx, fr_cursor_t *cursor, FR_PROTO_TRACE("Array attribute"); - rad_assert(parent->flags.array); - rad_assert(attr_len >= 2); /* Should have been caught earlier */ + fr_assert(parent->flags.array); + fr_assert(attr_len >= 2); /* Should have been caught earlier */ /* * Arrays with fixed length members that @@ -700,7 +700,7 @@ static ssize_t sim_decode_pair_value(TALLOC_CTX *ctx, fr_cursor_t *cursor, fr_di #ifdef __clang_analyzer__ if (!parent->parent) return -1; /* stupid static analyzers */ #endif - rad_assert(parent->parent); + fr_assert(parent->parent); /* * Re-write the attribute to be "raw". It is @@ -1004,7 +1004,7 @@ int fr_aka_sim_decode(REQUEST *request, fr_cursor_t *decoded, fr_dict_t const *d } p += rcode; - rad_assert(p <= end); + fr_assert(p <= end); } /* diff --git a/src/lib/eap_aka_sim/encode.c b/src/lib/eap_aka_sim/encode.c index 262dddb4fe3..64968cfdb3e 100644 --- a/src/lib/eap_aka_sim/encode.c +++ b/src/lib/eap_aka_sim/encode.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include #include @@ -616,7 +616,7 @@ static ssize_t encode_array(uint8_t *out, size_t outlen, size_t element_len; uint16_t actual_len; fr_dict_attr_t const *da = da_stack->da[depth]; - rad_assert(da->flags.array); + fr_assert(da->flags.array); p += 2; value = p; /* Space for actual length */ @@ -1048,7 +1048,7 @@ ssize_t fr_aka_sim_encode(REQUEST *request, VALUE_PAIR *to_encode, void *encode_ return PAIR_ENCODE_FATAL_ERROR; } p += slen; - rad_assert(p < end); /* We messed up a check somewhere in the encoder */ + fr_assert(p < end); /* We messed up a check somewhere in the encoder */ } eap_packet->type.length = p - buff; diff --git a/src/lib/eap_aka_sim/state_machine.c b/src/lib/eap_aka_sim/state_machine.c index 5a495bbda75..8124cb2ff58 100644 --- a/src/lib/eap_aka_sim/state_machine.c +++ b/src/lib/eap_aka_sim/state_machine.c @@ -233,7 +233,7 @@ static void identity_hint_pairs_add(fr_aka_sim_id_type_t *type_p, fr_aka_sim_met break; default: - rad_assert(0); + fr_assert(0); } } @@ -260,7 +260,7 @@ static void identity_hint_pairs_add(fr_aka_sim_id_type_t *type_p, fr_aka_sim_met break; default: - rad_assert(0); + fr_assert(0); } } @@ -338,7 +338,7 @@ static int identity_req_pairs_add(REQUEST *request, eap_aka_sim_session_t *eap_a break; default: - rad_assert(0); + fr_assert(0); } return 0; @@ -582,7 +582,7 @@ static rlm_rcode_t pseudonym_store_resume(void *instance, UNUSED void *thread, R break; default: - rad_assert(0); + fr_assert(0); break; } @@ -1192,13 +1192,13 @@ static rlm_rcode_t common_reauthentication_request_compose(eap_aka_sim_common_co break; default: - rad_assert(0); + fr_assert(0); break; } break; default: - rad_assert(0); + fr_assert(0); break; } @@ -1378,7 +1378,7 @@ static rlm_rcode_t aka_challenge_request_compose(eap_aka_sim_common_conf_t *inst switch (eap_aka_sim_session->type) { default: case FR_EAP_METHOD_SIM: - rad_assert(0); /* EAP-SIM has its own Challenge state */ + fr_assert(0); /* EAP-SIM has its own Challenge state */ break; case FR_EAP_METHOD_AKA: @@ -1392,7 +1392,7 @@ static rlm_rcode_t aka_challenge_request_compose(eap_aka_sim_common_conf_t *inst break; default: - rad_assert(0); + fr_assert(0); break; } } @@ -2376,7 +2376,7 @@ static rlm_rcode_t common_challenge_enter(eap_aka_sim_common_conf_t *inst, break; } - rad_assert(0); + fr_assert(0); return RLM_MODULE_FAIL; } @@ -2471,7 +2471,7 @@ static rlm_rcode_t common_identity_enter(eap_aka_sim_common_conf_t *inst, break; } - rad_assert(0); + fr_assert(0); return RLM_MODULE_FAIL; } @@ -2846,7 +2846,7 @@ static rlm_rcode_t aka_identity_response_process(eap_aka_sim_common_conf_t *inst break; case AKA_SIM_NO_ID_REQ: /* Should not happen */ - rad_assert(0); + fr_assert(0); /* FALL-THROUGH */ case AKA_SIM_PERMANENT_ID_REQ: @@ -3015,7 +3015,7 @@ static rlm_rcode_t sim_start_response_process(eap_aka_sim_common_conf_t *inst, break; case AKA_SIM_NO_ID_REQ: /* Should not happen */ - rad_assert(0); + fr_assert(0); /* FALL-THROUGH */ case AKA_SIM_PERMANENT_ID_REQ: @@ -3379,7 +3379,7 @@ static rlm_rcode_t common_decode(VALUE_PAIR **subtype_vp, VALUE_PAIR **vps, */ static rlm_rcode_t common_eap_failure(UNUSED void *instance, UNUSED void *thread, UNUSED REQUEST *request) { - rad_assert(0); /* Should never actually be called */ + fr_assert(0); /* Should never actually be called */ return RLM_MODULE_FAIL; } @@ -3428,7 +3428,7 @@ static rlm_rcode_t common_failure_notification(void *instance, UNUSED void *thre */ static rlm_rcode_t common_eap_success(UNUSED void *instance, UNUSED void *thread, UNUSED REQUEST *request) { - rad_assert(0); + fr_assert(0); return RLM_MODULE_FAIL; } @@ -3999,7 +3999,7 @@ static rlm_rcode_t common_eap_identity_resume(void *instance, UNUSED void *threa break; default: - rad_assert(0); + fr_assert(0); return RLM_MODULE_FAIL; } diff --git a/src/lib/eap_aka_sim/vector.c b/src/lib/eap_aka_sim/vector.c index b99867cf452..4f0c9b727f1 100644 --- a/src/lib/eap_aka_sim/vector.c +++ b/src/lib/eap_aka_sim/vector.c @@ -37,7 +37,7 @@ RCSID("$Id$") #include "base.h" #include "attrs.h" -#include +#include static int vector_opc_from_op(REQUEST *request, uint8_t const **out, uint8_t opc_buff[MILENAGE_OPC_SIZE], VALUE_PAIR *list, uint8_t const ki[MILENAGE_KI_SIZE]) @@ -331,8 +331,8 @@ int fr_aka_sim_vector_gsm_from_attrs(REQUEST *request, VALUE_PAIR *vps, { int ret; - rad_assert(idx >= 0 && idx < 3); - rad_assert((keys->vector_type == AKA_SIM_VECTOR_NONE) || (keys->vector_type == AKA_SIM_VECTOR_GSM)); + fr_assert(idx >= 0 && idx < 3); + fr_assert((keys->vector_type == AKA_SIM_VECTOR_NONE) || (keys->vector_type == AKA_SIM_VECTOR_GSM)); switch (*src) { default: @@ -581,7 +581,7 @@ static int vector_umts_from_ki(REQUEST *request, VALUE_PAIR *vps, fr_aka_sim_key return 0; default: - rad_assert(0); + fr_assert(0); return -1; } } @@ -756,7 +756,7 @@ int fr_aka_sim_vector_umts_from_attrs(REQUEST *request, VALUE_PAIR *vps, { int ret; - rad_assert((keys->vector_type == AKA_SIM_VECTOR_NONE) || (keys->vector_type == AKA_SIM_VECTOR_UMTS)); + fr_assert((keys->vector_type == AKA_SIM_VECTOR_NONE) || (keys->vector_type == AKA_SIM_VECTOR_UMTS)); switch (*src) { default: diff --git a/src/lib/io/app_io.c b/src/lib/io/app_io.c index 0d9df7e0e71..93cc69c51be 100644 --- a/src/lib/io/app_io.c +++ b/src/lib/io/app_io.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include char const *fr_app_io_socket_name(TALLOC_CTX *ctx, fr_app_io_t const *app_io, @@ -41,7 +41,7 @@ char const *fr_app_io_socket_name(TALLOC_CTX *ctx, fr_app_io_t const *app_io, if (dst_ipaddr->af == AF_INET) { strlcpy(dst_buf, "*", sizeof(dst_buf)); } else { - rad_assert(dst_ipaddr->af == AF_INET6); + fr_assert(dst_ipaddr->af == AF_INET6); strlcpy(dst_buf, "::", sizeof(dst_buf)); } } else { diff --git a/src/lib/io/channel.c b/src/lib/io/channel.c index 19e5eceab4e..58e80469f9d 100644 --- a/src/lib/io/channel.c +++ b/src/lib/io/channel.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include #include -#include +#include #ifdef HAVE_STDATOMIC_H # include @@ -350,7 +350,7 @@ int fr_channel_send_request(fr_channel_t *ch, fr_channel_data_t *cd) requestor->stats.message_interval = RTT(requestor->stats.message_interval, message_interval); } - rad_assert(requestor->stats.last_write <= when); + fr_assert(requestor->stats.last_write <= when); requestor->stats.last_write = when; requestor->stats.outstanding++; @@ -412,7 +412,7 @@ bool fr_channel_recv_reply(fr_channel_t *ch) fr_channel_end_t *requestor; fr_atomic_queue_t *aq; - rad_assert(ch->end[TO_RESPONDER].recv != NULL); + fr_assert(ch->end[TO_RESPONDER].recv != NULL); aq = ch->end[TO_REQUESTOR].aq; requestor = &(ch->end[TO_RESPONDER]); @@ -446,15 +446,15 @@ bool fr_channel_recv_reply(fr_channel_t *ch) * we've received one more reply, and with the responders * ACK. */ - rad_assert(requestor->stats.outstanding > 0); - rad_assert(cd->live.sequence > requestor->ack); - rad_assert(cd->live.sequence <= requestor->sequence); /* must have fewer replies than requests */ + fr_assert(requestor->stats.outstanding > 0); + fr_assert(cd->live.sequence > requestor->ack); + fr_assert(cd->live.sequence <= requestor->sequence); /* must have fewer replies than requests */ requestor->stats.outstanding--; requestor->ack = cd->live.sequence; requestor->their_view_of_my_sequence = cd->live.ack; - rad_assert(requestor->stats.last_read_other <= cd->m.when); + fr_assert(requestor->stats.last_read_other <= cd->m.when); requestor->stats.last_read_other = cd->m.when; ch->end[TO_RESPONDER].recv(ch->end[TO_RESPONDER].recv_uctx, ch, cd); @@ -484,14 +484,14 @@ bool fr_channel_recv_request(fr_channel_t *ch) */ if (!fr_atomic_queue_pop(aq, (void **) &cd)) return false; - rad_assert(cd->live.sequence > responder->ack); - rad_assert(cd->live.sequence >= responder->sequence); /* must have more requests than replies */ + fr_assert(cd->live.sequence > responder->ack); + fr_assert(cd->live.sequence >= responder->sequence); /* must have more requests than replies */ responder->stats.outstanding++; responder->ack = cd->live.sequence; responder->their_view_of_my_sequence = cd->live.ack; - rad_assert(responder->stats.last_read_other <= cd->m.when); + fr_assert(responder->stats.last_read_other <= cd->m.when); responder->stats.last_read_other = cd->m.when; ch->end[TO_REQUESTOR].recv(ch->end[TO_REQUESTOR].recv_uctx, ch, cd); @@ -544,7 +544,7 @@ int fr_channel_send_reply(fr_channel_t *ch, fr_channel_data_t *cd) return -1; } - rad_assert(responder->stats.outstanding > 0); + fr_assert(responder->stats.outstanding > 0); responder->stats.outstanding--; responder->stats.packets++; @@ -554,7 +554,7 @@ int fr_channel_send_reply(fr_channel_t *ch, fr_channel_data_t *cd) message_interval = when - responder->stats.last_write; responder->stats.message_interval = RTT(responder->stats.message_interval, message_interval); - rad_assert(responder->stats.last_write <= when); + fr_assert(responder->stats.last_write <= when); responder->stats.last_write = when; /* @@ -598,7 +598,7 @@ int fr_channel_send_reply(fr_channel_t *ch, fr_channel_data_t *cd) * FIXME: make these limits configurable, or include * predictions about packet processing time? */ - rad_assert(responder->their_view_of_my_sequence <= responder->sequence); + fr_assert(responder->their_view_of_my_sequence <= responder->sequence); #if 0 if (((responder->sequence - their_view_of_my_sequence) <= 1000) && ((when - responder->stats.last_read_other < SIGNAL_INTERVAL) || @@ -696,7 +696,7 @@ fr_channel_event_t fr_channel_service_message(fr_time_t when, fr_channel_t **p_c fr_channel_end_t *requestor; fr_channel_t *ch; - rad_assert(data_size == sizeof(cc)); + fr_assert(data_size == sizeof(cc)); memcpy(&cc, data, data_size); cs = cc.signal; @@ -754,7 +754,7 @@ fr_channel_event_t fr_channel_service_message(fr_time_t when, fr_channel_t **p_c * The responder is sleeping or done. There are more * packets available, so we signal it to wake up again. */ - rad_assert(ack <= requestor->sequence); + fr_assert(ack <= requestor->sequence); #endif /* diff --git a/src/lib/io/control.c b/src/lib/io/control.c index 39dd31b46d9..f16f0e58617 100644 --- a/src/lib/io/control.c +++ b/src/lib/io/control.c @@ -197,10 +197,10 @@ int fr_control_gc(UNUSED fr_control_t *c, fr_ring_buffer_t *rb) (void) fr_ring_buffer_start(rb, (uint8_t **) &m, &room); if (room == 0) break; - rad_assert(m != NULL); - rad_assert(room >= sizeof(*m)); + fr_assert(m != NULL); + fr_assert(room >= sizeof(*m)); - rad_assert(m->status != FR_CONTROL_MESSAGE_FREE); + fr_assert(m->status != FR_CONTROL_MESSAGE_FREE); if (m->status != FR_CONTROL_MESSAGE_DONE) break; @@ -375,7 +375,7 @@ ssize_t fr_control_message_pop(fr_atomic_queue_t *aq, uint32_t *p_id, void *data if (!fr_atomic_queue_pop(aq, (void **) &m)) return 0; - rad_assert(m->status == FR_CONTROL_MESSAGE_USED); + fr_assert(m->status == FR_CONTROL_MESSAGE_USED); /* * There isn't enough room to store the data, die. diff --git a/src/lib/io/master.c b/src/lib/io/master.c index 09d94f46286..cb34bec0e22 100644 --- a/src/lib/io/master.c +++ b/src/lib/io/master.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include @@ -195,8 +195,8 @@ static int8_t pending_client_cmp(void const *one, void const *two) a = fr_heap_peek(c1->pending); b = fr_heap_peek(c2->pending); - rad_assert(a != NULL); - rad_assert(b != NULL); + fr_assert(a != NULL); + fr_assert(b != NULL); return pending_packet_cmp(a, b); } @@ -258,7 +258,7 @@ static int track_cmp(void const *one, void const *two) * the same client definition. */ if (a->client->connection) { - rad_assert(a->client == b->client); + fr_assert(a->client == b->client); /* * Note that we pass the connection "client", as @@ -272,7 +272,7 @@ static int track_cmp(void const *one, void const *two) return 0; } - rad_assert(!b->client->connection); + fr_assert(!b->client->connection); /* * Unconnected sockets must check src/dst ip/port. @@ -308,7 +308,7 @@ static fr_io_pending_packet_t *pending_packet_pop(fr_io_thread_t *thread) } pending = fr_heap_pop(client->pending); - rad_assert(pending != NULL); + fr_assert(pending != NULL); /* * If the client has more packets pending, add it back to @@ -318,7 +318,7 @@ static fr_io_pending_packet_t *pending_packet_pop(fr_io_thread_t *thread) (void) fr_heap_insert(thread->pending_clients, client); } - rad_assert(thread->num_pending_packets > 0); + fr_assert(thread->num_pending_packets > 0); thread->num_pending_packets--; return pending; @@ -392,7 +392,7 @@ static int count_connections(void *ctx, UNUSED uint8_t const *key, UNUSED size_t */ if (!client->ht) return 0; - rad_assert(client->use_connected); + fr_assert(client->use_connected); pthread_mutex_lock(&client->mutex); connections = fr_hash_table_num_elements(client->ht); @@ -469,7 +469,7 @@ static fr_io_connection_t *fr_io_connection_alloc(fr_io_instance_t const *inst, DEBUG("Failed to find proto_%s_%s", inst->app->name, inst->transport); return NULL; } - rad_assert(dl_inst != NULL); + fr_assert(dl_inst != NULL); } else { dl_inst = talloc_init("nak"); } @@ -575,7 +575,7 @@ static fr_io_connection_t *fr_io_connection_alloc(fr_io_instance_t const *inst, case PR_CLIENT_INVALID: case PR_CLIENT_NAK: case PR_CLIENT_CONNECTED: - rad_assert(0 == 1); + fr_assert(0 == 1); talloc_free(dl_inst); return NULL; } @@ -628,7 +628,7 @@ static fr_io_connection_t *fr_io_connection_alloc(fr_io_instance_t const *inst, /* * Glue in the connection to the listener. */ - rad_assert(li->app_io == &fr_master_app_io); + fr_assert(li->app_io == &fr_master_app_io); li->connected = true; li->thread_instance = connection; @@ -638,7 +638,7 @@ static fr_io_connection_t *fr_io_connection_alloc(fr_io_instance_t const *inst, /* * Instantiate the child, and open the socket. */ - rad_assert(inst->app_io->connection_set != NULL); + fr_assert(inst->app_io->connection_set != NULL); if (inst->app_io->connection_set(connection->child, connection->address) < 0) { DEBUG("Failed setting connection for socket."); @@ -779,7 +779,7 @@ static void get_inst(fr_listen_t *li, fr_io_instance_t const **inst, fr_io_threa if (child) *child = ((fr_io_thread_t *)li->thread_instance)->child; } else { - rad_assert(connection != NULL); + fr_assert(connection != NULL); *connection = li->thread_instance; *inst = (*connection)->client->inst; @@ -945,7 +945,7 @@ static int pending_free(fr_io_pending_packet_t *pending) * because the packets are pending, track->reply MUST be * NULL. */ - rad_assert(track->packets > 0); + fr_assert(track->packets > 0); track->packets--; /* @@ -954,7 +954,7 @@ static int pending_free(fr_io_pending_packet_t *pending) */ if (track->packets == 0) { if (track->client->inst->app_io->track_duplicates) { - rad_assert(track->client->table != NULL); + fr_assert(track->client->table != NULL); (void) rbtree_deletebydata(track->client->table, track); } @@ -1025,9 +1025,9 @@ static int8_t alive_client_cmp(void const *one, void const *two) */ static int _client_live_free(fr_io_client_t *client) { - rad_assert(client->in_trie); - rad_assert(!client->connection); - rad_assert(fr_heap_num_elements(client->thread->alive_clients) > 0); + fr_assert(client->in_trie); + fr_assert(!client->connection); + fr_assert(fr_heap_num_elements(client->thread->alive_clients) > 0); if (client->pending) TALLOC_FREE(client->pending); @@ -1095,7 +1095,7 @@ redo: } if (pending) { - rad_assert(buffer_len >= pending->buffer_len); + fr_assert(buffer_len >= pending->buffer_len); track = pending->track; /* @@ -1250,7 +1250,7 @@ do_read: */ if (connection && (connection->client->state == PR_CLIENT_PENDING)) { - rad_assert(!connection->paused); + fr_assert(!connection->paused); connection->paused = true; (void) fr_event_filter_update(connection->el, @@ -1265,7 +1265,7 @@ do_read: */ if (!connection) { client = fr_trie_lookup(thread->trie, &address.src_ipaddr.addr, address.src_ipaddr.prefix); - rad_assert(!client || !client->connection); + fr_assert(!client || !client->connection); } else { client = connection->client; @@ -1298,7 +1298,7 @@ do_read: /* * We MUST be the master socket. */ - rad_assert(!connection); + fr_assert(!connection); radclient = inst->app_io->client_find(thread->child, &address.src_ipaddr, inst->ipproto); if (radclient) { @@ -1401,7 +1401,7 @@ do_read: * Create the packet tracking table for this client. */ if (inst->app_io->track_duplicates) { - rad_assert(inst->app_io->compare != NULL); + fr_assert(inst->app_io->compare != NULL); MEM(client->table = rbtree_talloc_create(client, track_cmp, fr_io_track_t, NULL, RBTREE_FLAG_NONE)); } @@ -1411,7 +1411,7 @@ do_read: * per-client basis. */ if (client->use_connected) { - rad_assert(client->state == PR_CLIENT_STATIC); + fr_assert(client->state == PR_CLIENT_STATIC); (void) pthread_mutex_init(&client->mutex, NULL); MEM(client->ht = fr_hash_table_create(client, connection_hash, connection_cmp, NULL)); @@ -1447,8 +1447,8 @@ do_read: } have_client: - rad_assert(client->state != PR_CLIENT_INVALID); - rad_assert(client->state != PR_CLIENT_NAK); + fr_assert(client->state != PR_CLIENT_INVALID); + fr_assert(client->state != PR_CLIENT_NAK); /* * We've accepted a new connection. Go allocate it, and @@ -1564,7 +1564,7 @@ have_client: * This must be the main UDP socket which creates * connections. */ - rad_assert(inst->ipproto == IPPROTO_UDP); + fr_assert(inst->ipproto == IPPROTO_UDP); /* * We're using connected sockets, but this socket isn't @@ -1664,7 +1664,7 @@ static int mod_inject(fr_listen_t *li, uint8_t *buffer, size_t buffer_len, fr_ti /* * @todo future - what to do with duplicates? */ - rad_assert(!is_dup); + fr_assert(!is_dup); /* * Remember to restore this packet later. @@ -1778,7 +1778,7 @@ static void client_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) connection = client->connection; inst = client->inst; - rad_assert(client->state != PR_CLIENT_STATIC); + fr_assert(client->state != PR_CLIENT_STATIC); /* * Called from the read or write functions with @@ -1787,7 +1787,7 @@ static void client_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) if (!now) { switch (client->state) { case PR_CLIENT_CONNECTED: - rad_assert(connection != NULL); + fr_assert(connection != NULL); delay = inst->idle_timeout; break; @@ -1796,12 +1796,12 @@ static void client_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) break; case PR_CLIENT_NAK: - rad_assert(!connection); + fr_assert(!connection); delay = inst->nak_lifetime; break; default: - rad_assert(0 == 1); + fr_assert(0 == 1); return; } @@ -1819,7 +1819,7 @@ static void client_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) */ if (client->state == PR_CLIENT_NAK) { delete_client: - rad_assert(packets == 0); + fr_assert(packets == 0); /* * It's a connected socket. Remove it from the @@ -1868,7 +1868,7 @@ static void client_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) * dynamic client which has timed out, OR it's a * "place-holder" client for connected sockets. */ - rad_assert(client->state == PR_CLIENT_PENDING); + fr_assert(client->state == PR_CLIENT_PENDING); /* * This is a dynamic client pending definition. @@ -1896,8 +1896,8 @@ static void client_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) return; } - rad_assert(!connection); - rad_assert(client->ht != NULL); + fr_assert(!connection); + fr_assert(client->ht != NULL); /* * Find out how many connections are using this @@ -1995,7 +1995,7 @@ static void packet_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) /* * Delete the tracking entry. */ - rad_assert(track->packets > 0); + fr_assert(track->packets > 0); track->packets--; if (track->packets == 0) { @@ -2011,7 +2011,7 @@ static void packet_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) track->reply_len = 0; } - rad_assert(client->packets > 0); + fr_assert(client->packets > 0); client->packets--; /* @@ -2019,8 +2019,8 @@ static void packet_expiry_timer(fr_event_list_t *el, fr_time_t now, void *uctx) */ if (client->state == PR_CLIENT_STATIC) return; - rad_assert(client->state != PR_CLIENT_NAK); - rad_assert(client->state != PR_CLIENT_PENDING); + fr_assert(client->state != PR_CLIENT_NAK); + fr_assert(client->state != PR_CLIENT_PENDING); /* * If necessary, call the client expiry timer to clean up @@ -2067,8 +2067,8 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti * packet, so we discard this one. */ if (track->timestamp != request_time) { - rad_assert(track->packets > 0); - rad_assert(client->packets > 0); + fr_assert(track->packets > 0); + fr_assert(client->packets > 0); track->packets--; client->packets--; packets--; @@ -2085,7 +2085,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti return buffer_len; } - rad_assert(track->reply == NULL); + fr_assert(track->reply == NULL); /* * We have a NAK packet, or the request @@ -2105,14 +2105,14 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti packet_len = inst->app_io->write(child, track, request_time, buffer, buffer_len, written); if (packet_len > 0) { - rad_assert(buffer_len == (size_t) packet_len); + fr_assert(buffer_len == (size_t) packet_len); /* * No need to stash the reply if we're * not tracking duplicates. */ if (inst->app_io->track_duplicates) { - rad_assert(!track->reply); + fr_assert(!track->reply); MEM(track->reply = talloc_memdup(track, buffer, buffer_len)); track->reply_len = buffer_len; } @@ -2134,7 +2134,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti * If there's a connected socket and no dynamic clients, then the * client state is set to CONNECTED when the client is created. */ - rad_assert(inst->dynamic_clients); + fr_assert(inst->dynamic_clients); /* * The request has timed out trying to define the dynamic @@ -2154,7 +2154,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti client->state = PR_CLIENT_NAK; TALLOC_FREE(client->pending); if (client->table) TALLOC_FREE(client->table); - rad_assert(client->packets == 0); + fr_assert(client->packets == 0); /* * If we're a connected UDP socket, allocate a @@ -2187,7 +2187,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti return buffer_len; } - rad_assert(buffer_len == sizeof(radclient)); + fr_assert(buffer_len == sizeof(radclient)); memcpy(&radclient, buffer, sizeof(radclient)); @@ -2244,7 +2244,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti /* * Remove the pending client from the trie. */ - rad_assert(!connection); + fr_assert(!connection); talloc_free(client); return buffer_len; } @@ -2288,9 +2288,9 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti * socket. */ if (connection) { - rad_assert(connection != NULL); - rad_assert(connection->client == client); - rad_assert(client->connection != NULL); + fr_assert(connection != NULL); + fr_assert(connection->client == client); + fr_assert(client->connection != NULL); client->state = PR_CLIENT_CONNECTED; @@ -2317,8 +2317,8 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti goto finish; } - rad_assert(connection == NULL); - rad_assert(client->use_connected == false); /* we weren't sure until now */ + fr_assert(connection == NULL); + fr_assert(client->use_connected == false); /* we weren't sure until now */ /* * Disallow unsupported configurations. @@ -2340,7 +2340,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti * sockets. Go spawn it */ if (client->use_connected) { - rad_assert(connection == NULL); + fr_assert(connection == NULL); /* @@ -2370,7 +2370,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti fr_io_client_t, pending_id)); } - rad_assert(client->pending_id < 0); + fr_assert(client->pending_id < 0); (void) fr_heap_insert(thread->pending_clients, client); finish: @@ -2481,7 +2481,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) return -1; } - rad_assert(inst->dynamic_submodule != NULL); + fr_assert(inst->dynamic_submodule != NULL); /* * Don't bootstrap the dynamic submodule. We're @@ -2510,7 +2510,7 @@ static char const *mod_name(fr_listen_t *li) get_inst(li, &inst, &thread, &connection, &child); - rad_assert(child != NULL); + fr_assert(child != NULL); return child->app_io->get_name(child); } @@ -2519,7 +2519,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) { fr_io_instance_t *inst = instance; - rad_assert(inst->app_io != NULL); + fr_assert(inst->app_io != NULL); if (inst->app_io->instantiate && (inst->app_io->instantiate(inst->app_io_instance, @@ -2587,7 +2587,7 @@ fr_trie_t *fr_master_io_network(TALLOC_CTX *ctx, int af, fr_ipaddr_t *allow, fr_ MEM(trie = fr_trie_alloc(ctx)); num = talloc_array_length(allow); - rad_assert(num > 0); + fr_assert(num > 0); for (i = 0; i < num; i++) { fr_ipaddr_t *network; @@ -2768,7 +2768,7 @@ int fr_master_io_listen(TALLOC_CTX *ctx, fr_io_instance_t *inst, fr_schedule_t * * No IO paths, so we don't initialize them. */ if (!inst->app_io) { - rad_assert(!inst->dynamic_clients); + fr_assert(!inst->dynamic_clients); return 0; } diff --git a/src/lib/io/message.c b/src/lib/io/message.c index 14ac8d1c4c9..b505a5e65bc 100644 --- a/src/lib/io/message.c +++ b/src/lib/io/message.c @@ -188,8 +188,8 @@ fr_message_set_t *fr_message_set_create(TALLOC_CTX *ctx, int num_messages, size_ */ int fr_message_done(fr_message_t *m) { - rad_assert(m->status != FR_MESSAGE_FREE); - rad_assert(m->status != FR_MESSAGE_DONE); + fr_assert(m->status != FR_MESSAGE_FREE); + fr_assert(m->status != FR_MESSAGE_DONE); /* * Mark a message as freed. The originator will take @@ -212,7 +212,7 @@ int fr_message_done(fr_message_t *m) /* * A catastrophic error. */ - rad_assert(0 == 1); + fr_assert(0 == 1); fr_strerror_printf("Failed marking message as done"); return -1; @@ -312,11 +312,11 @@ static int fr_message_ring_gc(fr_message_set_t *ms, fr_ring_buffer_t *mr, int ma (void) fr_ring_buffer_start(mr, (uint8_t **) &m, &size); if (size == 0) break; - rad_assert(m != NULL); - rad_assert(size >= ms->message_size); + fr_assert(m != NULL); + fr_assert(size >= ms->message_size); - rad_assert(m->status != FR_MESSAGE_FREE); + fr_assert(m->status != FR_MESSAGE_FREE); if (m->status != FR_MESSAGE_DONE) break; messages_cleaned++; @@ -370,7 +370,7 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) cleaned = fr_message_ring_gc(ms, ms->mr_array[i], max_to_clean - total_cleaned); total_cleaned += cleaned; - rad_assert(total_cleaned <= max_to_clean); + fr_assert(total_cleaned <= max_to_clean); /* * Stop when we've reached our GC limit. @@ -391,7 +391,7 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) * and free all smaller ones which are empty. */ for (i = ms->mr_max; i >= 0; i--) { - rad_assert(ms->mr_array[i] != NULL); + fr_assert(ms->mr_array[i] != NULL); if (arrays_used < 2) { MPRINT("\tleaving entry %d alone\n", i); @@ -447,7 +447,7 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) */ if (empty_slot < 0) continue; - rad_assert(ms->mr_array[empty_slot] == NULL); + fr_assert(ms->mr_array[empty_slot] == NULL); ms->mr_array[empty_slot] = ms->mr_array[i]; ms->mr_array[i] = NULL; @@ -475,7 +475,7 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) MPRINT("NUM RB ARRAYS NOW %d\n", ms->mr_max + 1); for (i = 0; i <= ms->mr_max; i++) { MPRINT("\t%d %p\n", i, ms->mr_array[i]); - rad_assert(ms->mr_array[i] != NULL); + fr_assert(ms->mr_array[i] != NULL); } #endif } @@ -494,7 +494,7 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) arrays_freed = 0; MPRINT("TRYING TO FREE ARRAYS %d\n", ms->rb_max); for (i = ms->rb_max; i >= 0; i--) { - rad_assert(ms->rb_array[i] != NULL); + fr_assert(ms->rb_array[i] != NULL); if (arrays_used < 2) { MPRINT("\tleaving entry %d alone\n", i); @@ -545,7 +545,7 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) */ if (empty_slot < 0) continue; - rad_assert(ms->rb_array[empty_slot] == NULL); + fr_assert(ms->rb_array[empty_slot] == NULL); ms->rb_array[empty_slot] = ms->rb_array[i]; ms->rb_array[i] = NULL; @@ -573,7 +573,7 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) MPRINT("NUM RB ARRAYS NOW %d\n", ms->rb_max + 1); for (i = 0; i <= ms->rb_max; i++) { MPRINT("\t%d %p\n", i, ms->rb_array[i]); - rad_assert(ms->rb_array[i] != NULL); + fr_assert(ms->rb_array[i] != NULL); } #endif } @@ -594,7 +594,7 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) for (i = 0; i < ms->rb_max; i++) { size_t free_size; - rad_assert(ms->rb_array[i] != NULL); + fr_assert(ms->rb_array[i] != NULL); free_size = (fr_ring_buffer_size(ms->rb_array[i]) - fr_ring_buffer_used(ms->rb_array[i])); @@ -605,8 +605,8 @@ static void fr_message_gc(fr_message_set_t *ms, int max_to_clean) } ms->rb_current = largest_free_slot; - rad_assert(ms->rb_current >= 0); - rad_assert(ms->rb_current <= ms->rb_max); + fr_assert(ms->rb_current >= 0); + fr_assert(ms->rb_current <= ms->rb_max); } /** Allocate a message from a message ring. @@ -800,7 +800,7 @@ static fr_message_t *fr_message_get_ring_buffer(fr_message_set_t *ms, fr_message * And... we go through a bunch of hoops, all over again. */ m->rb = ms->rb_array[ms->rb_current]; - rad_assert(m->rb != NULL); + fr_assert(m->rb != NULL); m->data = fr_ring_buffer_reserve(m->rb, m->rb_size); if (m->data) return m; @@ -830,7 +830,7 @@ static fr_message_t *fr_message_get_ring_buffer(fr_message_set_t *ms, fr_message * Try to allocate the packet from the newly current ring buffer. */ m->rb = ms->rb_array[ms->rb_current]; - rad_assert(m->rb != NULL); + fr_assert(m->rb != NULL); m->data = fr_ring_buffer_reserve(m->rb, m->rb_size); if (m->data) return m; @@ -852,7 +852,7 @@ static fr_message_t *fr_message_get_ring_buffer(fr_message_set_t *ms, fr_message */ for (i = ms->rb_max; i >= 0; i--) { m->rb = ms->rb_array[i]; - rad_assert(m->rb != NULL); + fr_assert(m->rb != NULL); m->data = fr_ring_buffer_reserve(m->rb, m->rb_size); if (m->data) { MPRINT("MOVED TO RING BUFFER %d\n", i); @@ -997,20 +997,20 @@ fr_message_t *fr_message_alloc(fr_message_set_t *ms, fr_message_t *m, size_t act if (!m) return NULL; } - rad_assert(m->status == FR_MESSAGE_USED); - rad_assert(m->rb != NULL); - rad_assert(m->data != NULL); - rad_assert(m->data_size == 0); - rad_assert(m->rb_size >= actual_packet_size); + fr_assert(m->status == FR_MESSAGE_USED); + fr_assert(m->rb != NULL); + fr_assert(m->data != NULL); + fr_assert(m->data_size == 0); + fr_assert(m->rb_size >= actual_packet_size); p = fr_ring_buffer_alloc(m->rb, actual_packet_size); - rad_assert(p != NULL); + fr_assert(p != NULL); if (!p) { fr_strerror_printf_push("Failed allocating from ring buffer"); return NULL; } - rad_assert(p == m->data); + fr_assert(p == m->data); /* * The caller can change m->data size to something a bit @@ -1075,19 +1075,19 @@ fr_message_t *fr_message_alloc_reserve(fr_message_set_t *ms, fr_message_t *m, si /* m is NOT talloc'd */ - rad_assert(m->status == FR_MESSAGE_USED); - rad_assert(m->rb != NULL); - rad_assert(m->data != NULL); - rad_assert(m->rb_size >= actual_packet_size); + fr_assert(m->status == FR_MESSAGE_USED); + fr_assert(m->rb != NULL); + fr_assert(m->data != NULL); + fr_assert(m->rb_size >= actual_packet_size); p = fr_ring_buffer_alloc(m->rb, actual_packet_size); - rad_assert(p != NULL); + fr_assert(p != NULL); if (!p) { fr_strerror_printf_push("Failed allocating from ring buffer"); return NULL; } - rad_assert(p == m->data); + fr_assert(p == m->data); m_rb_size = m->rb_size; /* for ring buffer cleanups */ @@ -1203,11 +1203,11 @@ fr_message_t *fr_message_alloc_aligned(fr_message_set_t *ms, fr_message_t *m, si if (!m) return NULL; } - rad_assert(m->status == FR_MESSAGE_USED); - rad_assert(m->rb != NULL); - rad_assert(m->data != NULL); - rad_assert(m->data_size == 0); - rad_assert(m->rb_size >= actual_packet_size); + fr_assert(m->status == FR_MESSAGE_USED); + fr_assert(m->rb != NULL); + fr_assert(m->data != NULL); + fr_assert(m->data_size == 0); + fr_assert(m->rb_size >= actual_packet_size); /* * Align the address and the actual packet size. @@ -1232,14 +1232,14 @@ fr_message_t *fr_message_alloc_aligned(fr_message_set_t *ms, fr_message_t *m, si aligned_size = MS_ALIGN(aligned_size); p = fr_ring_buffer_alloc(m->rb, aligned_size); - rad_assert(p != NULL); + fr_assert(p != NULL); if (!p) { fr_strerror_printf_push("Failed allocating from ring buffer"); return NULL; } - rad_assert(p == m->data); - rad_assert((aligned_p + aligned_size) <= (m->data + m->rb_size)); + fr_assert(p == m->data); + fr_assert((aligned_p + aligned_size) <= (m->data + m->rb_size)); /* * Set the aligned pointer, the total aligned size, and diff --git a/src/lib/io/network.c b/src/lib/io/network.c index ba8cff79caf..504de2f7684 100644 --- a/src/lib/io/network.c +++ b/src/lib/io/network.c @@ -443,16 +443,16 @@ static void fr_network_channel_callback(void *ctx, void const *data, size_t data break; case FR_CHANNEL_DATA_READY_REQUESTOR: - rad_assert(ch != NULL); + fr_assert(ch != NULL); while (fr_channel_recv_reply(ch)); break; case FR_CHANNEL_DATA_READY_RESPONDER: - rad_assert(0 == 1); + fr_assert(0 == 1); break; case FR_CHANNEL_OPEN: - rad_assert(0 == 1); + fr_assert(0 == 1); break; case FR_CHANNEL_CLOSE: @@ -630,8 +630,8 @@ static void fr_network_read(UNUSED fr_event_list_t *el, int sockfd, UNUSED int f cd = s->cd; } - rad_assert(cd->m.data != NULL); - rad_assert(cd->m.rb_size >= 256); + fr_assert(cd->m.data != NULL); + fr_assert(cd->m.rb_size >= 256); next_message: /* @@ -722,7 +722,7 @@ next_message: if (!next) { PERROR("Failed reserving partial packet."); // @todo - probably close the socket... - rad_assert(0 == 1); + fr_assert(0 == 1); } } @@ -816,7 +816,7 @@ static void fr_network_write(UNUSED fr_event_list_t *el, UNUSED int sockfd, UNUS (void) talloc_get_type_abort(nr, fr_network_t); - rad_assert(s->pending != NULL); + fr_assert(s->pending != NULL); /* * @todo - this code is much the same as in @@ -833,8 +833,8 @@ static void fr_network_write(UNUSED fr_event_list_t *el, UNUSED int sockfd, UNUS cd = fr_heap_pop(s->waiting)) { int rcode; - rad_assert(li == cd->listen); - rad_assert(cd->m.status == FR_MESSAGE_LOCALIZED); + fr_assert(li == cd->listen); + fr_assert(cd->m.status == FR_MESSAGE_LOCALIZED); rcode = li->app_io->write(li, cd->packet_ctx, cd->reply.request_time, @@ -958,12 +958,12 @@ static void fr_network_listen_callback(void *ctx, void const *data, size_t data_ size_t size; int num_messages; - rad_assert(data_size == sizeof(s->listen)); + fr_assert(data_size == sizeof(s->listen)); if (data_size != sizeof(s->listen)) return; s = talloc_zero(nr, fr_network_socket_t); - rad_assert(s != NULL); + fr_assert(s != NULL); s->nr = nr; memcpy(&s->listen, data, sizeof(s->listen)); @@ -1033,12 +1033,12 @@ static void fr_network_directory_callback(void *ctx, void const *data, size_t da fr_app_io_t const *app_io; fr_event_vnode_func_t funcs = { .extend = fr_network_vnode_extend }; - rad_assert(data_size == sizeof(s->listen)); + fr_assert(data_size == sizeof(s->listen)); if (data_size != sizeof(s->listen)) return; s = talloc_zero(nr, fr_network_socket_t); - rad_assert(s != NULL); + fr_assert(s != NULL); s->nr = nr; memcpy(&s->listen, data, sizeof(s->listen)); @@ -1098,7 +1098,7 @@ static void fr_network_worker_started_callback(void *ctx, void const *data, size fr_worker_t *worker; fr_network_worker_t *w; - rad_assert(data_size == sizeof(worker)); + fr_assert(data_size == sizeof(worker)); memcpy(&worker, data, data_size); (void) talloc_get_type_abort(worker, fr_worker_t); @@ -1128,7 +1128,7 @@ static void fr_network_worker_started_callback(void *ctx, void const *data, size /* * Run out of room to put workers! */ - rad_assert(0 == 1); + fr_assert(0 == 1); } /** Handle a network control message callback for a packet sent to a socket @@ -1144,7 +1144,7 @@ static void fr_network_inject_callback(void *ctx, void const *data, size_t data_ fr_network_inject_t my_inject; fr_network_socket_t *s; - rad_assert(data_size == sizeof(my_inject)); + fr_assert(data_size == sizeof(my_inject)); memcpy(&my_inject, data, data_size); s = rbtree_finddata(nr->sockets, &(fr_network_socket_t){ .listen = my_inject.listen }); @@ -1217,7 +1217,7 @@ static void fr_network_post_event(UNUSED fr_event_list_t *el, UNUSED fr_time_t n continue; } - rad_assert(s->outstanding > 0); + fr_assert(s->outstanding > 0); s->outstanding--; /* @@ -1434,7 +1434,7 @@ static void _signal_pipe_read(UNUSED fr_event_list_t *el, int fd, UNUSED int fla return; } - rad_assert(buff = 1); + fr_assert(buff = 1); /* * fr_network_stop() will signal the workers diff --git a/src/lib/io/queue.c b/src/lib/io/queue.c index d230d2c47c4..d548ba35be7 100644 --- a/src/lib/io/queue.c +++ b/src/lib/io/queue.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include #include struct fr_queue_s { @@ -185,7 +185,7 @@ fr_queue_t *fr_queue_resize(fr_queue_t *fq, int size) * Simple block of used elements, copy it. */ if (fq->head > fq->tail) { - rad_assert(fq->num == (fq->head - fq->tail)); + fr_assert(fq->num == (fq->head - fq->tail)); memcpy(&nq->entry[0], &fq->entry[fq->tail], &fq->entry[fq->head] - &fq->entry[fq->tail]); nq->head = fq->num; nq->num = fq->num; @@ -199,7 +199,7 @@ fr_queue_t *fr_queue_resize(fr_queue_t *fq, int size) memcpy(&nq->entry[0], &fq->entry[fq->tail], &fq->entry[fq->size] - &fq->entry[fq->tail]); nq->head = fq->size - fq->tail; - rad_assert((nq->head + fq->head) == fq->num); + fr_assert((nq->head + fq->head) == fq->num); memcpy(&nq->entry[nq->head], &fq->entry[0], &fq->entry[fq->head] - &fq->entry[0]); nq->head = fq->num; @@ -243,7 +243,7 @@ int fr_queue_localize_atomic(fr_queue_t *fq, fr_atomic_queue_t *aq) fq->entry[fq->head++] = data; if (fq->head >= fq->size) fq->head = 0; fq->num++; - rad_assert(fq->num <= fq->size); + fr_assert(fq->num <= fq->size); } return room; diff --git a/src/lib/io/ring_buffer.c b/src/lib/io/ring_buffer.c index a9e577edff8..d65027e7ff7 100644 --- a/src/lib/io/ring_buffer.c +++ b/src/lib/io/ring_buffer.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include #include -#include +#include #include /* @@ -140,7 +140,7 @@ uint8_t *fr_ring_buffer_reserve(fr_ring_buffer_t *rb, size_t size) return NULL; } - rad_assert(rb->write_offset == rb->data_end); + fr_assert(rb->write_offset == rb->data_end); /* * Data fits at the end of the ring buffer. @@ -234,7 +234,7 @@ uint8_t *fr_ring_buffer_alloc(fr_ring_buffer_t *rb, size_t size) return NULL; } - rad_assert(rb->write_offset == rb->data_end); + fr_assert(rb->write_offset == rb->data_end); /* * Data fits at the end of the ring buffer. @@ -441,7 +441,7 @@ int fr_ring_buffer_free(fr_ring_buffer_t *rb, size_t size_to_free) if (!size_to_free) return 0; } - rad_assert(rb->write_offset == rb->data_end); + fr_assert(rb->write_offset == rb->data_end); block_size = rb->data_end - rb->data_start; @@ -531,7 +531,7 @@ size_t fr_ring_buffer_used(fr_ring_buffer_t *rb) if (rb->write_offset < rb->data_start) { size = rb->write_offset; } else { - rad_assert(rb->write_offset == rb->data_end); + fr_assert(rb->write_offset == rb->data_end); size = 0; } diff --git a/src/lib/io/schedule.c b/src/lib/io/schedule.c index bc9b74a50bf..5c4823d752a 100644 --- a/src/lib/io/schedule.c +++ b/src/lib/io/schedule.c @@ -651,8 +651,8 @@ int fr_schedule_destroy(fr_schedule_t *sc) goto done; } - rad_assert(sc->sn); - rad_assert(fr_dlist_num_elements(&sc->workers) > 0); + fr_assert(sc->sn); + fr_assert(fr_dlist_num_elements(&sc->workers) > 0); /* * If the network thread is running, tell it to exit, and diff --git a/src/lib/io/time_tracking.h b/src/lib/io/time_tracking.h index cefb64a365c..a3315dfa620 100644 --- a/src/lib/io/time_tracking.h +++ b/src/lib/io/time_tracking.h @@ -30,7 +30,7 @@ RCSIDH(time_tracking_h, "$Id$") extern "C" { #endif -#include +#include #include typedef enum { @@ -84,11 +84,11 @@ struct fr_time_tracking_s { */ #define ASSERT_ON_TIME_TRAVEL(_tt, _now) \ do { \ - rad_assert((_tt)->last_changed <= (_now)); \ - rad_assert((_tt)->started <= (_now)); \ - rad_assert((_tt)->ended <= (_now)); \ - rad_assert((_tt)->last_yielded <= (_now)); \ - rad_assert((_tt)->last_resumed <= (_now)); \ + fr_assert((_tt)->last_changed <= (_now)); \ + fr_assert((_tt)->started <= (_now)); \ + fr_assert((_tt)->ended <= (_now)); \ + fr_assert((_tt)->last_yielded <= (_now)); \ + fr_assert((_tt)->last_resumed <= (_now)); \ } while(0); /** Set the last time a tracked entity started in its list of parents @@ -148,8 +148,8 @@ static inline CC_HINT(nonnull) void fr_time_tracking_init(fr_time_tracking_t *tt static inline CC_HINT(nonnull) void fr_time_tracking_start(fr_time_tracking_t *parent, fr_time_tracking_t *tt, fr_time_t now) { - rad_assert(tt->state == FR_TIME_TRACKING_STOPPED); - rad_assert(!tt->parent); + fr_assert(tt->state == FR_TIME_TRACKING_STOPPED); + fr_assert(!tt->parent); ASSERT_ON_TIME_TRAVEL(tt, now); @@ -173,9 +173,9 @@ static inline CC_HINT(nonnull) void fr_time_tracking_push(fr_time_tracking_t *pa { fr_time_delta_t run_time; - rad_assert(parent->parent = tt->parent); + fr_assert(parent->parent = tt->parent); - rad_assert(tt->state == FR_TIME_TRACKING_RUNNING); + fr_assert(tt->state == FR_TIME_TRACKING_RUNNING); run_time = now - tt->last_changed; tt->last_changed = parent->started = now; @@ -195,7 +195,7 @@ static inline CC_HINT(nonnull) void fr_time_tracking_pop(fr_time_tracking_t *tt, { fr_time_delta_t run_time; - rad_assert(tt->state == FR_TIME_TRACKING_RUNNING); + fr_assert(tt->state == FR_TIME_TRACKING_RUNNING); run_time = now - tt->last_changed; tt->last_changed = tt->parent->ended = now; @@ -216,7 +216,7 @@ static inline CC_HINT(nonnull) void fr_time_tracking_yield(fr_time_tracking_t *t ASSERT_ON_TIME_TRAVEL(tt, now); - rad_assert(tt->state == FR_TIME_TRACKING_RUNNING); + fr_assert(tt->state == FR_TIME_TRACKING_RUNNING); tt->state = FR_TIME_TRACKING_YIELDED; tt->last_yielded = tt->last_changed = now; @@ -236,7 +236,7 @@ static inline CC_HINT(nonnull) void fr_time_tracking_resume(fr_time_tracking_t * ASSERT_ON_TIME_TRAVEL(tt, now); - rad_assert(tt->state == FR_TIME_TRACKING_YIELDED); + fr_assert(tt->state == FR_TIME_TRACKING_YIELDED); tt->state = FR_TIME_TRACKING_RUNNING; tt->last_resumed = tt->last_changed = now; @@ -259,7 +259,7 @@ static inline void fr_time_tracking_end(fr_time_delta_t *predicted, { fr_time_delta_t run_time; - rad_assert(tt->state == FR_TIME_TRACKING_RUNNING); + fr_assert(tt->state == FR_TIME_TRACKING_RUNNING); ASSERT_ON_TIME_TRAVEL(tt, now); tt->state = FR_TIME_TRACKING_STOPPED; diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c index 31367b8871a..381cf6894f0 100644 --- a/src/lib/io/worker.c +++ b/src/lib/io/worker.c @@ -194,11 +194,11 @@ static void worker_channel_callback(void *ctx, void const *data, size_t data_siz return; case FR_CHANNEL_DATA_READY_REQUESTOR: - rad_assert(0 == 1); + fr_assert(0 == 1); break; case FR_CHANNEL_DATA_READY_RESPONDER: - rad_assert(ch != NULL); + fr_assert(ch != NULL); if (!fr_channel_recv_request(ch)) { worker->was_sleeping = was_sleeping; @@ -207,11 +207,11 @@ static void worker_channel_callback(void *ctx, void const *data, size_t data_siz break; case FR_CHANNEL_OPEN: - rad_assert(ch != NULL); + fr_assert(ch != NULL); ok = false; for (i = 0; i < worker->max_channels; i++) { - rad_assert(worker->channel[i] != ch); + fr_assert(worker->channel[i] != ch); if (worker->channel[i] != NULL) continue; @@ -221,7 +221,7 @@ static void worker_channel_callback(void *ctx, void const *data, size_t data_siz ms = fr_message_set_create(worker, worker->message_set_size, sizeof(fr_channel_data_t), worker->ring_buffer_size); - rad_assert(ms != NULL); + fr_assert(ms != NULL); fr_channel_responder_uctx_add(ch, ms); worker->num_channels++; @@ -233,7 +233,7 @@ static void worker_channel_callback(void *ctx, void const *data, size_t data_siz break; case FR_CHANNEL_CLOSE: - rad_assert(ch != NULL); + fr_assert(ch != NULL); ok = false; @@ -249,12 +249,12 @@ static void worker_channel_callback(void *ctx, void const *data, size_t data_siz ms = fr_channel_responder_uctx_get(ch); fr_channel_responder_ack_close(ch); - rad_assert(ms != NULL); + fr_assert(ms != NULL); fr_message_set_gc(ms); talloc_free(ms); worker->channel[i] = NULL; - rad_assert(worker->num_channels > 0); + fr_assert(worker->num_channels > 0); worker->num_channels--; ok = true; break; @@ -311,7 +311,7 @@ static void worker_nak(fr_worker_t *worker, fr_channel_data_t *cd, fr_time_t now } ms = fr_channel_responder_uctx_get(ch); - rad_assert(ms != NULL); + fr_assert(ms != NULL); size = listen->app_io->default_reply_size; if (!size) size = listen->app_io->default_message_size; @@ -320,7 +320,7 @@ static void worker_nak(fr_worker_t *worker, fr_channel_data_t *cd, fr_time_t now * Allocate a default message size. */ reply = (fr_channel_data_t *) fr_message_reserve(ms, size); - rad_assert(reply != NULL); + fr_assert(reply != NULL); /* * Encode a NAK @@ -381,7 +381,7 @@ static void worker_send_reply(fr_worker_t *worker, REQUEST *request, size_t size /* * If we're sending a reply, then it's no longer runnable. */ - rad_assert(request->runnable_id < 0); + fr_assert(request->runnable_id < 0); /* * If it's a fake request, or we're exiting, don't send a @@ -396,7 +396,7 @@ static void worker_send_reply(fr_worker_t *worker, REQUEST *request, size_t size * Allocate and send the reply. */ ch = request->async->channel; - rad_assert(ch != NULL); + fr_assert(ch != NULL); /* * If the channel has been closed, but we haven't @@ -410,10 +410,10 @@ static void worker_send_reply(fr_worker_t *worker, REQUEST *request, size_t size } ms = fr_channel_responder_uctx_get(ch); - rad_assert(ms != NULL); + fr_assert(ms != NULL); reply = (fr_channel_data_t *) fr_message_reserve(ms, size); - rad_assert(reply != NULL); + fr_assert(reply != NULL); /* * Encode it, if required. @@ -440,7 +440,7 @@ static void worker_send_reply(fr_worker_t *worker, REQUEST *request, size_t size * * This will ALWAYS return the same message as we put in. */ - rad_assert((size_t) slen <= reply->m.rb_size); + fr_assert((size_t) slen <= reply->m.rb_size); (void) fr_message_alloc(ms, &reply->m, slen); } @@ -448,7 +448,7 @@ static void worker_send_reply(fr_worker_t *worker, REQUEST *request, size_t size * The request is done. Track that. */ fr_time_tracking_end(&worker->predicted, &request->async->tracking, now); - rad_assert(worker->num_active > 0); + fr_assert(worker->num_active > 0); worker->num_active--; /* @@ -496,8 +496,8 @@ static void worker_send_reply(fr_worker_t *worker, REQUEST *request, size_t size if (request->runnable_id >= 0) (void) fr_heap_extract(worker->runnable, request); finished: - rad_assert(request->time_order_id < 0); - rad_assert(request->runnable_id < 0); + fr_assert(request->time_order_id < 0); + fr_assert(request->runnable_id < 0); #ifndef NDEBUG request->async->el = NULL; @@ -667,7 +667,7 @@ static void worker_request_bootstrap(fr_worker_t *worker, fr_channel_data_t *cd, MEM(request->packet = fr_radius_alloc(request, false)); request->packet->timestamp = cd->request.recv_time; /* Legacy - Remove once everything looks at request->async */ request->reply = fr_radius_alloc(request, false); - rad_assert(request->reply != NULL); + fr_assert(request->reply != NULL); request->async = talloc_zero(request, fr_async_t); @@ -675,7 +675,7 @@ static void worker_request_bootstrap(fr_worker_t *worker, fr_channel_data_t *cd, * Receive a message to the worker queue, and decode it * to a request. */ - rad_assert(cd->listen != NULL); + fr_assert(cd->listen != NULL); request->server_cs = cd->listen->server_cs; /* @@ -750,8 +750,8 @@ nak: goto insert_new; } - rad_assert(old->async->listen == request->async->listen); - rad_assert(old->async->channel == request->async->channel); + fr_assert(old->async->listen == request->async->listen); + fr_assert(old->async->channel == request->async->channel); /* * There's a new packet. Do we keep the old one, @@ -799,7 +799,7 @@ nak: RWARN("Got conflicting packet for request (%" PRIu64 "), telling old request to stop", old->number); worker_stop_request(worker, old, now); - rad_assert(worker->num_active > 0); + fr_assert(worker->num_active > 0); worker->num_active--; worker->stats.dropped++; talloc_free(old); @@ -813,7 +813,7 @@ nak: * strict time priority. Once they are in the list, they * are only removed when the request is done / free'd. */ - rad_assert(request->time_order_id < 0); + fr_assert(request->time_order_id < 0); (void) fr_heap_insert(worker->time_order, request); /* @@ -823,7 +823,7 @@ nak: fr_time_tracking_start(&worker->tracking, &request->async->tracking, now); fr_time_tracking_yield(&request->async->tracking, now); worker->num_active++; - rad_assert(request->runnable_id < 0); + fr_assert(request->runnable_id < 0); (void) fr_heap_insert(worker->runnable, request); if (!worker->ev_cleanup) worker_max_request_timer(worker); @@ -856,13 +856,13 @@ redo: if (!request) return; REQUEST_VERIFY(request); - rad_assert(request->runnable_id < 0); + fr_assert(request->runnable_id < 0); fr_time_tracking_resume(&request->async->tracking, now); - rad_assert(request->parent == NULL); - rad_assert(request->async->process != NULL); - rad_assert(request->async->listen != NULL); - rad_assert(request->runnable_id < 0); /* removed from the runnable heap */ + fr_assert(request->parent == NULL); + fr_assert(request->async->process != NULL); + fr_assert(request->async->listen != NULL); + fr_assert(request->runnable_id < 0); /* removed from the runnable heap */ RDEBUG("Running request"); @@ -1015,7 +1015,7 @@ void fr_worker_destroy(fr_worker_t *worker) worker_stop_request(worker, request, now); talloc_free(request); } - rad_assert(fr_heap_num_elements(worker->runnable) == 0); + fr_assert(fr_heap_num_elements(worker->runnable) == 0); /* * Signal the channels that we're closing. @@ -1284,16 +1284,16 @@ static void worker_verify(fr_worker_t *worker) (void) talloc_get_type_abort(worker, fr_worker_t); (void) talloc_get_type_abort(worker->aq_control, fr_atomic_queue_t); - rad_assert(worker->control != NULL); + fr_assert(worker->control != NULL); (void) talloc_get_type_abort(worker->control, fr_control_t); - rad_assert(worker->el != NULL); + fr_assert(worker->el != NULL); (void) talloc_get_type_abort(worker->el, fr_event_list_t); - rad_assert(worker->runnable != NULL); + fr_assert(worker->runnable != NULL); (void) talloc_get_type_abort(worker->runnable, fr_heap_t); - rad_assert(worker->dedup != NULL); + fr_assert(worker->dedup != NULL); (void) talloc_get_type_abort(worker->dedup, rbtree_t); for (i = 0; i < worker->max_channels; i++) { diff --git a/src/lib/json/jpath.c b/src/lib/json/jpath.c index c8aaad0a26d..51f2808aab4 100644 --- a/src/lib/json/jpath.c +++ b/src/lib/json/jpath.c @@ -25,7 +25,7 @@ * @copyright 2015 Network RADIUS SARL (legal@networkradius.com) * @copyright 2015 The FreeRADIUS Server Project */ -#include +#include #include "base.h" #define SELECTOR_INDEX_UNSET INT32_MAX @@ -168,7 +168,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail, { struct array_list *array_obj; /* Because array_list is a global... */ - rad_assert(selector->slice[0] != SELECTOR_INDEX_UNSET); + fr_assert(selector->slice[0] != SELECTOR_INDEX_UNSET); if (!fr_json_object_is_type(object, json_type_array)) return 0; array_obj = json_object_get_array(object); @@ -211,7 +211,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail, * Descending */ if (step < 0) for (i = start; (i > end) && (i >= 0); i += step) { - rad_assert((i >= 0) && (i < (int32_t)(array_obj->length & INT32_MAX))); + fr_assert((i >= 0) && (i < (int32_t)(array_obj->length & INT32_MAX))); ret = jpath_evaluate(ctx, tail, dst_type, dst_enumv, array_obj->array[i], node->next); if (ret < 0) return ret; @@ -220,7 +220,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail, * Ascending */ } else for (i = start; (i < end) && (i < (int32_t)(array_obj->length & INT32_MAX)); i += step) { - rad_assert((i >= 0) && (i < (int32_t)(array_obj->length & INT32_MAX))); + fr_assert((i >= 0) && (i < (int32_t)(array_obj->length & INT32_MAX))); ret = jpath_evaluate(ctx, tail, dst_type, dst_enumv, array_obj->array[i], node->next); if (ret < 0) return ret; @@ -230,7 +230,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail, break; default: - rad_assert(0); + fr_assert(0); return -1; } return child_matched ? 1 : 0; @@ -256,7 +256,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail, } else if (fr_json_object_is_type(object, json_type_object)) { json_object_object_foreach(object, field_name, field_value) { #ifndef NDEBUG - rad_assert(field_name); + fr_assert(field_name); #else UNUSED_VAR(field_name); #endif @@ -305,7 +305,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail, */ json_object_object_foreach(object, field_name, field_value) { #ifndef NDEBUG - rad_assert(field_name); + fr_assert(field_name); #else UNUSED_VAR(field_name); #endif @@ -340,7 +340,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail, case JPATH_SELECTOR_INVALID: case JPATH_SELECTOR_ROOT: case JPATH_SELECTOR_CURRENT: - rad_assert(0); + fr_assert(0); return -1; /* Not yet implemented */ } @@ -397,7 +397,7 @@ int fr_jpath_evaluate_leaf(TALLOC_CTX *ctx, fr_value_box_t **out, break; default: - rad_assert(0); + fr_assert(0); return -1; } @@ -476,7 +476,7 @@ char *fr_jpath_asprint(TALLOC_CTX *ctx, fr_jpath_node_t const *head) break; default: - rad_assert(0); /* Not yet implemented */ + fr_assert(0); /* Not yet implemented */ break; } p = talloc_strdup_append_buffer(p, "]"); @@ -496,7 +496,7 @@ char *fr_jpath_asprint(TALLOC_CTX *ctx, fr_jpath_node_t const *head) break; case JPATH_SELECTOR_INVALID: - rad_assert(0); + fr_assert(0); return NULL; } @@ -772,7 +772,7 @@ static size_t jpath_selector_parse(fr_jpath_node_t *node, char const *in, size_t } p += slen; if (p == end) goto missing_terminator; - rad_assert(p < end); + fr_assert(p < end); /* * Things that terminate a selector @@ -931,7 +931,7 @@ do { \ } p += slen; if (p == end) return p - in; /* The end of string! */ - rad_assert(p < end); + fr_assert(p < end); } break; @@ -943,7 +943,7 @@ do { \ } p += slen; if (p == end) return p - in; /* The end of string! */ - rad_assert(p < end); + fr_assert(p < end); break; default: diff --git a/src/lib/json/json.c b/src/lib/json/json.c index c835c20fd24..3ee5f3558c0 100644 --- a/src/lib/json/json.c +++ b/src/lib/json/json.c @@ -26,7 +26,7 @@ * @copyright 2015,2020 Network RADIUS SARL (legal@networkradius.com) * @copyright 2015 The FreeRADIUS Server Project */ -#include +#include #include "base.h" fr_table_num_sorted_t const fr_json_format_table[] = { @@ -397,13 +397,13 @@ static int json_afrom_value_box(TALLOC_CTX *ctx, json_object **out, fr_value_box_t vb_str; int is_enum = 0; - rad_assert(vp); + fr_assert(vp); vb = &vp->data; if (format && format->value.enum_as_int) { is_enum = fr_pair_value_enum_box(&vb, vp); - rad_assert(is_enum >= 0); + fr_assert(is_enum >= 0); } if (format && format->value.always_string) { @@ -464,7 +464,7 @@ bool fr_json_format_verify(fr_json_format_t const *format, bool verbose) { bool ret = true; - rad_assert(format); + fr_assert(format); switch (format->output_mode) { case JSON_MODE_OBJECT: @@ -501,7 +501,7 @@ bool fr_json_format_verify(fr_json_format_t const *format, bool verbose) } /* If we get here, something has gone wrong */ - rad_assert(0); + fr_assert(0); return false; } @@ -530,8 +530,8 @@ static json_object *json_object_afrom_pair_list(TALLOC_CTX *ctx, VALUE_PAIR *vps char buf[FR_DICT_ATTR_MAX_NAME_LEN + 32]; /* Check format and type */ - rad_assert(format); - rad_assert(format->output_mode == JSON_MODE_OBJECT); + fr_assert(format); + fr_assert(format->output_mode == JSON_MODE_OBJECT); MEM(obj = json_object_new_object()); @@ -650,8 +650,8 @@ static json_object *json_smplobj_afrom_pair_list(TALLOC_CTX *ctx, VALUE_PAIR *vp json_type type; /* Check format and type */ - rad_assert(format); - rad_assert(format->output_mode == JSON_MODE_OBJECT_SIMPLE); + fr_assert(format); + fr_assert(format->output_mode == JSON_MODE_OBJECT_SIMPLE); MEM(obj = json_object_new_object()); @@ -754,8 +754,8 @@ static struct json_object *json_array_afrom_pair_list(TALLOC_CTX *ctx, VALUE_PAI char buf[FR_DICT_ATTR_MAX_NAME_LEN + 32]; /* Check format and type */ - rad_assert(format); - rad_assert(format->output_mode == JSON_MODE_ARRAY); + fr_assert(format); + fr_assert(format->output_mode == JSON_MODE_ARRAY); MEM(obj = json_object_new_array()); @@ -883,8 +883,8 @@ static struct json_object *json_value_array_afrom_pair_list(TALLOC_CTX *ctx, VAL struct json_object *obj; /* Check format and type */ - rad_assert(format); - rad_assert(format->output_mode == JSON_MODE_ARRAY_OF_VALUES); + fr_assert(format); + fr_assert(format->output_mode == JSON_MODE_ARRAY_OF_VALUES); MEM(obj = json_object_new_array()); @@ -934,8 +934,8 @@ static struct json_object *json_attr_array_afrom_pair_list(UNUSED TALLOC_CTX *ct char buf[FR_DICT_ATTR_MAX_NAME_LEN + 32]; /* Check format and type */ - rad_assert(format); - rad_assert(format->output_mode == JSON_MODE_ARRAY_OF_NAMES); + fr_assert(format); + fr_assert(format->output_mode == JSON_MODE_ARRAY_OF_NAMES); MEM(obj = json_object_new_array()); @@ -1017,7 +1017,7 @@ char *fr_json_afrom_pair_list(TALLOC_CTX *ctx, VALUE_PAIR *vps, break; default: /* This should never happen */ - rad_assert(0); + fr_assert(0); } MEM(p = json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PLAIN)); diff --git a/src/lib/ldap/base.c b/src/lib/ldap/base.c index 7f33978139b..fd672dd6f00 100644 --- a/src/lib/ldap/base.c +++ b/src/lib/ldap/base.c @@ -28,7 +28,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API -#include +#include #define LOG_PREFIX "%s - " #define LOG_PREFIX_ARGS handle_config->name @@ -248,7 +248,7 @@ fr_ldap_rcode_t fr_ldap_error_check(LDAPControl ***ctrls, fr_ldap_connection_t c * Stupid messy API */ if (lib_errno != LDAP_SUCCESS) { - rad_assert(!ctrls || !*ctrls); + fr_assert(!ctrls || !*ctrls); ldap_get_option(conn->handle, LDAP_OPT_ERROR_NUMBER, &lib_errno); } @@ -480,10 +480,10 @@ fr_ldap_rcode_t fr_ldap_bind(REQUEST *request, int msgid = -1; - rad_assert(*pconn && (*pconn)->handle); + fr_assert(*pconn && (*pconn)->handle); #ifndef WITH_SASL - rad_assert(!sasl || !sasl->mech); + fr_assert(!sasl || !sasl->mech); #endif if (DEBUG_ENABLED4 || (request && RDEBUG_ENABLED4)) { @@ -588,7 +588,7 @@ fr_ldap_rcode_t fr_ldap_search(LDAPMessage **result, REQUEST *request, NUM_ELEMENTS(our_clientctrls), *pconn, serverctrls, clientctrls); - rad_assert(*pconn && (*pconn)->handle); + fr_assert(*pconn && (*pconn)->handle); if (DEBUG_ENABLED4 || (request && RDEBUG_ENABLED4)) { fr_ldap_timeout_debug(request, *pconn, 0, __FUNCTION__); @@ -611,7 +611,7 @@ fr_ldap_rcode_t fr_ldap_search(LDAPMessage **result, REQUEST *request, NULL, NULL); if (status != LDAP_PROC_SUCCESS) return LDAP_PROC_ERROR; - rad_assert(*pconn); + fr_assert(*pconn); (*pconn)->rebound = false; } @@ -714,7 +714,7 @@ fr_ldap_rcode_t fr_ldap_search_async(int *msgid, REQUEST *request, NUM_ELEMENTS(our_clientctrls), *pconn, serverctrls, clientctrls); - rad_assert(*pconn && (*pconn)->handle); + fr_assert(*pconn && (*pconn)->handle); if (DEBUG_ENABLED4 || (request && RDEBUG_ENABLED4)) fr_ldap_timeout_debug(request, *pconn, 0, __FUNCTION__); @@ -735,7 +735,7 @@ fr_ldap_rcode_t fr_ldap_search_async(int *msgid, REQUEST *request, NULL, NULL); if (status != LDAP_PROC_SUCCESS) return LDAP_PROC_ERROR; - rad_assert(*pconn); + fr_assert(*pconn); (*pconn)->rebound = false; } @@ -795,7 +795,7 @@ fr_ldap_rcode_t fr_ldap_modify(REQUEST *request, fr_ldap_connection_t **pconn, NUM_ELEMENTS(our_clientctrls), *pconn, serverctrls, clientctrls); - rad_assert(*pconn && (*pconn)->handle); + fr_assert(*pconn && (*pconn)->handle); if (RDEBUG_ENABLED4) fr_ldap_timeout_debug(request, *pconn, 0, __FUNCTION__); @@ -811,7 +811,7 @@ fr_ldap_rcode_t fr_ldap_modify(REQUEST *request, fr_ldap_connection_t **pconn, return LDAP_PROC_ERROR; } - rad_assert(*pconn); + fr_assert(*pconn); (*pconn)->rebound = false; } diff --git a/src/lib/ldap/bind.c b/src/lib/ldap/bind.c index da4b9a9c246..a54b522319a 100644 --- a/src/lib/ldap/bind.c +++ b/src/lib/ldap/bind.c @@ -26,7 +26,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API #include -#include +#include /** Holds arguments for the bind operation * diff --git a/src/lib/ldap/connection.c b/src/lib/ldap/connection.c index 957183b3c0d..e4ab5c43887 100644 --- a/src/lib/ldap/connection.c +++ b/src/lib/ldap/connection.c @@ -26,7 +26,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API #include -#include +#include #if LDAP_SET_REBIND_PROC_ARGS == 3 /** Callback for OpenLDAP to rebind and chase referrals @@ -53,7 +53,7 @@ static int fr_ldap_rebind(LDAP *handle, LDAP_CONST char *url, conn->referred = true; conn->rebound = true; /* not really, but oh well... */ - rad_assert(handle == conn->handle); + fr_assert(handle == conn->handle); DEBUG("Rebinding to URL %s", url); @@ -165,7 +165,7 @@ int fr_ldap_connection_configure(fr_ldap_connection_t *c, fr_ldap_config_t const LDAP *handle = NULL; int ldap_errno, ldap_version; - rad_assert(config->server); + fr_assert(config->server); #ifdef HAVE_LDAP_INITIALIZE ldap_errno = ldap_initialize(&handle, config->server); diff --git a/src/lib/ldap/edir.c b/src/lib/ldap/edir.c index 9bb8c3d44f8..334468ebfa2 100644 --- a/src/lib/ldap/edir.c +++ b/src/lib/ldap/edir.c @@ -30,7 +30,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API -#include +#include #include /* NMAS error codes */ @@ -130,8 +130,8 @@ static int ber_decode_login_data(struct berval *reply_bv, int *server_version, v int err = 0; BerElement *reply_ber = NULL; - rad_assert(out != NULL); - rad_assert(outlen != NULL); + fr_assert(out != NULL); + fr_assert(outlen != NULL); if ((reply_ber = ber_init(reply_bv)) == NULL) { err = NMAS_E_SYSTEM_RESOURCES; diff --git a/src/lib/ldap/map.c b/src/lib/ldap/map.c index c0025882072..0f4d6f6d0a1 100644 --- a/src/lib/ldap/map.c +++ b/src/lib/ldap/map.c @@ -27,7 +27,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API -#include +#include #include /** Callback for map_to_request @@ -173,7 +173,7 @@ int fr_ldap_map_getvalue(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp break; default: - rad_assert(0); + fr_assert(0); } *out = head; diff --git a/src/lib/ldap/sasl.c b/src/lib/ldap/sasl.c index 93fe3b347be..2085cef7b2f 100644 --- a/src/lib/ldap/sasl.c +++ b/src/lib/ldap/sasl.c @@ -26,7 +26,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API #include -#include +#include #include /** Holds arguments for the bind operation diff --git a/src/lib/ldap/sasl_s.c b/src/lib/ldap/sasl_s.c index ed88e31fe26..59bc3299d28 100644 --- a/src/lib/ldap/sasl_s.c +++ b/src/lib/ldap/sasl_s.c @@ -30,7 +30,7 @@ USES_APPLE_DEPRECATED_API #define LOG_PREFIX "%s - " #define LOG_PREFIX_ARGS handle_config->name -#include +#include #include #include diff --git a/src/lib/ldap/start_tls.c b/src/lib/ldap/start_tls.c index d1e0a958a55..58e8a63868b 100644 --- a/src/lib/ldap/start_tls.c +++ b/src/lib/ldap/start_tls.c @@ -26,7 +26,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API #include -#include +#include /** Holds arguments for the start_tls operation * diff --git a/src/lib/redis/cluster.c b/src/lib/redis/cluster.c index 522de6997b5..300ce1172f6 100644 --- a/src/lib/redis/cluster.c +++ b/src/lib/redis/cluster.c @@ -146,7 +146,7 @@ * */ -#include +#include #include #include @@ -358,7 +358,7 @@ static fr_redis_cluster_rcode_t cluster_node_connect(fr_redis_cluster_t *cluster { char const *p; - rad_assert(node->pending_addr.ipaddr.af); + fr_assert(node->pending_addr.ipaddr.af); /* * Write out the IP address and Port in string form @@ -470,7 +470,7 @@ static fr_redis_cluster_rcode_t cluster_node_conf_from_redirect(uint16_t *key_sl if (fr_inet_pton_port(&ipaddr, &port, p, redirect->len - (p - redirect->str), AF_UNSPEC, false, true) < 0) { return FR_REDIS_CLUSTER_RCODE_BAD_INPUT; } - rad_assert(ipaddr.af); + fr_assert(ipaddr.af); if (key_slot) *key_slot = key; if (node_addr) { @@ -534,7 +534,7 @@ static fr_redis_cluster_rcode_t cluster_map_apply(fr_redis_cluster_t *cluster, r do { \ int _ret; \ _ret = fr_inet_pton(&_addr.ipaddr, _map->element[0]->str, _map->element[0]->len, AF_UNSPEC, false, true);\ - rad_assert(_ret == 0);\ + fr_assert(_ret == 0);\ _addr.port = _map->element[1]->integer; \ } while (0) #else @@ -562,7 +562,7 @@ do { \ rollback[r++] = (_node)->id; \ } while (0) - rad_assert(reply->type == REDIS_REPLY_ARRAY); + fr_assert(reply->type == REDIS_REPLY_ARRAY); memset(&rollback, 0, sizeof(rollback)); memset(active, 0, sizeof(active)); @@ -725,9 +725,9 @@ do { \ if (cluster->node[i].is_active) { /* Sanity check for duplicates that are active */ found = rbtree_finddata(cluster->used_nodes, &cluster->node[i]); - rad_assert(found); - rad_assert(found->is_active); - rad_assert(found->id == i); + fr_assert(found); + fr_assert(found->is_active); + fr_assert(found->id == i); } #endif @@ -749,7 +749,7 @@ do { \ /* * Sanity checks */ - rad_assert(((talloc_array_length(cluster->node) - 1) - rbtree_num_elements(cluster->used_nodes)) == + fr_assert(((talloc_array_length(cluster->node) - 1) - rbtree_num_elements(cluster->used_nodes)) == fr_fifo_num_elements(cluster->free_nodes)); return FR_REDIS_CLUSTER_RCODE_SUCCESS; @@ -1184,7 +1184,7 @@ static int _cluster_pool_walk(void *data, void *uctx) cluster_nodes_live_t *live = uctx; fr_redis_cluster_node_t *node = data; - rad_assert(node->pool); + fr_assert(node->pool); if (live->skip == node->id) return 0; /* Skip the dead node */ @@ -1334,7 +1334,7 @@ static int cluster_node_find_live(fr_redis_cluster_node_t **live_node, fr_redis_ rbtree_walk(cluster->used_nodes, RBTREE_IN_ORDER, _cluster_pool_walk, live); pthread_mutex_unlock(&cluster->mutex); - rad_assert(live->next); /* There should be at least one */ + fr_assert(live->next); /* There should be at least one */ if (live->next == 1) goto no_alts; /* Weird, but conceivable */ now = fr_time(); @@ -1388,7 +1388,7 @@ static int cluster_node_find_live(fr_redis_cluster_node_t **live_node, fr_redis_ * to save memory... */ node = &cluster->node[live->node[pivot].id]; - rad_assert(live->node[pivot].id == node->id); + fr_assert(live->node[pivot].id == node->id); RDEBUG2("Selected node %i (using random value %i)", node->id, find); conn = fr_pool_connection_get(node->pool, request); @@ -1710,9 +1710,9 @@ fr_redis_rcode_t fr_redis_cluster_state_init(fr_redis_cluster_state_t *state, fr uint8_t first, i; int used_nodes; - rad_assert(cluster); - rad_assert(state); - rad_assert(conn); + fr_assert(cluster); + fr_assert(state); + fr_assert(conn); memset(state, 0, sizeof(*state)); @@ -1825,8 +1825,8 @@ fr_redis_rcode_t fr_redis_cluster_state_next(fr_redis_cluster_state_t *state, fr fr_redis_cluster_t *cluster, REQUEST *request, fr_redis_rcode_t status, redisReply **reply) { - rad_assert(state && state->node && state->node->pool); - rad_assert(conn && *conn); + fr_assert(state && state->node && state->node->pool); + fr_assert(conn && *conn); if (*reply) fr_redis_reply_print(L_DBG_LVL_3, *reply, request, 0); @@ -1942,7 +1942,7 @@ fr_redis_rcode_t fr_redis_cluster_state_next(fr_redis_cluster_state_t *state, fr * trigger a cluster remap. */ case REDIS_RCODE_MOVE: - rad_assert(*reply); + fr_assert(*reply); if (*conn && (fr_redis_cluster_remap(request, cluster, *conn) != FR_REDIS_CLUSTER_RCODE_SUCCESS)) { RDEBUG2("%s", fr_strerror()); @@ -2042,7 +2042,7 @@ int fr_redis_cluster_pool_by_node_addr(fr_pool_t **pool, fr_redis_cluster_t *clu pthread_mutex_unlock(&cluster->mutex); hostname = inet_ntop(node_addr->ipaddr.af, &node_addr->ipaddr.addr, buffer, sizeof(buffer)); - rad_assert(hostname); /* addr.ipaddr is probably corrupt */; + fr_assert(hostname); /* addr.ipaddr is probably corrupt */; fr_strerror_printf("No existing node found with address %s, port %i", hostname, node_addr->port); return -1; @@ -2066,7 +2066,7 @@ int fr_redis_cluster_pool_by_node_addr(fr_pool_t **pool, fr_redis_cluster_t *clu /* * Sanity checks */ - rad_assert(((talloc_array_length(cluster->node) - 1) - rbtree_num_elements(cluster->used_nodes)) == + fr_assert(((talloc_array_length(cluster->node) - 1) - rbtree_num_elements(cluster->used_nodes)) == fr_fifo_num_elements(cluster->free_nodes)); pthread_mutex_unlock(&cluster->mutex); @@ -2264,8 +2264,8 @@ fr_redis_cluster_t *fr_redis_cluster_alloc(TALLOC_CTX *ctx, int num_nodes; fr_redis_cluster_t *cluster; - rad_assert(triggers_enabled || !trigger_prefix); - rad_assert(triggers_enabled || !trigger_args); + fr_assert(triggers_enabled || !trigger_prefix); + fr_assert(triggers_enabled || !trigger_args); cluster = talloc_zero(NULL, fr_redis_cluster_t); if (!cluster) { diff --git a/src/lib/redis/io.c b/src/lib/redis/io.c index 8b98b8a0b98..ae05d291260 100644 --- a/src/lib/redis/io.c +++ b/src/lib/redis/io.c @@ -26,7 +26,7 @@ */ #include -#include +#include #include diff --git a/src/lib/redis/io.h b/src/lib/redis/io.h index 7d7a5734c63..414a7c2b8e7 100644 --- a/src/lib/redis/io.h +++ b/src/lib/redis/io.h @@ -107,7 +107,7 @@ static inline void fr_redis_connection_ignore_response(fr_redis_handle_t *h, fr_ { fr_redis_sqn_ignore_t *ignore; - rad_assert(sqn <= h->rsp_sqn); + fr_assert(sqn <= h->rsp_sqn); MEM(ignore = talloc_zero(h, fr_redis_sqn_ignore_t)); ignore->sqn = sqn; @@ -126,11 +126,11 @@ static inline bool fr_redis_connection_process_response(fr_redis_handle_t *h) fr_redis_sqn_t check = h->rsp_sqn++; fr_redis_sqn_ignore_t *head; - rad_assert(h->rsp_sqn <= h->req_sqn); /* Can't have more responses than requests */ + fr_assert(h->rsp_sqn <= h->req_sqn); /* Can't have more responses than requests */ head = fr_dlist_head(&h->ignore); if (!head || (head->sqn > check)) return true; /* First response to ignore is some time after this one */ - rad_assert(head->sqn == check); + fr_assert(head->sqn == check); fr_dlist_remove(&h->ignore, head); talloc_free(head); diff --git a/src/lib/redis/pipeline.c b/src/lib/redis/pipeline.c index d153bc3ff4b..a1a216991d8 100644 --- a/src/lib/redis/pipeline.c +++ b/src/lib/redis/pipeline.c @@ -566,7 +566,7 @@ static void _redis_pipeline_command_set_cancel(fr_connection_t *conn, UNUSED fr_ } case FR_TRUNK_CANCEL_REASON_NONE: - rad_assert(0); + fr_assert(0); return; } } diff --git a/src/lib/redis/redis.c b/src/lib/redis/redis.c index 7aa7cda53a8..69a04891502 100644 --- a/src/lib/redis/redis.c +++ b/src/lib/redis/redis.c @@ -24,7 +24,7 @@ * @copyright 2011 TekSavvy Solutions (gabe@teksavvy.com) */ #include -#include +#include fr_table_num_sorted_t const redis_reply_types[] = { { "array", REDIS_REPLY_ARRAY }, @@ -240,7 +240,7 @@ int fr_redis_reply_to_value_box(TALLOC_CTX *ctx, fr_value_box_t *out, redisReply break; case REDIS_REPLY_ARRAY: - rad_assert(0); + fr_assert(0); } if (fr_value_box_cast(ctx, out, dst_type, dst_enumv, &in) < 0) return -1; @@ -360,8 +360,8 @@ int fr_redis_tuple_from_map(TALLOC_CTX *pool, char const *out[], size_t out_len[ size_t key_len; size_t need; - rad_assert(tmpl_is_attr(map->lhs)); - rad_assert(tmpl_is_data(map->rhs)); + fr_assert(tmpl_is_attr(map->lhs)); + fr_assert(tmpl_is_data(map->rhs)); key_len = tmpl_snprint(&need, key_buf, sizeof(key_buf), map->lhs); if (need) { @@ -434,7 +434,7 @@ fr_redis_rcode_t fr_redis_pipeline_result(unsigned int *pipelined, fr_redis_rcod fr_redis_rcode_t status = REDIS_RCODE_SUCCESS; redisReply *reply = NULL; - rad_assert(out_len >= (size_t)*pipelined); + fr_assert(out_len >= (size_t)*pipelined); fr_strerror(); /* Clear any outstanding errors */ @@ -534,7 +534,7 @@ fr_redis_rcode_t fr_redis_get_version(char *out, size_t out_len, fr_redis_conn_t fr_redis_rcode_t status; char *p, *q; - rad_assert(out_len > 0); + fr_assert(out_len > 0); out[0] = '\0'; reply = redisCommand(conn->handle, "INFO SERVER"); @@ -556,7 +556,7 @@ fr_redis_rcode_t fr_redis_get_version(char *out, size_t out_len, fr_redis_conn_t } p = strchr(p, ':'); - rad_assert(p); + fr_assert(p); p++; q = strstr(p, "\r\n"); diff --git a/src/lib/redis/test.c b/src/lib/redis/test.c index f47d2569b95..158cd9d56b6 100644 --- a/src/lib/redis/test.c +++ b/src/lib/redis/test.c @@ -28,7 +28,7 @@ static void _command_complete(REQUEST *request, fr_dlist_head_t *completed, void fr_box_time_delta(io_time), (uint32_t)(stats->enqueued / ((float)io_time / NSEC))); - rad_assert(fr_dlist_num_elements(completed) == stats->enqueued); + fr_assert(fr_dlist_num_elements(completed) == stats->enqueued); } static void _command_failed(REQUEST *request, fr_dlist_head_t *completed, void *rctx) diff --git a/src/lib/server/auth.c b/src/lib/server/auth.c index 861983276ca..b84a5f36567 100644 --- a/src/lib/server/auth.c +++ b/src/lib/server/auth.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include #include @@ -156,7 +156,7 @@ runit: #ifdef __clang_analyzer__ if (!request->parent) return RLM_MODULE_FAIL; #endif - rad_assert(request->parent != NULL); + fr_assert(request->parent != NULL); request->async = talloc_memdup(request, request->parent->async, sizeof(fr_async_t)); talloc_set_name_const(request->async, talloc_get_name(request->parent->async)); diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c index 921d1d5fd65..416642b21da 100644 --- a/src/lib/server/cf_file.c +++ b/src/lib/server/cf_file.c @@ -34,7 +34,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -445,7 +445,7 @@ static bool cf_template_merge(CONF_SECTION *cs, CONF_SECTION const *template) CONF_SECTION *subcs1, *subcs2; subcs1 = cf_item_to_section(ci); - rad_assert(subcs1 != NULL); + fr_assert(subcs1 != NULL); subcs2 = cf_section_find(cs, subcs1->name1, subcs1->name2); if (subcs2) { @@ -504,7 +504,7 @@ static int cf_file_open(CONF_SECTION *cs, char const *filename, bool from_dir, F top = cf_root(cs); tree = cf_data_value(cf_data_find(top, rbtree_t, "filename")); - rad_assert(tree); + fr_assert(tree); /* * If we're including a wildcard directory, then ignore @@ -739,7 +739,7 @@ int cf_section_pass2(CONF_SECTION *cs) cp = cf_item_to_pair(ci); if (!cp->value || !cp->pass2) continue; - rad_assert((cp->rhs_quote == T_BARE_WORD) || + fr_assert((cp->rhs_quote == T_BARE_WORD) || (cp->rhs_quote == T_DOUBLE_QUOTED_STRING) || (cp->rhs_quote == T_BACK_QUOTED_STRING)); @@ -1471,7 +1471,7 @@ static int parse_input(cf_stack_t *stack) return -1; } - rad_assert(frame->braces > 0); + fr_assert(frame->braces > 0); frame->braces--; /* @@ -1989,7 +1989,7 @@ do_frame: * Reset which frame we're looking at. */ frame = &stack->frame[stack->depth]; - rad_assert(frame->type == CF_STACK_FILE); + fr_assert(frame->type == CF_STACK_FILE); break; #endif @@ -2097,7 +2097,7 @@ do_frame: } while (rcode == 1); } - rad_assert(frame->fp != NULL); + fr_assert(frame->fp != NULL); /* * See if EOF was unexpected. diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c index d91c1348fb3..11c7eee13d9 100644 --- a/src/lib/server/cf_parse.c +++ b/src/lib/server/cf_parse.c @@ -32,7 +32,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -97,7 +97,7 @@ static inline int CC_HINT(nonnull) fr_item_validate_ipaddr(CONF_SECTION *cs, cha return 0; default: - rad_assert(0); + fr_assert(0); return -1; } } @@ -137,9 +137,9 @@ int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, UNUSED void *base, CONF_ITEM cant_be_empty = (type & FR_TYPE_NOT_EMPTY); tmpl = (type & FR_TYPE_TMPL); - rad_assert(cp); - rad_assert(!(type & FR_TYPE_ATTRIBUTE) || tmpl); /* Attribute flag only valid for templates */ - rad_assert((type & FR_TYPE_ON_READ) == 0); + fr_assert(cp); + fr_assert(!(type & FR_TYPE_ATTRIBUTE) || tmpl); /* Attribute flag only valid for templates */ + fr_assert((type & FR_TYPE_ON_READ) == 0); if (required) cant_be_empty = true; /* May want to review this in the future... */ @@ -448,8 +448,8 @@ int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, UNUSED void *base, CONF_ITEM * It's not an error parsing the configuration * file. */ - rad_assert(type > FR_TYPE_INVALID); - rad_assert(type < FR_TYPE_MAX); + fr_assert(type > FR_TYPE_INVALID); + fr_assert(type < FR_TYPE_MAX); cf_log_err(cp, "type '%s' (%i) is not supported in the configuration files", fr_table_str_by_value(fr_value_box_type_table, type, "?Unknown?"), type); @@ -486,7 +486,7 @@ static int cf_pair_default(CONF_PAIR **out, CONF_SECTION *cs, char const *name, CONF_PAIR *cp; char buffer[8192]; - rad_assert(dflt); + fr_assert(dflt); type = FR_BASE_TYPE(type); @@ -557,7 +557,7 @@ static int CC_HINT(nonnull(4,5)) cf_pair_parse_internal(TALLOC_CTX *ctx, void *o char const *dflt = rule->dflt; FR_TOKEN dflt_quote = rule->quote; - rad_assert(!(type & FR_TYPE_TMPL) || !dflt || (dflt_quote != T_INVALID)); /* We ALWAYS need a quoting type for templates */ + fr_assert(!(type & FR_TYPE_TMPL) || !dflt || (dflt_quote != T_INVALID)); /* We ALWAYS need a quoting type for templates */ multi = (type & FR_TYPE_MULTI); required = (type & FR_TYPE_REQUIRED); @@ -676,7 +676,7 @@ static int CC_HINT(nonnull(4,5)) cf_pair_parse_internal(TALLOC_CTX *ctx, void *o break; case FR_TYPE_VOID: - rad_assert(rule->func); + fr_assert(rule->func); array = (void **)talloc_zero_array(ctx, void *, count); break; @@ -1018,7 +1018,7 @@ static int cf_subsection_parse(TALLOC_CTX *ctx, void *out, void *base, CONF_SECT uint8_t **array = NULL; - rad_assert(type & FR_TYPE_SUBSECTION); + fr_assert(type & FR_TYPE_SUBSECTION); subcs = cf_section_find(cs, rule->name, rule->ident2); if (!subcs) return 0; @@ -1062,7 +1062,7 @@ static int cf_subsection_parse(TALLOC_CTX *ctx, void *out, void *base, CONF_SECT return 0; } - rad_assert(subcs_size); + fr_assert(subcs_size); /* * Handle the multi subsection case (which is harder) @@ -1429,7 +1429,7 @@ int cf_section_parse_pass2(void *base, CONF_SECTION *cs) case TMPL_TYPE_REGEX: case TMPL_TYPE_REGEX_STRUCT: case TMPL_TYPE_NULL: - rad_assert(0); + fr_assert(0); /* Don't add default */ } @@ -1476,7 +1476,7 @@ int _cf_section_rule_push(CONF_SECTION *cs, CONF_PARSER const *rule, char const cd = cf_data_find(CF_TO_ITEM(cs), CONF_PARSER, rule->name); old = cf_data_value(cd); - rad_assert(old != NULL); + fr_assert(old != NULL); /* * Shut up about duplicates. diff --git a/src/lib/server/cf_util.c b/src/lib/server/cf_util.c index 857f480850a..252829ab68d 100644 --- a/src/lib/server/cf_util.c +++ b/src/lib/server/cf_util.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include @@ -95,7 +95,7 @@ static CONF_ITEM *cf_find(CONF_ITEM const *parent, CONF_ITEM_TYPE type, char con break; case CONF_ITEM_PAIR: - rad_assert((ident2 == NULL) || IS_WILDCARD(ident2)); + fr_assert((ident2 == NULL) || IS_WILDCARD(ident2)); memset(&cp_find, 0, sizeof(cp_find)); cp_find.item.type = CONF_ITEM_PAIR; @@ -186,7 +186,7 @@ static CONF_ITEM *cf_find_next(CONF_ITEM const *parent, CONF_ITEM const *prev, break; case CONF_ITEM_PAIR: - rad_assert((ident2 == NULL) || IS_WILDCARD(ident2)); + fr_assert((ident2 == NULL) || IS_WILDCARD(ident2)); memset(&cp_find, 0, sizeof(cp_find)); cp_find.item.type = CONF_ITEM_PAIR; @@ -221,7 +221,7 @@ static CONF_ITEM *cf_find_next(CONF_ITEM const *parent, CONF_ITEM const *prev, for (ci = prev->next; ci && (_cf_ident1_cmp(ci, find) != 0); ci = ci->next) { - rad_assert(ci->next != ci); + fr_assert(ci->next != ci); } return ci; @@ -374,7 +374,7 @@ void _cf_item_add(CONF_ITEM *parent, CONF_ITEM *child) fr_cursor_t to_merge; CONF_ITEM *ci; - rad_assert(parent != child); + fr_assert(parent != child); if (!parent || !child) return; @@ -425,13 +425,13 @@ CONF_ITEM *cf_remove(CONF_ITEM *parent, CONF_ITEM *child) in_ident1 = (rbtree_finddata(parent->ident1, child) == child); if (in_ident1 && (!rbtree_deletebydata(parent->ident1, child))) { - rad_assert(0); + fr_assert(0); return NULL; } in_ident2 = (rbtree_finddata(parent->ident2, child) == child); if (in_ident2 && (!rbtree_deletebydata(parent->ident2, child))) { - rad_assert(0); + fr_assert(0); return NULL; } @@ -587,7 +587,7 @@ CONF_PAIR *cf_item_to_pair(CONF_ITEM const *ci) if (ci == NULL) return NULL; - rad_assert(ci->type == CONF_ITEM_PAIR); + fr_assert(ci->type == CONF_ITEM_PAIR); memcpy(&out, &ci, sizeof(out)); return out; @@ -608,7 +608,7 @@ CONF_SECTION *cf_item_to_section(CONF_ITEM const *ci) if (ci == NULL) return NULL; - rad_assert(ci->type == CONF_ITEM_SECTION); + fr_assert(ci->type == CONF_ITEM_SECTION); memcpy(&out, &ci, sizeof(out)); return out; @@ -629,7 +629,7 @@ CONF_DATA *cf_item_to_data(CONF_ITEM const *ci) if (ci == NULL) return NULL; - rad_assert(ci->type == CONF_ITEM_DATA); + fr_assert(ci->type == CONF_ITEM_DATA); memcpy(&out, &ci, sizeof(out)); return out; @@ -903,7 +903,7 @@ CONF_SECTION *cf_section_dup(TALLOC_CTX *ctx, CONF_SECTION *parent, CONF_SECTION break; case CONF_ITEM_INVALID: - rad_assert(0); + fr_assert(0); } } @@ -1117,7 +1117,7 @@ CONF_PAIR *cf_pair_alloc(CONF_SECTION *parent, char const *attr, char const *val { CONF_PAIR *cp; - rad_assert(fr_equality_op[op] || fr_assignment_op[op]); + fr_assert(fr_equality_op[op] || fr_assignment_op[op]); if (!attr) return NULL; cp = talloc_zero(parent, CONF_PAIR); @@ -1158,8 +1158,8 @@ CONF_PAIR *cf_pair_dup(CONF_SECTION *parent, CONF_PAIR *cp) { CONF_PAIR *new; - rad_assert(parent); - rad_assert(cp); + fr_assert(parent); + fr_assert(cp); new = cf_pair_alloc(parent, cp->attr, cf_pair_value(cp), cp->op, cp->lhs_quote, cp->rhs_quote); if (!new) return NULL; diff --git a/src/lib/server/client.c b/src/lib/server/client.c index d63fd497ba7..58b81c1bada 100644 --- a/src/lib/server/client.c +++ b/src/lib/server/client.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include #include @@ -162,7 +162,7 @@ static fr_trie_t *clients_trie(RADCLIENT_LIST const *clients, fr_ipaddr_t const return clients->v4_udp; } - rad_assert(ipaddr->af == AF_INET6); + fr_assert(ipaddr->af == AF_INET6); if (proto == IPPROTO_TCP) return clients->v6_tcp; @@ -207,7 +207,7 @@ bool client_add(RADCLIENT_LIST *clients, RADCLIENT *client) break; default: - rad_assert(0); + fr_assert(0); } fr_inet_ntop_prefix(buffer, sizeof(buffer), &client->ipaddr); @@ -349,7 +349,7 @@ void client_delete(RADCLIENT_LIST *clients, RADCLIENT *client) if (!clients) clients = root_clients; - rad_assert(client->ipaddr.prefix <= 128); + fr_assert(client->ipaddr.prefix <= 128); #ifdef WITH_TRIE trie = clients_trie(clients, &client->ipaddr, client->proto); diff --git a/src/lib/server/command.c b/src/lib/server/command.c index e562a86f1a6..e2675bde108 100644 --- a/src/lib/server/command.c +++ b/src/lib/server/command.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include #include @@ -788,7 +788,7 @@ int fr_command_add(TALLOC_CTX *talloc_ctx, fr_cmd_t **head, char const *name, vo return -1; } - rad_assert(cmd->func == NULL); + fr_assert(cmd->func == NULL); start = &(cmd->child); } @@ -902,7 +902,7 @@ int fr_command_add(TALLOC_CTX *talloc_ctx, fr_cmd_t **head, char const *name, vo * can probably allow it. */ if (!table->func) { - rad_assert(table->help != NULL); + fr_assert(table->help != NULL); /* * Suppress duplicates. @@ -914,7 +914,7 @@ int fr_command_add(TALLOC_CTX *talloc_ctx, fr_cmd_t **head, char const *name, vo cmd->name); return -1; } - rad_assert(cmd->intermediate); + fr_assert(cmd->intermediate); cmd->help = table->help; cmd->read_only = table->read_only; return 0; @@ -933,7 +933,7 @@ int fr_command_add(TALLOC_CTX *talloc_ctx, fr_cmd_t **head, char const *name, vo /* * Allocate cmd and insert it into the current point. */ - rad_assert(insert != NULL); + fr_assert(insert != NULL); cmd = fr_command_alloc(talloc_ctx, insert, table->name); } @@ -1089,7 +1089,7 @@ int fr_command_walk(fr_cmd_t *head, void **walk_ctx, void *ctx, fr_cmd_walk_t ca * the next command at the current level. */ if (cmd->child) { - rad_assert(stack->depth < CMD_MAX_ARGV); + fr_assert(stack->depth < CMD_MAX_ARGV); info.parents[stack->depth] = cmd->name; stack->depth++; stack->entry[stack->depth] = cmd->child; @@ -1113,7 +1113,7 @@ check_next: if (stack->depth == 0) { if (!cmd) goto done; - rad_assert(0 == 1); + fr_assert(0 == 1); } /* @@ -1199,7 +1199,7 @@ static int fr_command_tab_expand_argv(TALLOC_CTX *ctx, fr_cmd_t *cmd, fr_cmd_inf return count; } - rad_assert(argv->type == FR_TYPE_FIXED); + fr_assert(argv->type == FR_TYPE_FIXED); /* * Not a full match, but we're at the last @@ -1310,7 +1310,7 @@ int fr_command_tab_expand(TALLOC_CTX *ctx, fr_cmd_t *head, fr_cmd_info_t *info, } if (cmd->intermediate) { - rad_assert(cmd->child != NULL); + fr_assert(cmd->child != NULL); start = cmd->child; continue; } @@ -1329,7 +1329,7 @@ int fr_command_tab_expand(TALLOC_CTX *ctx, fr_cmd_t *head, fr_cmd_info_t *info, * * Skip the name */ - rad_assert(cmd->func != NULL); + fr_assert(cmd->func != NULL); return fr_command_tab_expand_syntax(ctx, cmd, i + 1, info, max_expansions, expansions); } @@ -1340,8 +1340,8 @@ int fr_command_tab_expand(TALLOC_CTX *ctx, fr_cmd_t *head, fr_cmd_info_t *info, * be child commands under that hierarchy. In which * case, show them as expansions. */ - rad_assert(i == info->argc); - rad_assert(cmd->child != NULL); + fr_assert(i == info->argc); + fr_assert(cmd->child != NULL); for (i = 0, cmd = cmd->child; (i < max_expansions) && (cmd != NULL); i++, cmd = cmd->next) { expansions[i] = cmd->name; @@ -1368,15 +1368,15 @@ static int fr_command_run_partial(FILE *fp, FILE *fp_err, fr_cmd_info_t *info, b fr_cmd_t *start, *cmd = NULL; fr_cmd_info_t my_info; - rad_assert(head->intermediate); - rad_assert(head->child != NULL); + fr_assert(head->intermediate); + fr_assert(head->child != NULL); start = head->child; /* * Wildcard '*' is at 'offset + 1'. Then the command to run is at 'offset + 2'. */ - rad_assert(info->argc >= (offset + 2)); + fr_assert(info->argc >= (offset + 2)); /* * Loop from "start", trying to find a matching command. @@ -1434,7 +1434,7 @@ static int fr_command_run_partial(FILE *fp, FILE *fp_err, fr_cmd_info_t *info, b /* * Leaf nodes must have a callback. */ - rad_assert(cmd->func != NULL); + fr_assert(cmd->func != NULL); // @todo - add cmd->min_argc && cmd->max_argc, to track optional things, varargs, etc. @@ -1482,10 +1482,10 @@ int fr_command_run(FILE *fp, FILE *fp_err, fr_cmd_info_t *info, bool read_only) for (i = 0; i < info->argc; i++) { cmd = info->cmd[i]; - rad_assert(cmd != NULL); + fr_assert(cmd != NULL); if (cmd->added_name && (info->argv[i][0] == '*')) { - rad_assert(i > 0); + fr_assert(i > 0); for (; cmd != NULL; cmd = cmd->next) { if (!cmd->live) continue; @@ -1519,7 +1519,7 @@ int fr_command_run(FILE *fp, FILE *fp_err, fr_cmd_info_t *info, bool read_only) /* * Leaf nodes must have a callback. */ - rad_assert(cmd->func != NULL); + fr_assert(cmd->func != NULL); // @todo - add cmd->min_argc && cmd->max_argc, to track optional things, varargs, etc. @@ -1559,7 +1559,7 @@ char const *fr_command_help(fr_cmd_t *head, int argc, char *argv[]) if (!cmd) return NULL; if (cmd->intermediate) { - rad_assert(cmd->child != NULL); + fr_assert(cmd->child != NULL); start = cmd->child; continue; } @@ -1654,7 +1654,7 @@ void fr_command_list(FILE *fp, int max_depth, fr_cmd_t *head, int options) if ((options & FR_COMMAND_OPTION_LIST_CHILD) != 0) { if (!head->child) { - rad_assert(head->func != NULL); + fr_assert(head->func != NULL); // @todo - skip syntax_argv as necessary fr_command_list_node(fp, head, 0, argv, options); return; @@ -1678,13 +1678,13 @@ static int fr_command_verify_argv(fr_cmd_info_t *info, int start, int verify, in TALLOC_CTX *ctx = NULL; redo: - rad_assert(argv->type != FR_TYPE_ALTERNATE_CHOICE); + fr_assert(argv->type != FR_TYPE_ALTERNATE_CHOICE); /* * Don't eat too many arguments. */ if ((start + used) >= argc) { - rad_assert(argv != NULL); + fr_assert(argv != NULL); /* * Skip trailing optional pieces. @@ -1772,8 +1772,8 @@ redo: for (child = argv->child; child != NULL; child = child->next) { fr_cmd_argv_t *sub; - rad_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); - rad_assert(child->child != NULL); + fr_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); + fr_assert(child->child != NULL); sub = child->child; rcode = fr_command_verify_argv(info, start + used, verify, argc, &sub, true); @@ -1798,7 +1798,7 @@ redo: goto no_match; } - rad_assert(type < FR_TYPE_FIXED); + fr_assert(type < FR_TYPE_FIXED); /* * Don't re-verify things we've already verified. @@ -1933,7 +1933,7 @@ static int syntax_str_to_argv(int start_argc, fr_cmd_argv_t *start, fr_cmd_info_ * An already-parsed data type. Skip it. */ if (argc < info->argc) { - rad_assert(info->box[argc] != NULL); + fr_assert(info->box[argc] != NULL); word = p; argc++; goto next; @@ -2033,8 +2033,8 @@ static int syntax_str_to_argv(int start_argc, fr_cmd_argv_t *start, fr_cmd_info_ for (child = argv->child; child != NULL; child = child->next) { fr_cmd_argv_t *sub; - rad_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); - rad_assert(child->child != NULL); + fr_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); + fr_assert(child->child != NULL); sub = child->child; /* @@ -2166,7 +2166,7 @@ int fr_command_str_to_argv(fr_cmd_t *head, fr_cmd_info_t *info, char const *text */ for (argc = 0; argc < info->argc; argc++) { cmd = info->cmd[argc]; - rad_assert(cmd != NULL); + fr_assert(cmd != NULL); fr_skip_whitespace(word); @@ -2240,8 +2240,8 @@ skip_matched: * some special circumstances. */ if ((word[0] == '*') && isspace(word[1]) && cmd->added_name) { - rad_assert(cmd->intermediate); - rad_assert(cmd->child != NULL); + fr_assert(cmd->intermediate); + fr_assert(cmd->child != NULL); info->argv[argc] = "*"; info->cmd[argc] = cmd; @@ -2282,7 +2282,7 @@ skip_matched: } if (cmd->intermediate) { - rad_assert(cmd->child != NULL); + fr_assert(cmd->child != NULL); info->argv[argc] = cmd->name; info->cmd[argc] = cmd; word = p; @@ -2316,8 +2316,8 @@ skip_matched: return -1; } - rad_assert(cmd->func != NULL); - rad_assert(cmd->child == NULL); + fr_assert(cmd->func != NULL); + fr_assert(cmd->child == NULL); check_syntax: /* @@ -2413,8 +2413,8 @@ static int expand_all(fr_cmd_t *cmd, fr_cmd_info_t *info, fr_cmd_argv_t *argv, i for (child = argv->child; child != NULL; child = child->next) { fr_cmd_argv_t *sub; - rad_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); - rad_assert(child->child != NULL); + fr_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); + fr_assert(child->child != NULL); sub = child->child; count = expand_all(cmd, info, sub, count, max_expansions, expansions); @@ -2427,8 +2427,8 @@ static int expand_all(fr_cmd_t *cmd, fr_cmd_info_t *info, fr_cmd_argv_t *argv, i for (child = argv->child; child != NULL; child = child->next) { fr_cmd_argv_t *sub; - rad_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); - rad_assert(child->child != NULL); + fr_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); + fr_assert(child->child != NULL); sub = child->child; count = expand_all(cmd, info, sub, count, max_expansions, expansions); @@ -2451,7 +2451,7 @@ static int expand_all(fr_cmd_t *cmd, fr_cmd_info_t *info, fr_cmd_argv_t *argv, i info->box[info->argc] = NULL; info->argc++; - rad_assert(count == 0); + fr_assert(count == 0); rcode = cmd->tab_expand(NULL, cmd->ctx, info, max_expansions - count, expansions + count); if (rcode < 0) return rcode; @@ -2503,8 +2503,8 @@ static int expand_syntax(fr_cmd_t *cmd, fr_cmd_info_t *info, fr_cmd_argv_t *argv fr_cmd_argv_t *sub; char const *my_word = word; - rad_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); - rad_assert(child->child != NULL); + fr_assert(child->type == FR_TYPE_ALTERNATE_CHOICE); + fr_assert(child->child != NULL); sub = child->child; /* @@ -2561,7 +2561,7 @@ static int expand_syntax(fr_cmd_t *cmd, fr_cmd_info_t *info, fr_cmd_argv_t *argv /* * Expand this thing. */ - rad_assert(count == 0); + fr_assert(count == 0); rcode = cmd->tab_expand(NULL, cmd->ctx, info, max_expansions - count, expansions + count); if (rcode < 0) return rcode; return count + rcode; @@ -2597,7 +2597,7 @@ static int expand_syntax(fr_cmd_t *cmd, fr_cmd_info_t *info, fr_cmd_argv_t *argv /* * This should be the only remaining data type. */ - rad_assert(argv->type == FR_TYPE_FIXED); + fr_assert(argv->type == FR_TYPE_FIXED); SKIP_NAME(argv->name); @@ -2738,7 +2738,7 @@ int fr_command_complete(fr_cmd_t *head, char const *text, int start, } if (cmd->intermediate) { - rad_assert(cmd->child != NULL); + fr_assert(cmd->child != NULL); word = p; cmd = cmd->child; @@ -2856,7 +2856,7 @@ int fr_command_print_help(FILE *fp, fr_cmd_t *head, char const *text) if (cmd->intermediate) { intermediate: - rad_assert(cmd->child != NULL); + fr_assert(cmd->child != NULL); word = p; cmd = cmd->child; continue; diff --git a/src/lib/server/cond_eval.c b/src/lib/server/cond_eval.c index 29d4f5e1cfb..67bda3e2564 100644 --- a/src/lib/server/cond_eval.c +++ b/src/lib/server/cond_eval.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -45,7 +45,7 @@ static bool all_digits(char const *string) { char const *p = string; - rad_assert(p != NULL); + fr_assert(p != NULL); if (*p == '\0') return false; @@ -127,7 +127,7 @@ int cond_eval_tmpl(REQUEST *request, int modreturn, UNUSED int depth, vp_tmpl_t */ case TMPL_TYPE_REGEX: case TMPL_TYPE_REGEX_STRUCT: - rad_assert(0 == 1); + fr_assert(0 == 1); /* FALL-THROUGH */ default: @@ -281,7 +281,7 @@ static int cond_cmp_values(REQUEST *request, fr_cond_t const *c, fr_value_box_t VALUE_PAIR *vp; EVAL_DEBUG("CMP WITH PAIRCOMPARE"); - rad_assert(tmpl_is_attr(map->lhs)); + fr_assert(tmpl_is_attr(map->lhs)); MEM(vp = fr_pair_afrom_da(request, map->lhs->tmpl_da)); vp->op = c->data.map->op; @@ -427,9 +427,9 @@ do {\ * Magic attribute is always the LHS. */ if (c->pass2_fixup == PASS2_PAIRCOMPARE) { - rad_assert(!c->cast); - rad_assert(tmpl_is_attr(map->lhs)); - rad_assert(!tmpl_is_attr(map->rhs) || !paircmp_find(map->rhs->tmpl_da)); /* expensive assert */ + fr_assert(!c->cast); + fr_assert(tmpl_is_attr(map->lhs)); + fr_assert(!tmpl_is_attr(map->rhs) || !paircmp_find(map->rhs->tmpl_da)); /* expensive assert */ cast = map->lhs->tmpl_da; @@ -530,7 +530,7 @@ do {\ } data.type = FR_TYPE_STRING; - rad_assert(data.vb_strvalue); + fr_assert(data.vb_strvalue); rhs = &data; @@ -559,7 +559,7 @@ do {\ case TMPL_TYPE_UNKNOWN: case TMPL_TYPE_ATTR_UNDEFINED: case TMPL_TYPE_REGEX: /* Should now be a TMPL_TYPE_REGEX_STRUCT or TMPL_TYPE_XLAT_STRUCT */ - rad_assert(0); + fr_assert(0); rcode = -1; break; } @@ -610,7 +610,7 @@ int cond_eval_map(REQUEST *request, UNUSED int modreturn, UNUSED int depth, fr_c */ if ((c->pass2_fixup == PASS2_PAIRCOMPARE) && (map->op != T_OP_REG_EQ)) { #ifndef NDEBUG - rad_assert(paircmp_find(map->lhs->tmpl_da)); /* expensive assert */ + fr_assert(paircmp_find(map->lhs->tmpl_da)); /* expensive assert */ #endif rcode = cond_normalise_and_cmp(request, c, NULL); break; @@ -654,7 +654,7 @@ int cond_eval_map(REQUEST *request, UNUSED int modreturn, UNUSED int depth, fr_c data.vb_strvalue = map->lhs->name; data.datum.length = map->lhs->len; } - rad_assert(data.vb_strvalue); + fr_assert(data.vb_strvalue); data.type = FR_TYPE_STRING; rcode = cond_normalise_and_cmp(request, c, &data); @@ -670,7 +670,7 @@ int cond_eval_map(REQUEST *request, UNUSED int modreturn, UNUSED int depth, fr_c case TMPL_TYPE_UNKNOWN: case TMPL_TYPE_REGEX: /* should now be a TMPL_TYPE_REGEX_STRUCT or TMPL_TYPE_XLAT_STRUCT */ case TMPL_TYPE_REGEX_STRUCT: /* not allowed as LHS */ - rad_assert(0); + fr_assert(0); rcode = -1; break; } diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c index e9687041b90..d4cdb4c0981 100644 --- a/src/lib/server/cond_tokenize.c +++ b/src/lib/server/cond_tokenize.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include @@ -72,7 +72,7 @@ next: switch (c->type) { case COND_TYPE_EXISTS: - rad_assert(c->data.vpt != NULL); + fr_assert(c->data.vpt != NULL); if (c->cast) { len = snprintf(p, end - p, "<%s>", fr_table_str_by_value(fr_value_box_type_table, c->cast->type, "??")); @@ -85,7 +85,7 @@ next: break; case COND_TYPE_MAP: - rad_assert(c->data.map != NULL); + fr_assert(c->data.map != NULL); #if 0 *(p++) = '['; /* for extra-clear debugging */ #endif @@ -103,7 +103,7 @@ next: break; case COND_TYPE_CHILD: - rad_assert(c->data.child != NULL); + fr_assert(c->data.child != NULL); *(p++) = '('; len = cond_snprint(need, p, (end - p) - 1, c->data.child); /* -1 for proceeding ')' */ if (*need) return len; @@ -128,7 +128,7 @@ next: } if (c->next_op == COND_NONE) { - rad_assert(c->next == NULL); + fr_assert(c->next == NULL); *p = '\0'; return p - out; } @@ -142,7 +142,7 @@ next: RETURN_IF_TRUNCATED(need, len, p, out, end); } else { - rad_assert(0 == 1); + fr_assert(0 == 1); } c = c->next; @@ -683,7 +683,7 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, CONF_SECTION *cs, c = talloc_zero(ctx, fr_cond_t); - rad_assert(c != NULL); + fr_assert(c != NULL); lhs_type = rhs_type = T_INVALID; fr_skip_whitespace(p); @@ -815,7 +815,7 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, CONF_SECTION *cs, return_P(fr_strerror()); } - rad_assert(!tmpl_is_regex(c->data.vpt)); + fr_assert(!tmpl_is_regex(c->data.vpt)); if (tmpl_define_unknown_attr(c->data.vpt) < 0) { p = lhs - tlen; @@ -1034,7 +1034,7 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, CONF_SECTION *cs, * Got flags all the way to the end of the string */ case 0: - rad_assert(flen >= 0); + fr_assert(flen >= 0); slen += (size_t)flen; break; @@ -1042,13 +1042,13 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, CONF_SECTION *cs, * Found non-flag, this is OK. */ case -1: - rad_assert(flen <= 0); + fr_assert(flen <= 0); fr_strerror(); /* Clear out the error buffer */ slen += (size_t)(-flen); break; case -2: - rad_assert(flen <= 0); + fr_assert(flen <= 0); p = rhs + rhs_len + 1; p += (size_t)(-flen); return_P("Duplicate flag"); @@ -1308,7 +1308,7 @@ done: tmpl_is_data(c->data.map->rhs)) { int rcode; - rad_assert(c->cast != NULL); + fr_assert(c->cast != NULL); rcode = cond_eval_map(NULL, 0, 0, c); TALLOC_FREE(c->data.map); @@ -1335,7 +1335,7 @@ done: !c->pass2_fixup) { int rcode; - rad_assert(c->cast == NULL); + fr_assert(c->cast == NULL); rcode = cond_eval_map(NULL, 0, 0, c); if (rcode) { @@ -1400,7 +1400,7 @@ done: /* * This must have been parsed into TMPL_TYPE_DATA. */ - rad_assert(!tmpl_is_unparsed(c->data.map->rhs)); + fr_assert(!tmpl_is_unparsed(c->data.map->rhs)); } } while (0); diff --git a/src/lib/server/connection.c b/src/lib/server/connection.c index dce2b98ae7d..e0677f6a08f 100644 --- a/src/lib/server/connection.c +++ b/src/lib/server/connection.c @@ -30,7 +30,7 @@ typedef struct fr_connection_s fr_connection_t; #include #include -#include +#include #include #include @@ -334,7 +334,7 @@ static inline void connection_watch_call(fr_connection_t *conn, fr_dlist_head_t * and shouldn't be possible because of * deferred signal processing. */ - rad_assert(conn->next_watcher == NULL); + fr_assert(conn->next_watcher == NULL); while ((conn->next_watcher = fr_dlist_next(list, conn->next_watcher))) { fr_connection_watch_entry_t *entry = conn->next_watcher; @@ -635,7 +635,7 @@ static void connection_state_enter_closed(fr_connection_t *conn) * is working correctly this state should never * be entered if the connection is closed. */ - rad_assert(!conn->is_closed); + fr_assert(!conn->is_closed); if (conn->close && !conn->is_closed) { HANDLER_BEGIN(conn, conn->close); DEBUG4("Calling close(el=%p, h=%p, uctx=%p)", conn->pub.el, conn->pub.h, conn->uctx); @@ -735,7 +735,7 @@ static void connection_state_enter_failed(fr_connection_t *conn) fr_connection_state_t prev; fr_connection_state_t ret = FR_CONNECTION_STATE_INIT; - rad_assert(conn->pub.state != FR_CONNECTION_STATE_FAILED); + fr_assert(conn->pub.state != FR_CONNECTION_STATE_FAILED); /* * Explicit error occurred, delete the connection timer @@ -844,7 +844,7 @@ static void connection_state_enter_failed(fr_connection_t *conn) break; default: - rad_assert(0); + fr_assert(0); } } @@ -879,7 +879,7 @@ static void connection_state_enter_timeout(fr_connection_t *conn) */ static void connection_state_enter_halted(fr_connection_t *conn) { - rad_assert(conn->is_closed); + fr_assert(conn->is_closed); switch (conn->pub.state) { case FR_CONNECTION_STATE_FAILED: /* Init failure */ @@ -914,7 +914,7 @@ static void connection_state_enter_connected(fr_connection_t *conn) { int ret; - rad_assert(conn->pub.state == FR_CONNECTION_STATE_CONNECTING); + fr_assert(conn->pub.state == FR_CONNECTION_STATE_CONNECTING); STATE_TRANSITION(FR_CONNECTION_STATE_CONNECTED); @@ -1096,7 +1096,7 @@ void fr_connection_signal_init(fr_connection_t *conn) */ void fr_connection_signal_connected(fr_connection_t *conn) { - rad_assert(!conn->open); /* Use one or the other not both! */ + fr_assert(!conn->open); /* Use one or the other not both! */ DEBUG2("Signalled connected from %s state", fr_table_str_by_value(fr_connection_states, conn->pub.state, "")); @@ -1171,7 +1171,7 @@ void fr_connection_signal_reconnect(fr_connection_t *conn, fr_connection_reason_ break; case FR_CONNECTION_STATE_MAX: - rad_assert(0); + fr_assert(0); return; } } @@ -1228,7 +1228,7 @@ void fr_connection_signal_shutdown(fr_connection_t *conn) case FR_CONNECTION_STATE_TIMEOUT: case FR_CONNECTION_STATE_FAILED: connection_state_enter_closed(conn); - rad_assert(conn->is_closed); + fr_assert(conn->is_closed); /* FALL-THROUGH */ case FR_CONNECTION_STATE_CLOSED: @@ -1236,7 +1236,7 @@ void fr_connection_signal_shutdown(fr_connection_t *conn) break; case FR_CONNECTION_STATE_MAX: - rad_assert(0); + fr_assert(0); return; } } @@ -1279,12 +1279,12 @@ void fr_connection_signal_halt(fr_connection_t *conn) case FR_CONNECTION_STATE_TIMEOUT: case FR_CONNECTION_STATE_FAILED: connection_state_enter_closed(conn); - rad_assert(conn->is_closed); + fr_assert(conn->is_closed); connection_state_enter_halted(conn); break; case FR_CONNECTION_STATE_MAX: - rad_assert(0); + fr_assert(0); return; } } @@ -1340,7 +1340,7 @@ static void _connection_signal_on_fd_cleanup(fr_connection_t *conn, fr_connectio break; default: - rad_assert(0); + fr_assert(0); break; } @@ -1473,7 +1473,7 @@ fr_connection_t *fr_connection_alloc(TALLOC_CTX *ctx, fr_event_list_t *el, size_t i; fr_connection_t *conn; - rad_assert(el); + fr_assert(el); conn = talloc_zero(ctx, fr_connection_t); if (!conn) return NULL; diff --git a/src/lib/server/dl_module.c b/src/lib/server/dl_module.c index 3f709c5d139..84fcd04665b 100644 --- a/src/lib/server/dl_module.c +++ b/src/lib/server/dl_module.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -36,7 +36,7 @@ RCSID("$Id$") #include #include -#define DL_INIT_CHECK rad_assert(dl_module_loader) +#define DL_INIT_CHECK fr_assert(dl_module_loader) /** Wrapper struct around dl_loader_t * @@ -73,8 +73,8 @@ static int dl_module_inst_data_cmp(void const *one, void const *two) { dl_module_inst_t const *a = one, *b = two; - rad_assert(a->data); - rad_assert(b->data); + fr_assert(a->data); + fr_assert(b->data); return (a->data > b->data) - (a->data < b->data); } @@ -83,8 +83,8 @@ static int dl_module_cmp(void const *one, void const *two) { dl_module_t const *a = one, *b = two; - rad_assert(a->dl); - rad_assert(b->dl); + fr_assert(a->dl); + fr_assert(b->dl); return strcmp(a->dl->name, b->dl->name); } @@ -275,7 +275,7 @@ static void dl_module_instance_data_alloc(dl_module_inst_t *dl_inst, dl_module_t * destructor can find the dl_module_inst_t associated * with the data. */ - rad_assert(dl_module_loader != NULL); + fr_assert(dl_module_loader != NULL); rbtree_insert(dl_module_loader->inst_data_tree, dl_inst); /* Duplicates not possible */ talloc_set_destructor(data, _dl_module_instance_data_free); @@ -447,7 +447,7 @@ static int _dl_module_instance_free(dl_module_inst_t *dl_inst) /* * Remove this instance from the tracking tree. */ - rad_assert(dl_module_loader != NULL); + fr_assert(dl_module_loader != NULL); rbtree_deletebydata(dl_module_loader->inst_data_tree, dl_inst); /* diff --git a/src/lib/server/exec.c b/src/lib/server/exec.c index 00ce029d214..ade04d27860 100644 --- a/src/lib/server/exec.c +++ b/src/lib/server/exec.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include -#include +#include #include #include diff --git a/src/lib/server/exfile.c b/src/lib/server/exfile.c index 3991b27a924..c1fc632a620 100644 --- a/src/lib/server/exfile.c +++ b/src/lib/server/exfile.c @@ -24,7 +24,7 @@ * @copyright 2014 The FreeRADIUS server project */ #include -#include +#include #include #include @@ -71,8 +71,8 @@ static inline void exfile_trigger_exec(exfile_t *ef, REQUEST *request, exfile_en fr_dict_attr_t const *da; fr_cursor_t cursor; - rad_assert(ef != NULL); - rad_assert(name_suffix != NULL); + fr_assert(ef != NULL); + fr_assert(name_suffix != NULL); if (!ef->trigger_prefix) return; diff --git a/src/lib/server/log.c b/src/lib/server/log.c index 4776ab344d0..a1ab83b3bf4 100644 --- a/src/lib/server/log.c +++ b/src/lib/server/log.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include -#include +#include #ifdef HAVE_SYS_STAT_H # include @@ -538,7 +538,7 @@ void vlog_module_failure_msg(REQUEST *request, char const *fmt, va_list ap) if (!fmt || !request || !request->packet) return; - rad_assert(attr_module_failure_message); + fr_assert(attr_module_failure_message); /* * If we don't copy the original ap we get a segfault from vasprintf. This is apparently diff --git a/src/lib/server/main_config.c b/src/lib/server/main_config.c index daa1bf0caa7..57348832447 100644 --- a/src/lib/server/main_config.c +++ b/src/lib/server/main_config.c @@ -33,7 +33,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -344,7 +344,7 @@ static int lib_dir_parse(UNUSED TALLOC_CTX *ctx, UNUSED void *out, UNUSED void * CONF_PAIR *cp = cf_item_to_pair(ci); char const *value; - rad_assert(main_config != NULL); + fr_assert(main_config != NULL); value = cf_pair_value(cp); if (value) { main_config_t *config; @@ -1210,7 +1210,7 @@ do {\ * Note that where possible, we do atomic switch-overs, * to ensure that the pointers are always valid. */ - rad_assert(config->root_cs == NULL); + fr_assert(config->root_cs == NULL); DEBUG2("%s: #### Loading Clients ####", config->name); if (!client_list_parse_section(cs, 0, false)) goto failure; diff --git a/src/lib/server/main_loop.c b/src/lib/server/main_loop.c index 835c6384841..69e49c4904b 100644 --- a/src/lib/server/main_loop.c +++ b/src/lib/server/main_loop.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include #include diff --git a/src/lib/server/map.c b/src/lib/server/map.c index dd18f65b9c1..ecb49962f82 100644 --- a/src/lib/server/map.c +++ b/src/lib/server/map.c @@ -31,7 +31,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -84,13 +84,13 @@ bool map_cast_from_hex(vp_map_t *map, FR_TOKEN rhs_type, char const *rhs) vp_tmpl_t *vpt; fr_value_box_t cast; - rad_assert(map != NULL); + fr_assert(map != NULL); - rad_assert(map->lhs != NULL); - rad_assert(tmpl_is_attr(map->lhs)); + fr_assert(map->lhs != NULL); + fr_assert(tmpl_is_attr(map->lhs)); - rad_assert(map->rhs == NULL); - rad_assert(rhs != NULL); + fr_assert(map->rhs == NULL); + fr_assert(rhs != NULL); MAP_VERIFY(map); @@ -475,7 +475,7 @@ int map_afrom_cs(TALLOC_CTX *ctx, vp_map_t **out, CONF_SECTION *cs, } cp = cf_item_to_pair(ci); - rad_assert(cp != NULL); + fr_assert(cp != NULL); if (map_afrom_cp(parent, &map, cp, &our_lhs_rules, rhs_rules) < 0) { cf_log_err(ci, "Failed creating map from '%s = %s'", @@ -839,9 +839,9 @@ static int map_exec_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, v MAP_VERIFY(map); - rad_assert(map->rhs); /* Quite clang scan */ - rad_assert(tmpl_is_exec(map->rhs)); - rad_assert(tmpl_is_attr(map->lhs) || tmpl_is_list(map->lhs)); + fr_assert(map->rhs); /* Quite clang scan */ + fr_assert(tmpl_is_exec(map->rhs)); + fr_assert(tmpl_is_attr(map->lhs) || tmpl_is_list(map->lhs)); /* * We always put the request pairs into the environment @@ -892,7 +892,7 @@ static int map_exec_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, v } default: - rad_assert(0); + fr_assert(0); return -1; } } @@ -1102,7 +1102,7 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, if (!fr_cond_assert(original->lhs != NULL)) return -1; if (!fr_cond_assert(original->rhs != NULL)) return -1; - rad_assert(tmpl_is_list(original->lhs) || + fr_assert(tmpl_is_list(original->lhs) || tmpl_is_attr(original->lhs) || tmpl_is_xlat_struct(original->lhs)); @@ -1138,7 +1138,7 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, tmp_ctx = talloc_new(NULL); - rad_assert(lhs_result && *lhs_result); + fr_assert(lhs_result && *lhs_result); /* * This should always be a noop, but included @@ -1161,7 +1161,7 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, TALLOC_FREE(*lhs_result); goto error; } - rad_assert(tmpl_is_attr(mutated->lhs) || tmpl_is_list(mutated->lhs)); + fr_assert(tmpl_is_attr(mutated->lhs) || tmpl_is_list(mutated->lhs)); } break; @@ -1186,7 +1186,7 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, slen = tmpl_aexpand(request, &attr_str, request, mutated->lhs, NULL, NULL); if (slen <= 0) { RPEDEBUG("Left side expansion failed"); - rad_assert(!attr_str); + fr_assert(!attr_str); goto error; } @@ -1197,12 +1197,12 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, talloc_free(attr_str); goto error; } - rad_assert(tmpl_is_attr(mutated->lhs) || tmpl_is_list(mutated->lhs)); + fr_assert(tmpl_is_attr(mutated->lhs) || tmpl_is_list(mutated->lhs)); } break; default: - rad_assert(0); + fr_assert(0); break; } @@ -1304,8 +1304,8 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, if (tmpl_is_unparsed(mutated->rhs)) { fr_type_t type = mutated->lhs->tmpl_da->type; - rad_assert(tmpl_is_attr(mutated->lhs)); - rad_assert(mutated->lhs->tmpl_da); /* We need to know which attribute to create */ + fr_assert(tmpl_is_attr(mutated->lhs)); + fr_assert(mutated->lhs->tmpl_da); /* We need to know which attribute to create */ n = list_mod_generic_afrom_map(ctx, original, mutated); if (!n) goto error; @@ -1330,7 +1330,7 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, switch (mutated->rhs->type) { case TMPL_TYPE_XLAT_STRUCT: - rad_assert(mutated->rhs->tmpl_xlat != NULL); + fr_assert(mutated->rhs->tmpl_xlat != NULL); /* FALL-THROUGH */ case TMPL_TYPE_XLAT: @@ -1338,8 +1338,8 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, fr_cursor_t from; fr_value_box_t *vb, *n_vb; - rad_assert(tmpl_is_attr(mutated->lhs)); - rad_assert(mutated->lhs->tmpl_da); /* We need to know which attribute to create */ + fr_assert(tmpl_is_attr(mutated->lhs)); + fr_assert(mutated->lhs->tmpl_da); /* We need to know which attribute to create */ /* * Empty value - Try and cast an empty string @@ -1400,8 +1400,8 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, fr_value_box_t *n_vb; int err; - rad_assert(!rhs_result || !*rhs_result); - rad_assert((tmpl_is_attr(mutated->lhs) && mutated->lhs->tmpl_da) || + fr_assert(!rhs_result || !*rhs_result); + fr_assert((tmpl_is_attr(mutated->lhs) && mutated->lhs->tmpl_da) || (tmpl_is_list(mutated->lhs) && !mutated->lhs->tmpl_da)); /* @@ -1438,7 +1438,7 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, if (!n) goto error; vp = fr_cursor_current(&from); - rad_assert(vp); /* Should have errored out */ + fr_assert(vp); /* Should have errored out */ do { n_vb = fr_value_box_alloc_null(n->mod->rhs); if (!n_vb) { @@ -1468,9 +1468,9 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, fr_cursor_t from; fr_value_box_t *vb, *vb_head, *n_vb; - rad_assert(!rhs_result || !*rhs_result); - rad_assert(mutated->lhs->tmpl_da); - rad_assert(tmpl_is_attr(mutated->lhs)); + fr_assert(!rhs_result || !*rhs_result); + fr_assert(mutated->lhs->tmpl_da); + fr_assert(tmpl_is_attr(mutated->lhs)); n = list_mod_generic_afrom_map(ctx, original, mutated); if (!n) goto error; @@ -1525,7 +1525,7 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, VALUE_PAIR *vp_head = NULL; VALUE_PAIR *vp; - rad_assert(!rhs_result || !*rhs_result); + fr_assert(!rhs_result || !*rhs_result); n = list_mod_alloc(ctx); if (!n) goto error; @@ -1564,11 +1564,11 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out, goto finish; default: - rad_assert(0); /* Should have been caught at parse time */ + fr_assert(0); /* Should have been caught at parse time */ goto error; } - rad_assert(head || !n); + fr_assert(head || !n); /* * FIXME: This is only required because @@ -1624,7 +1624,7 @@ static VALUE_PAIR *map_list_mod_to_vps(TALLOC_CTX *ctx, vp_list_mod_t const *vlm VALUE_PAIR *head = NULL; fr_cursor_t cursor; - rad_assert(vlm->mod); + fr_assert(vlm->mod); /* * Fast path... @@ -1675,7 +1675,7 @@ static inline void map_list_mod_debug(REQUEST *request, if (!fr_cond_assert(map->lhs != NULL)) return; if (!fr_cond_assert(map->rhs != NULL)) return; - rad_assert(mod || tmpl_is_null(map->rhs)); + fr_assert(mod || tmpl_is_null(map->rhs)); if (vb && (vb->type == FR_TYPE_STRING)) quote = "\""; @@ -1756,7 +1756,7 @@ int map_list_mod_apply(REQUEST *request, vp_list_mod_t const *vlm) fr_cursor_t list; MAP_VERIFY(map); - rad_assert(vlm->mod); + fr_assert(vlm->mod); /* * Print debug information for the mods being applied @@ -1768,11 +1768,11 @@ int map_list_mod_apply(REQUEST *request, vp_list_mod_t const *vlm) MAP_VERIFY(mod); - rad_assert(mod->lhs != NULL); - rad_assert(mod->rhs != NULL); + fr_assert(mod->lhs != NULL); + fr_assert(mod->rhs != NULL); - rad_assert(tmpl_is_attr(mod->lhs) || tmpl_is_list(mod->lhs)); - rad_assert(((mod->op == T_OP_CMP_FALSE) && tmpl_is_null(mod->rhs)) || + fr_assert(tmpl_is_attr(mod->lhs) || tmpl_is_list(mod->lhs)); + fr_assert(((mod->op == T_OP_CMP_FALSE) && tmpl_is_null(mod->rhs)) || tmpl_is_data(mod->rhs)); /* @@ -1798,7 +1798,7 @@ int map_list_mod_apply(REQUEST *request, vp_list_mod_t const *vlm) if (!fr_cond_assert(vp_list)) return -1; parent = radius_list_ctx(context, mod->lhs->tmpl_list); - rad_assert(parent); + fr_assert(parent); /* * The destination is a list (which is a completely different set of operations) @@ -1856,7 +1856,7 @@ int map_list_mod_apply(REQUEST *request, vp_list_mod_t const *vlm) VALUE_PAIR *vp_from; vp_from = map_list_mod_to_vps(parent, vlm); - rad_assert(vp_from); + fr_assert(vp_from); fr_cursor_init(&to, vp_list); fr_cursor_tail(&to); @@ -1872,7 +1872,7 @@ int map_list_mod_apply(REQUEST *request, vp_list_mod_t const *vlm) } } - rad_assert(!mod->next); + fr_assert(!mod->next); /* * Find the destination attribute. We leave with either @@ -1880,7 +1880,7 @@ int map_list_mod_apply(REQUEST *request, vp_list_mod_t const *vlm) * being NULL (no attribute at that index). */ found = tmpl_cursor_init(NULL, &list, request, mod->lhs); - rad_assert(!found || (mod->lhs->tmpl_da == found->da)); + fr_assert(!found || (mod->lhs->tmpl_da == found->da)); /* * The destination is an attribute @@ -2069,7 +2069,7 @@ int map_list_mod_apply(REQUEST *request, vp_list_mod_t const *vlm) goto finish; default: - rad_assert(0); /* Should have been caught be the caller */ + fr_assert(0); /* Should have been caught be the caller */ rcode = -1; goto finish; } @@ -2104,7 +2104,7 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons if (!fr_cond_assert(map->lhs != NULL)) return -1; if (!fr_cond_assert(map->rhs != NULL)) return -1; - rad_assert(tmpl_is_list(map->lhs) || tmpl_is_attr(map->lhs)); + fr_assert(tmpl_is_list(map->lhs) || tmpl_is_attr(map->lhs)); /* * Special case for !*, we don't need to parse RHS as this is a unary operator. @@ -2147,9 +2147,9 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons */ switch (map->rhs->type) { case TMPL_TYPE_XLAT_STRUCT: - rad_assert(tmpl_is_attr(map->lhs)); - rad_assert(map->lhs->tmpl_da); /* We need to know which attribute to create */ - rad_assert(map->rhs->tmpl_xlat != NULL); + fr_assert(tmpl_is_attr(map->lhs)); + fr_assert(map->lhs->tmpl_da); /* We need to know which attribute to create */ + fr_assert(map->rhs->tmpl_xlat != NULL); MEM(n = fr_pair_afrom_da(ctx, map->lhs->tmpl_da)); @@ -2184,8 +2184,8 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons break; case TMPL_TYPE_XLAT: - rad_assert(tmpl_is_attr(map->lhs)); - rad_assert(map->lhs->tmpl_da); /* We need to know which attribute to create */ + fr_assert(tmpl_is_attr(map->lhs)); + fr_assert(map->lhs->tmpl_da); /* We need to know which attribute to create */ MEM(n = fr_pair_afrom_da(ctx, map->lhs->tmpl_da)); @@ -2209,8 +2209,8 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons break; case TMPL_TYPE_UNPARSED: - rad_assert(tmpl_is_attr(map->lhs)); - rad_assert(map->lhs->tmpl_da); /* We need to know which attribute to create */ + fr_assert(tmpl_is_attr(map->lhs)); + fr_assert(map->lhs->tmpl_da); /* We need to know which attribute to create */ MEM(n = fr_pair_afrom_da(ctx, map->lhs->tmpl_da)); @@ -2228,7 +2228,7 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons { fr_cursor_t from; - rad_assert((tmpl_is_attr(map->lhs) && map->lhs->tmpl_da) || + fr_assert((tmpl_is_attr(map->lhs) && map->lhs->tmpl_da) || (tmpl_is_list(map->lhs) && !map->lhs->tmpl_da)); /* @@ -2260,7 +2260,7 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons vp = fr_cursor_remove(&from); /* advances cursor */ talloc_free(vp); - rad_assert((n->vp_type != FR_TYPE_STRING) || (n->vp_strvalue != NULL)); + fr_assert((n->vp_type != FR_TYPE_STRING) || (n->vp_strvalue != NULL)); n->op = map->op; n->tag = map->lhs->tmpl_tag; @@ -2284,8 +2284,8 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons break; case TMPL_TYPE_DATA: - rad_assert(map->lhs->tmpl_da); - rad_assert(tmpl_is_attr(map->lhs)); + fr_assert(map->lhs->tmpl_da); + fr_assert(tmpl_is_attr(map->lhs)); MEM(n = fr_pair_afrom_da(ctx, map->lhs->tmpl_da)); @@ -2322,7 +2322,7 @@ int map_to_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_map_t cons return map_exec_to_vp(ctx, out, request, map); default: - rad_assert(0); /* Should have been caught at parse time */ + fr_assert(0); /* Should have been caught at parse time */ error: fr_pair_list_free(&vp); @@ -2377,8 +2377,8 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t vp_tmpl_t *exp_lhs; MAP_VERIFY(map); - rad_assert(map->lhs != NULL); - rad_assert(map->rhs != NULL); + fr_assert(map->lhs != NULL); + fr_assert(map->rhs != NULL); tmp_ctx = talloc_new(request); @@ -2409,7 +2409,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t slen = tmpl_aexpand(request, &attr_str, request, map->lhs, NULL, NULL); if (slen <= 0) { RPEDEBUG("Left side expansion failed"); - rad_assert(!attr_str); + fr_assert(!attr_str); rcode = -1; goto finish; } @@ -2425,7 +2425,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t rcode = -1; goto finish; } - rad_assert(tmpl_is_attr(exp_lhs) || tmpl_is_list(exp_lhs)); + fr_assert(tmpl_is_attr(exp_lhs) || tmpl_is_list(exp_lhs)); memcpy(&exp_map, map, sizeof(exp_map)); exp_map.lhs = exp_lhs; @@ -2434,7 +2434,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t break; default: - rad_assert(0); + fr_assert(0); break; } @@ -2469,7 +2469,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t } parent = radius_list_ctx(context, map->lhs->tmpl_list); - rad_assert(parent); + fr_assert(parent); /* * The callback should either return -1 to signify operations error, @@ -2480,7 +2480,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t if (!tmpl_is_null(map->rhs)) { rcode = func(parent, &head, request, map, ctx); if (rcode < 0) { - rad_assert(!head); + fr_assert(!head); goto finish; } if (!head) { @@ -2514,7 +2514,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t switch (map->op) { case T_OP_CMP_FALSE: /* We don't need the src VPs (should just be 'ANY') */ - rad_assert(!head); + fr_assert(!head); /* Clear the entire dst list */ fr_pair_list_free(list); @@ -2529,7 +2529,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t /* FALL-THROUGH */ case T_OP_EQ: - rad_assert(tmpl_is_exec(map->rhs)); + fr_assert(tmpl_is_exec(map->rhs)); /* FALL-THROUGH */ case T_OP_ADD: @@ -2559,7 +2559,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t } else { dst = fr_pair_cursor_next_by_da(&dst_list, map->lhs->tmpl_da, map->lhs->tmpl_tag); } - rad_assert(!dst || (map->lhs->tmpl_da == dst->da)); + fr_assert(!dst || (map->lhs->tmpl_da == dst->da)); /* * The destination is an attribute @@ -2573,7 +2573,7 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t */ case T_OP_CMP_FALSE: /* We don't need the src VPs (should just be 'ANY') */ - rad_assert(!head); + fr_assert(!head); if (!dst) goto finish; /* @@ -2756,13 +2756,13 @@ int map_to_request(REQUEST *request, vp_map_t const *map, radius_map_getvalue_t break; default: - rad_assert(0); /* Should have been caught be the caller */ + fr_assert(0); /* Should have been caught be the caller */ rcode = -1; goto finish; } update: - rad_assert(!head); + fr_assert(!head); finish: talloc_free(tmp_ctx); @@ -2851,7 +2851,7 @@ void map_debug_log(REQUEST *request, vp_map_t const *map, VALUE_PAIR const *vp) if (!fr_cond_assert(map->lhs != NULL)) return; if (!fr_cond_assert(map->rhs != NULL)) return; - rad_assert(vp || tmpl_is_null(map->rhs)); + fr_assert(vp || tmpl_is_null(map->rhs)); switch (map->rhs->type) { /* diff --git a/src/lib/server/map.h b/src/lib/server/map.h index 0fba96c515f..adf287b432a 100644 --- a/src/lib/server/map.h +++ b/src/lib/server/map.h @@ -81,7 +81,7 @@ struct vp_list_mod_s { }; #ifndef WITH_VERIFY_PTR -# define MAP_VERIFY(_x) rad_assert((_x)->lhs) +# define MAP_VERIFY(_x) fr_assert((_x)->lhs) #else # define MAP_VERIFY(_x) do { \ TMPL_VERIFY((_x)->lhs); \ diff --git a/src/lib/server/map_proc.c b/src/lib/server/map_proc.c index ef2c23a465d..76c9684f0cb 100644 --- a/src/lib/server/map_proc.c +++ b/src/lib/server/map_proc.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include static rbtree_t *map_proc_root = NULL; @@ -112,7 +112,7 @@ int map_proc_register(void *mod_inst, char const *name, { map_proc_t *proc; - rad_assert(name && name[0]); + fr_assert(name && name[0]); if (!map_proc_root) { map_proc_root = rbtree_talloc_create(NULL, map_proc_cmp, map_proc_t, diff --git a/src/lib/server/map_proc_priv.h b/src/lib/server/map_proc_priv.h index d5d1c730aea..88b6382a5cf 100644 --- a/src/lib/server/map_proc_priv.h +++ b/src/lib/server/map_proc_priv.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/lib/server/module.c b/src/lib/server/module.c index b619ac03b0a..88a6a5e207e 100644 --- a/src/lib/server/module.c +++ b/src/lib/server/module.c @@ -83,7 +83,7 @@ static int cmd_show_module_config(FILE *fp, UNUSED FILE *fp_err, void *ctx, UNUS { module_instance_t *mi = ctx; - rad_assert(mi->dl_inst->conf != NULL); + fr_assert(mi->dl_inst->conf != NULL); (void) cf_section_write(fp, mi->dl_inst->conf, 0); @@ -838,7 +838,7 @@ module_instance_t *module_by_name_and_method(module_method_t *method, rlm_compon for (k = 0; mi->module->method_names[k].name1 != NULL; k++) { methods = &mi->module->method_names[k]; - rad_assert(methods->name1 != CF_IDENT_ANY); /* should have been caught above */ + fr_assert(methods->name1 != CF_IDENT_ANY); /* should have been caught above */ if (strcmp(methods->name1, allowed->name) != 0) continue; @@ -1111,7 +1111,7 @@ module_thread_instance_t *module_thread(module_instance_t *mi) if (!mi) return NULL; - rad_assert(mi->number < talloc_array_length(array)); + fr_assert(mi->number < talloc_array_length(array)); return array[mi->number]; } @@ -1132,7 +1132,7 @@ module_thread_instance_t *module_thread_by_data(void const *data) if (!mi) return NULL; - rad_assert(mi->number < talloc_array_length(array)); + fr_assert(mi->number < talloc_array_length(array)); return array[mi->number]; } @@ -1251,7 +1251,7 @@ static int _module_thread_instantiate(void *instance, void *uctx) } } - rad_assert(mi->number < talloc_array_length(thread_inst_ctx->array)); + fr_assert(mi->number < talloc_array_length(thread_inst_ctx->array)); thread_inst_ctx->array[mi->number] = ti; return 0; @@ -1462,7 +1462,7 @@ static size_t module_instance_name(TALLOC_CTX *ctx, char **out, module_instance_ * ...because recursive code still makes * my head hurt. */ - rad_assert((size_t)(p - (*out)) == (talloc_array_length(*out) - 1)); + fr_assert((size_t)(p - (*out)) == (talloc_array_length(*out) - 1)); return (p - (*out)); @@ -1562,7 +1562,7 @@ module_instance_t *module_bootstrap(module_instance_t const *parent, CONF_SECTIO talloc_free(inst_name); return NULL; } - rad_assert(mi->dl_inst); + fr_assert(mi->dl_inst); mi->name = talloc_typed_strdup(mi, inst_name); talloc_free(inst_name); /* Avoid stealing */ diff --git a/src/lib/server/paircmp.c b/src/lib/server/paircmp.c index c59966fa55b..e6d086f5be2 100644 --- a/src/lib/server/paircmp.c +++ b/src/lib/server/paircmp.c @@ -30,7 +30,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -799,7 +799,7 @@ int paircmp_register(fr_dict_attr_t const *da, fr_dict_attr_t const *from, { paircmp_t *c; - rad_assert(da != NULL); + fr_assert(da != NULL); paircmp_unregister(da, func); diff --git a/src/lib/server/pairmove.c b/src/lib/server/pairmove.c index 21a3e94fcc5..19f474a05af 100644 --- a/src/lib/server/pairmove.c +++ b/src/lib/server/pairmove.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -252,7 +252,7 @@ void radius_pairmove(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR *from, bool d continue; } - rad_assert(0 == 1); /* panic! */ + fr_assert(0 == 1); /* panic! */ } /* @@ -320,7 +320,7 @@ void radius_pairmove(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR *from, bool d */ *last = append; - rad_assert(request->packet != NULL); + fr_assert(request->packet != NULL); talloc_free(to_list); talloc_free(edited); diff --git a/src/lib/server/password.c b/src/lib/server/password.c index 1a5a24beddd..faa9e303dfc 100644 --- a/src/lib/server/password.c +++ b/src/lib/server/password.c @@ -634,7 +634,7 @@ static VALUE_PAIR *password_process_header(TALLOC_CTX *ctx, REQUEST *request, VA * Ensure this is only ever called with a * string type attribute. */ - rad_assert(known_good->da->type == FR_TYPE_STRING); + fr_assert(known_good->da->type == FR_TYPE_STRING); p = known_good->vp_strvalue; end = p + known_good->vp_length; diff --git a/src/lib/server/pool.c b/src/lib/server/pool.c index 4d0f1e1803e..e92942255a2 100644 --- a/src/lib/server/pool.c +++ b/src/lib/server/pool.c @@ -30,7 +30,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -194,17 +194,17 @@ static int8_t last_released_cmp(void const *one, void const *two) static void connection_unlink(fr_pool_t *pool, fr_pool_connection_t *this) { if (this->prev) { - rad_assert(pool->head != this); + fr_assert(pool->head != this); this->prev->next = this->next; } else { - rad_assert(pool->head == this); + fr_assert(pool->head == this); pool->head = this->next; } if (this->next) { - rad_assert(pool->tail != this); + fr_assert(pool->tail != this); this->next->prev = this->prev; } else { - rad_assert(pool->tail == this); + fr_assert(pool->tail == this); pool->tail = this->prev; } @@ -220,10 +220,10 @@ static void connection_unlink(fr_pool_t *pool, fr_pool_connection_t *this) */ static void connection_link_head(fr_pool_t *pool, fr_pool_connection_t *this) { - rad_assert(pool != NULL); - rad_assert(this != NULL); - rad_assert(pool->head != this); - rad_assert(pool->tail != this); + fr_assert(pool != NULL); + fr_assert(this != NULL); + fr_assert(pool->head != this); + fr_assert(pool->tail != this); if (pool->head) { pool->head->prev = this; @@ -233,10 +233,10 @@ static void connection_link_head(fr_pool_t *pool, fr_pool_connection_t *this) this->prev = NULL; pool->head = this; if (!pool->tail) { - rad_assert(this->next == NULL); + fr_assert(this->next == NULL); pool->tail = this; } else { - rad_assert(this->next != NULL); + fr_assert(this->next != NULL); } } @@ -250,8 +250,8 @@ static inline void fr_pool_trigger_exec(fr_pool_t *pool, REQUEST *request, char { char name[128]; - rad_assert(pool != NULL); - rad_assert(event != NULL); + fr_assert(pool != NULL); + fr_assert(event != NULL); if (!pool->triggers_enabled) return; @@ -293,10 +293,10 @@ static fr_pool_connection_t *connection_find(fr_pool_t *pool, void *conn) pthread_t pthread_id; pthread_id = pthread_self(); - rad_assert(pthread_equal(this->pthread_id, pthread_id) != 0); + fr_assert(pthread_equal(this->pthread_id, pthread_id) != 0); #endif - rad_assert(this->in_use == true); + fr_assert(this->in_use == true); /* coverity[missing_unlock] */ return this; } @@ -332,7 +332,7 @@ static fr_pool_connection_t *connection_spawn(fr_pool_t *pool, REQUEST *request, fr_pool_connection_t *this; void *conn; - rad_assert(pool != NULL); + fr_assert(pool != NULL); /* * If we have NO connections, and we've previously failed @@ -342,7 +342,7 @@ static fr_pool_connection_t *connection_spawn(fr_pool_t *pool, REQUEST *request, if ((pool->state.num == 0) && pool->state.pending && pool->state.last_failed) return NULL; pthread_mutex_lock(&pool->mutex); - rad_assert(pool->state.num <= pool->max); + fr_assert(pool->state.num <= pool->max); /* * Don't spawn too many connections at the same time. @@ -491,7 +491,7 @@ static fr_pool_connection_t *connection_spawn(fr_pool_t *pool, REQUEST *request, pool->state.num++; - rad_assert(pool->state.pending > 0); + fr_assert(pool->state.pending > 0); pool->state.pending--; /* @@ -541,12 +541,12 @@ static void connection_close_internal(fr_pool_t *pool, REQUEST *request, fr_pool if (this->in_use) { #ifdef PTHREAD_DEBUG pthread_t pthread_id = pthread_self(); - rad_assert(pthread_equal(this->pthread_id, pthread_id) != 0); + fr_assert(pthread_equal(this->pthread_id, pthread_id) != 0); #endif this->in_use = false; - rad_assert(pool->state.active != 0); + fr_assert(pool->state.active != 0); pool->state.active--; } else { @@ -560,7 +560,7 @@ static void connection_close_internal(fr_pool_t *pool, REQUEST *request, fr_pool connection_unlink(pool, this); - rad_assert(pool->state.num > 0); + fr_assert(pool->state.num > 0); pool->state.num--; talloc_free(this); } @@ -583,8 +583,8 @@ static void connection_close_internal(fr_pool_t *pool, REQUEST *request, fr_pool */ static int connection_manage(fr_pool_t *pool, REQUEST *request, fr_pool_connection_t *this, time_t now) { - rad_assert(pool != NULL); - rad_assert(this != NULL); + fr_assert(pool != NULL); + fr_assert(this != NULL); /* * Don't terminated in-use connections @@ -1328,9 +1328,9 @@ void fr_pool_free(fr_pool_t *pool) fr_pool_trigger_exec(pool, NULL, "stop"); - rad_assert(pool->head == NULL); - rad_assert(pool->tail == NULL); - rad_assert(pool->state.num == 0); + fr_assert(pool->head == NULL); + fr_assert(pool->tail == NULL); + fr_assert(pool->state.num == 0); pthread_mutex_destroy(&pool->mutex); pthread_cond_destroy(&pool->done_spawn); @@ -1428,7 +1428,7 @@ void fr_pool_connection_release(fr_pool_t *pool, REQUEST *request, void *conn) */ fr_heap_insert(pool->heap, this); - rad_assert(pool->state.active != 0); + fr_assert(pool->state.active != 0); pool->state.active--; ROPTIONAL(RDEBUG2, DEBUG2, "Released connection (%" PRIu64 ")", this->number); diff --git a/src/lib/server/rad_assert.h b/src/lib/server/rad_assert.h index d26185ece33..c21208b7976 100644 --- a/src/lib/server/rad_assert.h +++ b/src/lib/server/rad_assert.h @@ -18,12 +18,12 @@ /** * $Id$ * - * @file lib/server/rad_assert.h + * @file lib/server/fr_assert.h * @brief Debug assertions, with logging. * * @copyright 2000,2001,2006 The FreeRADIUS server project */ -RCSIDH(rad_assert_h, "$Id$") +RCSIDH(fr_assert_h, "$Id$") #include #include @@ -33,22 +33,15 @@ extern "C" { #endif #ifdef NDEBUG -# define rad_assert(_expr) +# define fr_assert(_expr) #elif !defined(__clang_analyzer__) -# define rad_assert(_expr) ((void) ((_expr) ? (void) 0 : (void) fr_assert_exit(__FILE__, __LINE__, #_expr))) +# define fr_assert(_expr) ((void) ((_expr) ? (void) 0 : (void) fr_assert_exit(__FILE__, __LINE__, #_expr))) #else # include -# define rad_assert assert +# define fr_assert assert #endif -/** For systems with an old version libc, define static_assert. - * - */ -#ifndef static_assert -# define static_assert _Static_assert -# else -# include -#endif + #ifdef __cplusplus } diff --git a/src/lib/server/regex.c b/src/lib/server/regex.c index b5c7bdd918e..b7005148ac7 100644 --- a/src/lib/server/regex.c +++ b/src/lib/server/regex.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include #ifdef HAVE_REGEX @@ -71,8 +71,8 @@ void regex_sub_to_request(REQUEST *request, regex_t **preg, fr_regmatch_t **regm if (!regmatch || ((*regmatch)->used == 0)) return; - rad_assert(preg && *preg); - rad_assert(regmatch); + fr_assert(preg && *preg); + fr_assert(regmatch); DEBUG4("Adding %zu matches", (*regmatch)->used); @@ -428,8 +428,8 @@ int regex_request_to_sub(TALLOC_CTX *ctx, char **out, REQUEST *request, uint32_t /* * Sanity checks on the offsets */ - rad_assert(match_data[num].rm_eo <= (regoff_t)talloc_array_length(rc->regmatch->subject)); - rad_assert(match_data[num].rm_so <= (regoff_t)talloc_array_length(rc->regmatch->subject)); + fr_assert(match_data[num].rm_eo <= (regoff_t)talloc_array_length(rc->regmatch->subject)); + fr_assert(match_data[num].rm_so <= (regoff_t)talloc_array_length(rc->regmatch->subject)); start = rc->regmatch->subject + match_data[num].rm_so; len = match_data[num].rm_eo - match_data[num].rm_so; diff --git a/src/lib/server/request.c b/src/lib/server/request.c index 0f52a46ebdc..bd1643931d7 100644 --- a/src/lib/server/request.c +++ b/src/lib/server/request.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include -#include +#include #include /** The thread local free list @@ -101,7 +101,7 @@ static void request_init(char const *file, int line, REQUEST *request) */ static int _request_free(REQUEST *request) { - rad_assert(!request->ev); + fr_assert(!request->ev); /* * Reinsert into the free list if it's not already @@ -128,7 +128,7 @@ static int _request_free(REQUEST *request) */ state_ctx = request->state_ctx; if (request->state_ctx) { - rad_assert(!request->parent || (request->state_ctx != request->parent->state_ctx)); + fr_assert(!request->parent || (request->state_ctx != request->parent->state_ctx)); talloc_free_children(request->state_ctx); } free_list = request_free_list; @@ -182,7 +182,7 @@ really_free: * call fr_state_store_in_parent() */ if (request->state_ctx) { - rad_assert(!request->parent || (request->state_ctx != request->parent->state_ctx)); + fr_assert(!request->parent || (request->state_ctx != request->parent->state_ctx)); talloc_free(request->state_ctx); } @@ -457,7 +457,7 @@ int request_detach(REQUEST *fake, bool will_free) { REQUEST *request = fake->parent; - rad_assert(request != NULL); + fr_assert(request != NULL); /* * Unlink the child from the parent. @@ -473,7 +473,7 @@ int request_detach(REQUEST *fake, bool will_free) fake->parent = NULL; while (!request->backlog) { - rad_assert(request->parent != NULL); + fr_assert(request->parent != NULL); request = request->parent; } @@ -504,7 +504,7 @@ static void packet_verify(char const *file, int line, REQUEST const *request, RA fr_log_talloc_report(packet); if (parent) fr_log_talloc_report(parent); - rad_assert(0); + fr_assert(0); } PACKET_VERIFY(packet); @@ -528,7 +528,7 @@ void request_verify(char const *file, int line, REQUEST const *request) (void) talloc_get_type_abort_const(request, REQUEST); - rad_assert(request->magic == REQUEST_MAGIC); + fr_assert(request->magic == REQUEST_MAGIC); if (talloc_get_size(request) != sizeof(REQUEST)) { fprintf(stderr, "CONSISTENCY CHECK FAILED %s[%i]: expected REQUEST size of %zu bytes, got %zu bytes", @@ -539,30 +539,30 @@ void request_verify(char const *file, int line, REQUEST const *request) fr_pair_list_verify(file, line, request, request->control); fr_pair_list_verify(file, line, request->state_ctx, request->state); - rad_assert(request->server_cs != NULL); + fr_assert(request->server_cs != NULL); if (request->packet) { packet_verify(file, line, request, request->packet, "request"); if ((request->packet->code == FR_CODE_ACCESS_REQUEST) && (request->reply && !request->reply->code)) { - rad_assert(request->state_ctx != NULL); + fr_assert(request->state_ctx != NULL); } } if (request->reply) packet_verify(file, line, request, request->reply, "reply"); if (request->async) { (void) talloc_get_type_abort(request->async, fr_async_t); - rad_assert(talloc_parent(request->async) == request); + fr_assert(talloc_parent(request->async) == request); } while ((rd = fr_dlist_next(&request->data, rd))) { (void) talloc_get_type_abort(rd, request_data_t); if (request_data_persistable(rd)) { - rad_assert(request->state_ctx); - rad_assert(talloc_parent(rd) == request->state_ctx); + fr_assert(request->state_ctx); + fr_assert(talloc_parent(rd) == request->state_ctx); } else { - rad_assert(talloc_parent(rd) == request); + fr_assert(talloc_parent(rd) == request); } } } diff --git a/src/lib/server/request.h b/src/lib/server/request.h index 8b69b0b56b9..f62eb3e117d 100644 --- a/src/lib/server/request.h +++ b/src/lib/server/request.h @@ -166,7 +166,7 @@ struct fr_request_s { * the pointer must not be NULL when these various macros are used * so we can add some sneaky asserts. */ -# define REQUEST_VERIFY(_x) rad_assert(_x) +# define REQUEST_VERIFY(_x) fr_assert(_x) #endif diff --git a/src/lib/server/request_data.c b/src/lib/server/request_data.c index 120bddaad33..593d38d8deb 100644 --- a/src/lib/server/request_data.c +++ b/src/lib/server/request_data.c @@ -24,7 +24,7 @@ */ RCSID("$Id$") -#include +#include #include /** Per-request opaque data, added by modules @@ -194,12 +194,12 @@ int _request_data_add(REQUEST *request, void const *unique_ptr, int unique_int, /* * Request must have a state ctx */ - rad_assert(request); - rad_assert(!persist || request->state_ctx); - rad_assert(!persist || + fr_assert(request); + fr_assert(!persist || request->state_ctx); + fr_assert(!persist || (talloc_parent(opaque) == request->state_ctx) || (talloc_parent(opaque) == talloc_null_ctx())); - rad_assert(!free_on_parent || (talloc_parent(opaque) != request)); + fr_assert(!free_on_parent || (talloc_parent(opaque) != request)); #ifndef TALLOC_GET_TYPE_ABORT_NOOP if (type) opaque = _talloc_get_type_abort(opaque, type, __location__); @@ -243,7 +243,7 @@ int _request_data_add(REQUEST *request, void const *unique_ptr, int unique_int, */ if (!rd) { if (persist) { - rad_assert(request->state_ctx); + fr_assert(request->state_ctx); rd = request_data_alloc(request->state_ctx); } else { rd = request_data_alloc(request); diff --git a/src/lib/server/snmp.c b/src/lib/server/snmp.c index 6feb84c2bf3..c7ca0cad89e 100644 --- a/src/lib/server/snmp.c +++ b/src/lib/server/snmp.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -103,7 +103,7 @@ static int reset_state = FR_RADIUS_AUTH_SERV_CONFIG_RESET_VALUE_RUNNING; static int snmp_value_serv_ident_get(TALLOC_CTX *ctx, fr_value_box_t *out, NDEBUG_UNUSED fr_snmp_map_t const *map, UNUSED void *snmp_ctx) { - rad_assert(map->da->type == FR_TYPE_STRING); + fr_assert(map->da->type == FR_TYPE_STRING); out->vb_strvalue = talloc_typed_asprintf(ctx, "FreeRADIUS %s", radiusd_version_short); out->datum.length = talloc_array_length(out->vb_strvalue) - 1; @@ -116,7 +116,7 @@ static int snmp_value_uptime_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, ND fr_time_t now; fr_time_delta_t delta; - rad_assert(map->da->type == FR_TYPE_UINT32); + fr_assert(map->da->type == FR_TYPE_UINT32); now = fr_time(); delta = now - start_time; @@ -135,7 +135,7 @@ static int snmp_config_reset_time_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *ou fr_time_t now; fr_time_delta_t delta; - rad_assert(map->da->type == FR_TYPE_UINT32); + fr_assert(map->da->type == FR_TYPE_UINT32); now = fr_time(); delta = now - reset_time; @@ -151,7 +151,7 @@ static int snmp_config_reset_time_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *ou static int snmp_config_reset_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, NDEBUG_UNUSED fr_snmp_map_t const *map, UNUSED void *snmp_ctx) { - rad_assert(map->da->type == FR_TYPE_UINT32); + fr_assert(map->da->type == FR_TYPE_UINT32); out->vb_uint32 = reset_state; @@ -160,7 +160,7 @@ static int snmp_config_reset_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, ND static int snmp_config_reset_set(NDEBUG_UNUSED fr_snmp_map_t const *map, UNUSED void *snmp_ctx, fr_value_box_t *in) { - rad_assert(map->da->type == FR_TYPE_UINT32); + fr_assert(map->da->type == FR_TYPE_UINT32); switch (in->vb_uint32) { case FR_RADIUS_AUTH_SERV_CONFIG_RESET_VALUE_RESET: @@ -177,7 +177,7 @@ static int snmp_config_reset_set(NDEBUG_UNUSED fr_snmp_map_t const *map, UNUSED static int snmp_auth_stats_offset_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, fr_snmp_map_t const *map, UNUSED void *snmp_ctx) { - rad_assert(map->da->type == FR_TYPE_UINT32); + fr_assert(map->da->type == FR_TYPE_UINT32); out->vb_uint32 = *(uint32_t *)((uint8_t *)(&radius_auth_stats) + map->offset); @@ -190,7 +190,7 @@ static int snmp_client_index(UNUSED TALLOC_CTX *ctx, void **snmp_ctx_out, { RADCLIENT *client; - rad_assert(!snmp_ctx_in); + fr_assert(!snmp_ctx_in); client = client_findbynumber(NULL, index_num - 1); /* Clients indexed from 0 */ if (!client) return 1; /* No more clients */ @@ -205,7 +205,7 @@ static int snmp_client_index_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, { RADCLIENT *client = snmp_ctx; - rad_assert(client); + fr_assert(client); out->vb_uint32 = client->number + 1; /* Clients indexed from 0 */ @@ -217,8 +217,8 @@ static int snmp_client_ipv4addr_get(UNUSED TALLOC_CTX *ctx, fr_value_box_t *out, { RADCLIENT *client = snmp_ctx; - rad_assert(client); - rad_assert(map->da->type == FR_TYPE_IPV4_ADDR); + fr_assert(client); + fr_assert(map->da->type == FR_TYPE_IPV4_ADDR); /* * The old SNMP MIB only allowed access @@ -239,8 +239,8 @@ static int snmp_client_id_get(TALLOC_CTX *ctx, fr_value_box_t *out, RADCLIENT *client = snmp_ctx; size_t len; - rad_assert(client); - rad_assert(map->da->type == FR_TYPE_STRING); + fr_assert(client); + fr_assert(map->da->type == FR_TYPE_STRING); len = talloc_array_length(client->longname) - 1; @@ -255,8 +255,8 @@ static int snmp_auth_client_stats_offset_get(UNUSED TALLOC_CTX *ctx, fr_value_bo { RADCLIENT *client = snmp_ctx; - rad_assert(client); - rad_assert(map->da->type == FR_TYPE_UINT32); + fr_assert(client); + fr_assert(map->da->type == FR_TYPE_UINT32); out->vb_uint32 = *(uint32_t *)((uint8_t *)(&client->auth) + map->offset); @@ -474,13 +474,13 @@ static fr_snmp_map_t const *snmp_map_search(fr_snmp_map_t const map[], fr_dict_a { fr_snmp_map_t const *p = &map[1], *q = map[0].last, *m; - rad_assert(p <= q); + fr_assert(p <= q); /* * Fast path... */ if (p == q) { - rad_assert(p->da); + fr_assert(p->da); if (p->da->attr == da->attr) return p; return NULL; @@ -850,7 +850,7 @@ static ssize_t snmp_process_leaf(fr_cursor_t *out, REQUEST *request, return 0; default: - rad_assert(0); + fr_assert(0); goto error; } } @@ -876,7 +876,7 @@ static ssize_t snmp_process(fr_cursor_t *out, REQUEST *request, fr_cursor_t *cursor, fr_snmp_map_t const *map, void *snmp_ctx, unsigned int snmp_op) { - rad_assert(map); + fr_assert(map); FR_PROTO_STACK_PRINT(da_stack, depth); @@ -998,8 +998,8 @@ int fr_snmp_process(REQUEST *request) * Any attribute returned by fr_cursor_next_by_ancestor * should have the SNMP root attribute as an ancestor. */ - rad_assert(da_stack.da[depth]); - rad_assert(da_stack.da[depth] == attr_snmp_root); + fr_assert(da_stack.da[depth]); + fr_assert(da_stack.da[depth] == attr_snmp_root); /* * Operator attribute acts as a request delimiter @@ -1065,7 +1065,7 @@ static int _fr_snmp_init(fr_snmp_map_t map[]) if (map[i].type == FR_FREERADIUS_SNMP_TYPE_OBJECT) { int ret; - rad_assert(map[i].child); + fr_assert(map[i].child); map[i].da = fr_dict_attr_by_name(dict_snmp, map[i].name); if (!map[i].da) { diff --git a/src/lib/server/state.c b/src/lib/server/state.c index bc85ac2aafe..c1c3ff50ed2 100644 --- a/src/lib/server/state.c +++ b/src/lib/server/state.c @@ -48,7 +48,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -263,7 +263,7 @@ static int _state_entry_free(fr_state_entry_t *entry) for (vp = fr_cursor_init(&cursor, &entry->vps); vp; vp = fr_cursor_next(&cursor)) { - rad_assert(entry->ctx == talloc_parent(vp)); + fr_assert(entry->ctx == talloc_parent(vp)); } } @@ -609,7 +609,7 @@ void fr_state_to_request(fr_state_tree_t *state, REQUEST *request) TALLOC_CTX *old_ctx = NULL; VALUE_PAIR *vp; - rad_assert(request->state == NULL); + fr_assert(request->state == NULL); /* * No State, don't do anything. @@ -632,7 +632,7 @@ void fr_state_to_request(fr_state_tree_t *state, REQUEST *request) } if (request->state_ctx) old_ctx = request->state_ctx; /* Store for later freeing */ - rad_assert(entry->ctx); + fr_assert(entry->ctx); request->seq_start = entry->seq_start; request->state_ctx = entry->ctx; @@ -698,8 +698,8 @@ int fr_request_to_state(fr_state_tree_t *state, REQUEST *request) return -1; } - rad_assert(entry->ctx == NULL); - rad_assert(request->state_ctx); + fr_assert(entry->ctx == NULL); + fr_assert(request->state_ctx); entry->seq_start = request->seq_start; entry->ctx = request->state_ctx; diff --git a/src/lib/server/stats.c b/src/lib/server/stats.c index 093993cba20..a0c94a70104 100644 --- a/src/lib/server/stats.c +++ b/src/lib/server/stats.c @@ -24,7 +24,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -503,8 +503,8 @@ void request_stats_reply(REQUEST *request) /* * Statistics are available ONLY on a "status" port. */ - rad_assert(request->packet->code == FR_CODE_STATUS_SERVER); - rad_assert(request->listener->type == RAD_LISTEN_NONE); + fr_assert(request->packet->code == FR_CODE_STATUS_SERVER); + fr_assert(request->listener->type == RAD_LISTEN_NONE); flag = fr_pair_find_by_num(request->packet->vps, VENDORPEC_FREERADIUS, FR_FREERADIUS_STATISTICS_TYPE, TAG_ANY); if (!flag || (flag->vp_uint32 == 0)) return; @@ -815,7 +815,7 @@ void radius_stats_ema(fr_stats_ema_t *ema, fr_time_t start, fr_time_t end) #endif if (ema->window == 0) return; - rad_assert(start <= end); + fr_assert(start <= end); /* * Initialize it. diff --git a/src/lib/server/tmpl.c b/src/lib/server/tmpl.c index f9a93099154..2ffe6b62b4f 100644 --- a/src/lib/server/tmpl.c +++ b/src/lib/server/tmpl.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include -#include +#include #include @@ -120,7 +120,7 @@ size_t radius_list_name(pair_list_t *out, char const *name, pair_list_t def) char const *q; /* This should never be a NULL pointer */ - rad_assert(name); + fr_assert(name); /* * Try and determine the end of the token @@ -407,7 +407,7 @@ int radius_request(REQUEST **context, request_ref_t name) case REQUEST_UNKNOWN: default: - rad_assert(0); + fr_assert(0); return -1; } @@ -437,9 +437,9 @@ int radius_request(REQUEST **context, request_ref_t name) */ vp_tmpl_t *tmpl_init(vp_tmpl_t *vpt, tmpl_type_t type, char const *name, ssize_t len, FR_TOKEN quote) { - rad_assert(vpt); - rad_assert(type != TMPL_TYPE_UNKNOWN); - rad_assert(type <= TMPL_TYPE_NULL); + fr_assert(vpt); + fr_assert(type != TMPL_TYPE_UNKNOWN); + fr_assert(type <= TMPL_TYPE_NULL); memset(vpt, 0, sizeof(vp_tmpl_t)); vpt->type = type; @@ -468,8 +468,8 @@ vp_tmpl_t *tmpl_alloc(TALLOC_CTX *ctx, tmpl_type_t type, char const *name, ssize { vp_tmpl_t *vpt; - rad_assert(type != TMPL_TYPE_UNKNOWN); - rad_assert(type <= TMPL_TYPE_NULL); + fr_assert(type != TMPL_TYPE_UNKNOWN); + fr_assert(type <= TMPL_TYPE_NULL); #ifndef HAVE_REGEX if ((type == TMPL_TYPE_REGEX) || (type == TMPL_TYPE_REGEX_STRUCT)) { @@ -516,7 +516,7 @@ void tmpl_from_da(vp_tmpl_t *vpt, fr_dict_attr_t const *da, int8_t tag, int num, { static char const name[] = "internal"; - rad_assert(da); + fr_assert(da); tmpl_init(vpt, TMPL_TYPE_ATTR, name, sizeof(name), T_BARE_WORD); vpt->tmpl_da = da; @@ -1248,7 +1248,7 @@ ssize_t tmpl_afrom_str(TALLOC_CTX *ctx, vp_tmpl_t **out, break; default: - rad_assert(0); + fr_assert(0); return 0; /* 0 is an error here too */ } @@ -1256,7 +1256,7 @@ ssize_t tmpl_afrom_str(TALLOC_CTX *ctx, vp_tmpl_t **out, vpt->quote = type; - rad_assert(slen >= 0); + fr_assert(slen >= 0); TMPL_VERIFY(vpt); *out = vpt; @@ -1299,8 +1299,8 @@ int tmpl_cast_in_place(vp_tmpl_t *vpt, fr_type_t type, fr_dict_attr_t const *enu { TMPL_VERIFY(vpt); - rad_assert(vpt != NULL); - rad_assert(tmpl_is_unparsed(vpt) || tmpl_is_data(vpt)); + fr_assert(vpt != NULL); + fr_assert(tmpl_is_unparsed(vpt) || tmpl_is_data(vpt)); switch (vpt->type) { case TMPL_TYPE_UNPARSED: @@ -1340,7 +1340,7 @@ int tmpl_cast_in_place(vp_tmpl_t *vpt, fr_type_t type, fr_dict_attr_t const *enu break; default: - rad_assert(0); + fr_assert(0); } TMPL_VERIFY(vpt); @@ -1356,11 +1356,11 @@ int tmpl_cast_in_place(vp_tmpl_t *vpt, fr_type_t type, fr_dict_attr_t const *enu */ void tmpl_cast_in_place_str(vp_tmpl_t *vpt) { - rad_assert(vpt != NULL); - rad_assert(tmpl_is_unparsed(vpt)); + fr_assert(vpt != NULL); + fr_assert(tmpl_is_unparsed(vpt)); vpt->tmpl_value.vb_strvalue = talloc_typed_strdup(vpt, vpt->name); - rad_assert(vpt->tmpl_value.vb_strvalue != NULL); + fr_assert(vpt->tmpl_value.vb_strvalue != NULL); vpt->type = TMPL_TYPE_DATA; vpt->tmpl_value_type = FR_TYPE_STRING; @@ -1399,7 +1399,7 @@ int tmpl_cast_to_vp(VALUE_PAIR **out, REQUEST *request, MEM(vp = fr_pair_afrom_da(request, cast)); if (tmpl_is_data(vpt)) { VP_VERIFY(vp); - rad_assert(vp->vp_type == vpt->tmpl_value_type); + fr_assert(vp->vp_type == vpt->tmpl_value_type); fr_value_box_copy(vp, &vp->data, &vpt->tmpl_value); *out = vp; @@ -1584,8 +1584,8 @@ ssize_t _tmpl_to_type(void *out, TMPL_VERIFY(vpt); - rad_assert(!tmpl_is_list(vpt)); - rad_assert(!buff || (bufflen >= 2)); + fr_assert(!tmpl_is_list(vpt)); + fr_assert(!buff || (bufflen >= 2)); memset(&value_to_cast, 0, sizeof(value_to_cast)); memset(&value_from_cast, 0, sizeof(value_from_cast)); @@ -1691,7 +1691,7 @@ ssize_t _tmpl_to_type(void *out, case TMPL_TYPE_REGEX: case TMPL_TYPE_ATTR_UNDEFINED: case TMPL_TYPE_REGEX_STRUCT: - rad_assert(0); + fr_assert(0); return -1; } @@ -1905,7 +1905,7 @@ ssize_t _tmpl_to_atype(TALLOC_CTX *ctx, void *out, value.datum.length = strlen(value.vb_strvalue); value.type = FR_TYPE_STRING; MEM(value.vb_strvalue = talloc_realloc(tmp_ctx, value.datum.ptr, char, value.datum.length + 1)); /* Trim */ - rad_assert(value.vb_strvalue[value.datum.length] == '\0'); + fr_assert(value.vb_strvalue[value.datum.length] == '\0'); to_cast = &value; break; @@ -1980,13 +1980,13 @@ ssize_t _tmpl_to_atype(TALLOC_CTX *ctx, void *out, return -2; } - rad_assert(vp); + fr_assert(vp); to_cast = &vp->data; switch (to_cast->type) { case FR_TYPE_STRING: case FR_TYPE_OCTETS: - rad_assert(to_cast->datum.ptr); + fr_assert(to_cast->datum.ptr); needs_dup = true; break; @@ -2003,7 +2003,7 @@ ssize_t _tmpl_to_atype(TALLOC_CTX *ctx, void *out, switch (to_cast->type) { case FR_TYPE_STRING: case FR_TYPE_OCTETS: - rad_assert(to_cast->datum.ptr); + fr_assert(to_cast->datum.ptr); needs_dup = true; break; @@ -2022,7 +2022,7 @@ ssize_t _tmpl_to_atype(TALLOC_CTX *ctx, void *out, case TMPL_TYPE_REGEX: case TMPL_TYPE_ATTR_UNDEFINED: case TMPL_TYPE_REGEX_STRUCT: - rad_assert(0); + fr_assert(0); goto error; } @@ -2400,7 +2400,7 @@ static void *_tmpl_cursor_next(void **prev, void *curr, void *ctx) } default: - rad_assert(0); + fr_assert(0); } return NULL; @@ -2431,7 +2431,7 @@ VALUE_PAIR *tmpl_cursor_init(int *err, fr_cursor_t *cursor, REQUEST *request, vp TMPL_VERIFY(vpt); - rad_assert(tmpl_is_attr(vpt) || tmpl_is_list(vpt)); + fr_assert(tmpl_is_attr(vpt) || tmpl_is_list(vpt)); if (err) *err = 0; @@ -2493,7 +2493,7 @@ int tmpl_copy_vps(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, vp_tmpl_t int err; - rad_assert(tmpl_is_attr(vpt) || tmpl_is_list(vpt)); + fr_assert(tmpl_is_attr(vpt) || tmpl_is_list(vpt)); *out = NULL; @@ -2562,7 +2562,7 @@ int tmpl_find_or_add_vp(VALUE_PAIR **out, REQUEST *request, vp_tmpl_t const *vpt int err; TMPL_VERIFY(vpt); - rad_assert(tmpl_is_attr(vpt)); + fr_assert(tmpl_is_attr(vpt)); *out = NULL; @@ -2622,7 +2622,7 @@ static uint8_t const *not_zeroed(uint8_t const *ptr, size_t len) */ void tmpl_verify(char const *file, int line, vp_tmpl_t const *vpt) { - rad_assert(vpt); + fr_assert(vpt); if (tmpl_is_unknown(vpt)) { FR_FAULT_LOG("CONSISTENCY CHECK FAILED %s[%u]: vp_tmpl_t type was " @@ -2702,7 +2702,7 @@ void tmpl_verify(char const *file, int line, vp_tmpl_t const *vpt) break; case TMPL_TYPE_ATTR_UNDEFINED: - rad_assert(vpt->tmpl_da == NULL); + fr_assert(vpt->tmpl_da == NULL); break; case TMPL_TYPE_ATTR: diff --git a/src/lib/server/trigger.c b/src/lib/server/trigger.c index 343640c23b7..2f9e0955e6c 100644 --- a/src/lib/server/trigger.c +++ b/src/lib/server/trigger.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include /** Whether triggers are enabled globally * diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c index 7f70756eac3..24b00d105d6 100644 --- a/src/lib/server/trunk.c +++ b/src/lib/server/trunk.c @@ -583,7 +583,7 @@ do { \ */ #define REQUEST_EXTRACT_PARTIAL(_treq) \ do { \ - rad_assert((_treq)->pub.tconn->partial == treq); \ + fr_assert((_treq)->pub.tconn->partial == treq); \ tconn->partial = NULL; \ } while (0) @@ -602,7 +602,7 @@ do { \ */ #define REQUEST_EXTRACT_CANCEL_PARTIAL(_treq) \ do { \ - rad_assert((_treq)->pub.tconn->cancel_partial == treq); \ + fr_assert((_treq)->pub.tconn->cancel_partial == treq); \ tconn->cancel_partial = NULL; \ } while (0) @@ -673,7 +673,7 @@ static int8_t _trunk_request_prioritise(void const *a, void const *b) fr_trunk_request_t const *treq_a = talloc_get_type_abort_const(a, fr_trunk_request_t); fr_trunk_request_t const *treq_b = talloc_get_type_abort_const(b, fr_trunk_request_t); - rad_assert(treq_a->pub.trunk == treq_b->pub.trunk); + fr_assert(treq_a->pub.trunk == treq_b->pub.trunk); return treq_a->pub.trunk->funcs.request_prioritise(treq_a->pub.preq, treq_b->pub.preq); } @@ -728,7 +728,7 @@ static void trunk_request_remove_from_conn(fr_trunk_request_t *treq) break; default: - rad_assert(0); + fr_assert(0); break; } @@ -871,17 +871,17 @@ static void trunk_request_enter_pending(fr_trunk_request_t *treq, fr_trunk_conne { fr_trunk_t *trunk = treq->pub.trunk; - rad_assert(tconn->pub.trunk == trunk); - rad_assert(IS_SERVICEABLE(tconn)); + fr_assert(tconn->pub.trunk == trunk); + fr_assert(IS_SERVICEABLE(tconn)); switch (treq->pub.state) { case FR_TRUNK_REQUEST_STATE_INIT: case FR_TRUNK_REQUEST_STATE_UNASSIGNED: - rad_assert(!treq->pub.tconn); + fr_assert(!treq->pub.tconn); break; case FR_TRUNK_REQUEST_STATE_BACKLOG: - rad_assert(!treq->pub.tconn); + fr_assert(!treq->pub.tconn); REQUEST_EXTRACT_BACKLOG(treq); break; @@ -942,7 +942,7 @@ static void trunk_request_enter_partial(fr_trunk_request_t *treq) REQUEST_BAD_STATE_TRANSITION(FR_TRUNK_REQUEST_STATE_PARTIAL); } - rad_assert(!tconn->partial); + fr_assert(!tconn->partial); tconn->partial = treq; REQUEST_STATE_TRANSITION(FR_TRUNK_REQUEST_STATE_PARTIAL); @@ -1079,8 +1079,8 @@ static void trunk_request_enter_cancel_partial(fr_trunk_request_t *treq) fr_trunk_t *trunk = treq->pub.trunk; if (!fr_cond_assert(!tconn || (tconn->pub.trunk == trunk))) return; - rad_assert(trunk->funcs.request_cancel_mux); - rad_assert(treq->cancel_reason == FR_TRUNK_CANCEL_REASON_SIGNAL); + fr_assert(trunk->funcs.request_cancel_mux); + fr_assert(treq->cancel_reason == FR_TRUNK_CANCEL_REASON_SIGNAL); switch (treq->pub.state) { case FR_TRUNK_REQUEST_STATE_CANCEL: /* The only valid state cancel_sent can be reached from */ @@ -1092,7 +1092,7 @@ static void trunk_request_enter_cancel_partial(fr_trunk_request_t *treq) } REQUEST_STATE_TRANSITION(FR_TRUNK_REQUEST_STATE_CANCEL_PARTIAL); - rad_assert(!tconn->partial); + fr_assert(!tconn->partial); tconn->cancel_partial = treq; } @@ -1114,8 +1114,8 @@ static void trunk_request_enter_cancel_sent(fr_trunk_request_t *treq) fr_trunk_t *trunk = treq->pub.trunk; if (!fr_cond_assert(!tconn || (tconn->pub.trunk == trunk))) return; - rad_assert(trunk->funcs.request_cancel_mux); - rad_assert(treq->cancel_reason == FR_TRUNK_CANCEL_REASON_SIGNAL); + fr_assert(trunk->funcs.request_cancel_mux); + fr_assert(treq->cancel_reason == FR_TRUNK_CANCEL_REASON_SIGNAL); switch (treq->pub.state) { case FR_TRUNK_REQUEST_STATE_CANCEL_PARTIAL: @@ -1328,7 +1328,7 @@ static fr_trunk_enqueue_t trunk_request_enqueue_existing(fr_trunk_request_t *tre /* * Must *NOT* still be assigned to another connection */ - rad_assert(!treq->pub.tconn); + fr_assert(!treq->pub.tconn); rcode = trunk_request_check_enqueue(&tconn, trunk, treq->pub.request); switch (rcode) { @@ -1389,7 +1389,7 @@ static uint64_t trunk_connection_requests_dequeue(fr_dlist_head_t *out, fr_trunk #define DEQUEUE_ALL(_src_list, _state) \ while ((treq = fr_dlist_head(_src_list))) { \ OVER_MAX_CHECK; \ - rad_assert(treq->pub.state == (_state)); \ + fr_assert(treq->pub.state == (_state)); \ trunk_request_enter_unassigned(treq); \ fr_dlist_insert_tail(out, treq); \ } @@ -1414,7 +1414,7 @@ static uint64_t trunk_connection_requests_dequeue(fr_dlist_head_t *out, fr_trunk OVER_MAX_CHECK; treq = tconn->cancel_partial; if (treq) { - rad_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_CANCEL_PARTIAL); + fr_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_CANCEL_PARTIAL); trunk_request_enter_unassigned(treq); fr_dlist_insert_tail(out, treq); } @@ -1426,7 +1426,7 @@ static uint64_t trunk_connection_requests_dequeue(fr_dlist_head_t *out, fr_trunk if (states & FR_TRUNK_REQUEST_STATE_PENDING) { while ((treq = fr_heap_peek(tconn->pending))) { OVER_MAX_CHECK; - rad_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_PENDING); + fr_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_PENDING); trunk_request_enter_unassigned(treq); fr_dlist_insert_tail(out, treq); } @@ -1439,7 +1439,7 @@ static uint64_t trunk_connection_requests_dequeue(fr_dlist_head_t *out, fr_trunk OVER_MAX_CHECK; treq = tconn->partial; if (treq) { - rad_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_PARTIAL); + fr_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_PARTIAL); /* * Don't allow the connection to change state whilst @@ -1464,7 +1464,7 @@ static uint64_t trunk_connection_requests_dequeue(fr_dlist_head_t *out, fr_trunk fr_connection_signals_pause(tconn->pub.conn); while ((treq = fr_dlist_head(&tconn->sent))) { OVER_MAX_CHECK; - rad_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_SENT); + fr_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_SENT); trunk_request_enter_cancel(treq, FR_TRUNK_CANCEL_REASON_MOVE); trunk_request_enter_unassigned(treq); @@ -1993,7 +1993,7 @@ static int _trunk_request_free(fr_trunk_request_t *treq) break; default: - rad_assert(0); + fr_assert(0); break; } @@ -2022,11 +2022,11 @@ fr_trunk_request_t *fr_trunk_request_alloc(fr_trunk_t *trunk, REQUEST *request) treq = fr_dlist_head(&trunk->free_requests); if (treq) { fr_dlist_remove(&trunk->free_requests, treq); - rad_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_INIT); - rad_assert(treq->pub.trunk == trunk); - rad_assert(treq->pub.tconn == NULL); - rad_assert(treq->cancel_reason == FR_TRUNK_CANCEL_REASON_NONE); - rad_assert(treq->last_freed > 0); + fr_assert(treq->pub.state == FR_TRUNK_REQUEST_STATE_INIT); + fr_assert(treq->pub.trunk == trunk); + fr_assert(treq->pub.tconn == NULL); + fr_assert(treq->cancel_reason == FR_TRUNK_CANCEL_REASON_NONE); + fr_assert(treq->last_freed > 0); trunk->pub.req_alloc_reused++; } else { MEM(treq = talloc_pooled_object(trunk, fr_trunk_request_t, @@ -2749,7 +2749,7 @@ static void trunk_connection_enter_active(fr_trunk_connection_t *tconn) case FR_TRUNK_CONN_CONNECTING: trunk_connection_remove(tconn); - rad_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); + fr_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); break; default: @@ -2849,7 +2849,7 @@ static void _trunk_connection_on_connecting(UNUSED fr_connection_t *conn, UNUSED * connecting state, it should have * no requests associated with it. */ - rad_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); + fr_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); fr_dlist_insert_head(&trunk->connecting, tconn); /* MUST remain a head insertion for reconnect logic */ CONN_STATE_TRANSITION(FR_TRUNK_CONN_CONNECTING, INFO); @@ -2927,7 +2927,7 @@ static void _trunk_connection_on_connected(UNUSED fr_connection_t *conn, UNUSED * it should have no requests associated * with it. */ - rad_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); + fr_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); /* * Set here, as the active state can @@ -3010,7 +3010,7 @@ static void _trunk_connection_on_closed(UNUSED fr_connection_t *conn, UNUSED fr_ case FR_TRUNK_CONN_CONNECTING: trunk_connection_remove(tconn); - rad_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); + fr_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); break; case FR_TRUNK_CONN_INIT: @@ -3034,7 +3034,7 @@ static void _trunk_connection_on_closed(UNUSED fr_connection_t *conn, UNUSED fr_ * connection. They should have all been * moved off or failed. */ - rad_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); + fr_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); /* * Clear statistics and flags @@ -3092,7 +3092,7 @@ static void _trunk_connection_on_halted(UNUSED fr_connection_t *conn, UNUSED fr_ * connection. They should have all been * moved off or failed. */ - rad_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); + fr_assert(fr_trunk_request_count_by_connection(tconn, FR_TRUNK_REQUEST_STATE_ALL) == 0); /* * And free the connection... @@ -3113,8 +3113,8 @@ static void _trunk_connection_on_halted(UNUSED fr_connection_t *conn, UNUSED fr_ */ static int _trunk_connection_free(fr_trunk_connection_t *tconn) { - rad_assert(tconn->pub.state == FR_TRUNK_CONN_HALTED); - rad_assert(!fr_dlist_entry_in_list(&tconn->entry)); /* Should not be in a list */ + fr_assert(tconn->pub.state == FR_TRUNK_CONN_HALTED); + fr_assert(!fr_dlist_entry_in_list(&tconn->entry)); /* Should not be in a list */ /* * Loop over all the requests we gathered @@ -3645,7 +3645,7 @@ static void trunk_manage(fr_trunk_t *trunk, fr_time_t now, char const *caller) * that a call to trunk_requests_per_connnection * was missed. */ - rad_assert(trunk->pub.last_above_target >= trunk->pub.last_below_target); + fr_assert(trunk->pub.last_above_target >= trunk->pub.last_below_target); /* * We don't consider 'draining' connections @@ -3740,7 +3740,7 @@ static void trunk_manage(fr_trunk_t *trunk, fr_time_t now, char const *caller) * that a call to trunk_requests_per_connnection * was missed. */ - rad_assert(trunk->pub.last_below_target > trunk->pub.last_above_target); + fr_assert(trunk->pub.last_below_target > trunk->pub.last_above_target); if (!conn_count) { DEBUG4("Not closing connection - No connections to close!"); @@ -4031,7 +4031,7 @@ static void trunk_backlog_drain(fr_trunk_t *trunk) continue; case FR_TRUNK_ENQUEUE_NO_CAPACITY: - rad_assert(fr_heap_num_elements(trunk->active) == 0); + fr_assert(fr_heap_num_elements(trunk->active) == 0); return; } } diff --git a/src/lib/server/trunk_tests.c b/src/lib/server/trunk_tests.c index beb960c7d80..3fc290ea55a 100644 --- a/src/lib/server/trunk_tests.c +++ b/src/lib/server/trunk_tests.c @@ -126,7 +126,7 @@ static void test_demux(UNUSED fr_trunk_connection_t *tconn, fr_connection_t *con break; default: - rad_assert(0); + fr_assert(0); break; } } while (slen >= 0); @@ -177,7 +177,7 @@ static void _conn_notify(fr_trunk_connection_t *tconn, fr_connection_t *conn, break; default: - rad_assert(0); + fr_assert(0); } } @@ -240,7 +240,7 @@ static void _conn_io_loopback(UNUSED fr_event_list_t *el, int fd, UNUSED int fla static size_t to_write; ssize_t slen; - rad_assert(fd == our_h[1]); + fr_assert(fd == our_h[1]); while (true) { slen = read(fd, buff, sizeof(buff)); diff --git a/src/lib/server/users_file.c b/src/lib/server/users_file.c index 546ea4eecd2..b951623513f 100644 --- a/src/lib/server/users_file.c +++ b/src/lib/server/users_file.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -215,8 +215,8 @@ parse_again: /* * Parse the check values */ - rad_assert(check_tmp == NULL); - rad_assert(reply_tmp == NULL); + fr_assert(check_tmp == NULL); + fr_assert(reply_tmp == NULL); parsecode = fr_pair_list_afrom_str(t, dict, ptr, &check_tmp); if (parsecode == T_INVALID) { diff --git a/src/lib/server/util.c b/src/lib/server/util.c index 965c8c5511f..6578cf060fd 100644 --- a/src/lib/server/util.c +++ b/src/lib/server/util.c @@ -23,7 +23,7 @@ RCSID("$Id$") #include -#include +#include #include #include diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c index 93b24eaeece..b0d365c529e 100644 --- a/src/lib/server/virtual_servers.c +++ b/src/lib/server/virtual_servers.c @@ -324,7 +324,7 @@ int virtual_server_section_attribute_define(CONF_SECTION *server_cs, char const int rcode = 0; CONF_SECTION *subcs = NULL; - rad_assert(strcmp(cf_section_name1(server_cs), "server") == 0); + fr_assert(strcmp(cf_section_name1(server_cs), "server") == 0); while ((subcs = cf_section_find_next(server_cs, subcs, subcs_name, CF_IDENT_ANY))) { char const *name2; @@ -504,7 +504,7 @@ int virtual_servers_instantiate(void) size_t i, server_cnt = virtual_servers ? talloc_array_length(virtual_servers) : 0; rbtree_t *vns_tree = cf_data_value(cf_data_find(virtual_server_root, rbtree_t, "vns_tree")); - rad_assert(virtual_servers); + fr_assert(virtual_servers); DEBUG2("#### Instantiating listeners ####"); @@ -573,9 +573,9 @@ int virtual_servers_instantiate(void) for (j = 0; j < listen_cnt; j++) { fr_virtual_listen_t *listen = listener[j]; - rad_assert(listen != NULL); - rad_assert(listen->proto_module != NULL); - rad_assert(listen->app != NULL); + fr_assert(listen != NULL); + fr_assert(listen->proto_module != NULL); + fr_assert(listen->app != NULL); if (listen->app->instantiate && listen->app->instantiate(listen->proto_module->data, listen->proto_module->conf) < 0) { @@ -684,8 +684,8 @@ int virtual_servers_bootstrap(CONF_SECTION *config) for (j = 0; j < listen_cnt; j++) { fr_virtual_listen_t *listen = listener[j]; - rad_assert(listen != NULL); - rad_assert(listen->proto_module != NULL); + fr_assert(listen != NULL); + fr_assert(listen->proto_module != NULL); (void) talloc_get_type_abort(listen, fr_virtual_listen_t); @@ -714,7 +714,7 @@ int virtual_servers_open(fr_schedule_t *sc) { size_t i, server_cnt = virtual_servers ? talloc_array_length(virtual_servers) : 0; - rad_assert(virtual_servers); + fr_assert(virtual_servers); DEBUG2("#### Opening listener interfaces ####"); @@ -728,9 +728,9 @@ int virtual_servers_open(fr_schedule_t *sc) for (j = 0; j < listen_cnt; j++) { fr_virtual_listen_t *listen = listener[j]; - rad_assert(listen != NULL); - rad_assert(listen->proto_module != NULL); - rad_assert(listen->app != NULL); + fr_assert(listen != NULL); + fr_assert(listen->proto_module != NULL); + fr_assert(listen->app != NULL); /* * The socket is opened with app_instance, @@ -844,7 +844,7 @@ int virtual_namespace_register(char const *namespace, rbtree_t *vns_tree; fr_virtual_namespace_t *vns; - rad_assert(virtual_server_root); /* Virtual server bootstrap must be called first */ + fr_assert(virtual_server_root); /* Virtual server bootstrap must be called first */ MEM(vns = talloc_zero(NULL, fr_virtual_namespace_t)); vns->namespace = talloc_strdup(vns, namespace); @@ -995,7 +995,7 @@ rlm_rcode_t process_authenticate(int auth_type, REQUEST *request) CONF_SECTION *subcs; fr_dict_t const *dict_internal; - rad_assert(request->server_cs != NULL); + fr_assert(request->server_cs != NULL); /* * Cache the old server_cs in case it was changed. @@ -1197,7 +1197,7 @@ int fr_app_process_instantiate(CONF_SECTION *server, dl_module_inst_t **type_sub memset(&parse_rules, 0, sizeof(parse_rules)); parse_rules.dict_def = virtual_server_namespace(cf_section_name2(server)); - rad_assert(parse_rules.dict_def != NULL); + fr_assert(parse_rules.dict_def != NULL); /* * Instantiate the process modules @@ -1374,7 +1374,7 @@ static int virtual_server_section_register(virtual_server_compile_t const *entry { virtual_server_compile_t *old; - rad_assert(server_section_name_tree != NULL); + fr_assert(server_section_name_tree != NULL); old = rbtree_finddata(server_section_name_tree, entry); if (old) return 0; @@ -1422,7 +1422,7 @@ int virtual_server_section_component(rlm_components_t *component, char const *na { virtual_server_compile_t *entry; - rad_assert(server_section_name_tree != NULL); + fr_assert(server_section_name_tree != NULL); /* * Look up the specific name first. That way we can @@ -1460,7 +1460,7 @@ virtual_server_method_t *virtual_server_section_methods(char const *name1, char { virtual_server_compile_t *entry; - rad_assert(server_section_name_tree != NULL); + fr_assert(server_section_name_tree != NULL); /* * Look up the specific name first. That way we can diff --git a/src/lib/sim/attrs.h b/src/lib/sim/attrs.h index 1148014ccf5..5424d08094a 100644 --- a/src/lib/sim/attrs.h +++ b/src/lib/sim/attrs.h @@ -21,7 +21,7 @@ * * @copyright 2003-2016 The FreeRADIUS server project */ -#include +#include #include #include #include diff --git a/src/lib/sim/base.c b/src/lib/sim/base.c index a398ae6f4ca..e8454a9c76b 100644 --- a/src/lib/sim/base.c +++ b/src/lib/sim/base.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include diff --git a/src/lib/soh/soh.c b/src/lib/soh/soh.c index a9de26d1c2c..ea1fb0bfdd0 100644 --- a/src/lib/soh/soh.c +++ b/src/lib/soh/soh.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include -#include +#include #include "base.h" /* @@ -430,7 +430,7 @@ int soh_verify(REQUEST *request, uint8_t const *data, unsigned int data_len) { soh_tlv tlv; int curr_shid =- 1, curr_shid_c =- 1, curr_hc =- 1; - rad_assert(request->packet != NULL); + fr_assert(request->packet != NULL); hdr.tlv_type = soh_pull_be_16(data); data += 2; hdr.tlv_len = soh_pull_be_16(data); data += 2; diff --git a/src/lib/tls/base.c b/src/lib/tls/base.c index f2d05ffa5c5..d55ad984194 100644 --- a/src/lib/tls/base.c +++ b/src/lib/tls/base.c @@ -33,7 +33,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ #include #include -#include +#include #include "base.h" #include "attrs.h" diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c index 6aa04adfc94..f43fc964423 100644 --- a/src/lib/tls/cache.c +++ b/src/lib/tls/cache.c @@ -30,7 +30,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ #include #include -#include +#include #include #include "base.h" @@ -195,8 +195,8 @@ static int fr_tls_cache_serialize(SSL *ssl, SSL_SESSION *sess) * of the tls_session, as the fields aren't re-populated on * resumption. */ - rad_assert(!tls_session->session_id); - rad_assert(!tls_session->session_blob); + fr_assert(!tls_session->session_id); + fr_assert(!tls_session->session_blob); key_len = fr_tls_cache_id(&key, sess); if (key_len == 0) { diff --git a/src/lib/tls/conf.c b/src/lib/tls/conf.c index f2c5a9a83e9..f5cffdea57b 100644 --- a/src/lib/tls/conf.c +++ b/src/lib/tls/conf.c @@ -37,7 +37,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ #include #include -#include +#include #include #include "base.h" diff --git a/src/lib/tls/ctx.c b/src/lib/tls/ctx.c index a53f8f2b340..16964ddea65 100644 --- a/src/lib/tls/ctx.c +++ b/src/lib/tls/ctx.c @@ -32,7 +32,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ #include #include -#include +#include #include #include @@ -112,7 +112,7 @@ static int tls_ctx_load_cert_chain(SSL_CTX *ctx, fr_tls_chain_conf_t const *chai /* * Conf parser should ensure they're both populated */ - rad_assert(chain->certificate_file && chain->private_key_file); + fr_assert(chain->certificate_file && chain->private_key_file); /* * Set the password (this should have been retrieved earlier) @@ -144,7 +144,7 @@ static int tls_ctx_load_cert_chain(SSL_CTX *ctx, fr_tls_chain_conf_t const *chai break; default: - rad_assert(0); + fr_assert(0); break; } @@ -187,7 +187,7 @@ static int tls_ctx_load_cert_chain(SSL_CTX *ctx, fr_tls_chain_conf_t const *chai break; default: - rad_assert(0); + fr_assert(0); fclose(fp); return -1; } diff --git a/src/lib/tls/log.c b/src/lib/tls/log.c index bd97bd6cf96..d3eedd8e90b 100644 --- a/src/lib/tls/log.c +++ b/src/lib/tls/log.c @@ -30,7 +30,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ #define LOG_PREFIX "tls - " #include -#include +#include #include "base.h" #include "missing.h" diff --git a/src/lib/tls/ocsp.c b/src/lib/tls/ocsp.c index 52a3d1a9aa3..722f4ede25d 100644 --- a/src/lib/tls/ocsp.c +++ b/src/lib/tls/ocsp.c @@ -31,7 +31,7 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ #include #include -#include +#include #include @@ -301,7 +301,7 @@ int fr_tls_ocsp_staple_cb(SSL *ssl, void *data) goto error; } - rad_assert(issuer_cert); + fr_assert(issuer_cert); ret = fr_tls_ocsp_check(request, ssl, server_store, issuer_cert, cert, conf, true); switch (ret) { @@ -470,7 +470,7 @@ int fr_tls_ocsp_check(REQUEST *request, SSL *ssl, goto skipped; case 1: - rad_assert(host && port && path); + fr_assert(host && port && path); break; } } diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c index d8411cc4994..ad979f4017a 100644 --- a/src/lib/tls/session.c +++ b/src/lib/tls/session.c @@ -28,7 +28,7 @@ #ifdef HAVE_OPENSSL_OCSP_H #define LOG_PREFIX "tls - " -#include +#include #include #include @@ -275,12 +275,12 @@ inline static CC_HINT(nonnull) void fr_tls_session_request_bind(REQUEST *request old = SSL_get_ex_data(ssl, FR_TLS_EX_INDEX_REQUEST); if (old) { (void)talloc_get_type_abort(ssl, REQUEST); - rad_assert(0); + fr_assert(0); } #endif ret = SSL_set_ex_data(ssl, FR_TLS_EX_INDEX_REQUEST, request); if (unlikely(ret == 0)) { - rad_assert(0); + fr_assert(0); return; } } @@ -300,7 +300,7 @@ inline static CC_HINT(nonnull) void fr_tls_session_request_unbind(SSL *ssl) #endif ret = SSL_set_ex_data(ssl, FR_TLS_EX_INDEX_REQUEST, NULL); if (unlikely(ret == 0)) { - rad_assert(0); + fr_assert(0); return; } } @@ -893,7 +893,7 @@ int fr_tls_session_pairs_from_x509_cert(fr_cursor_t *cursor, TALLOC_CTX *ctx, if (attr_index > 1) attr_index = 1; request = (REQUEST *)SSL_get_ex_data(session->ssl, FR_TLS_EX_INDEX_REQUEST); - rad_assert(request != NULL); + fr_assert(request != NULL); identity = (char **)SSL_get_ex_data(session->ssl, FR_TLS_EX_INDEX_IDENTITY); @@ -1592,7 +1592,7 @@ fr_tls_session_t *fr_tls_session_init_client(TALLOC_CTX *ctx, fr_tls_conf_t *con talloc_set_destructor(session, _fr_tls_session_free); session->ctx = conf->ctx[(conf->ctx_count == 1) ? 0 : conf->ctx_next++ % conf->ctx_count]; /* mutex not needed */ - rad_assert(session->ctx); + fr_assert(session->ctx); session->ssl = SSL_new(session->ctx); if (!session->ssl) { @@ -1660,13 +1660,13 @@ fr_tls_session_t *fr_tls_session_init_server(TALLOC_CTX *ctx, fr_tls_conf_t *con VALUE_PAIR *vp; SSL_CTX *ssl_ctx; - rad_assert(request != NULL); - rad_assert(conf->ctx_count > 0); + fr_assert(request != NULL); + fr_assert(conf->ctx_count > 0); RDEBUG2("Initiating new TLS session"); ssl_ctx = conf->ctx[(conf->ctx_count == 1) ? 0 : conf->ctx_next++ % conf->ctx_count]; /* mutex not needed */ - rad_assert(ssl_ctx); + fr_assert(ssl_ctx); new_tls = SSL_new(ssl_ctx); if (new_tls == NULL) { @@ -1730,7 +1730,7 @@ fr_tls_session_t *fr_tls_session_init_server(TALLOC_CTX *ctx, fr_tls_conf_t *con * As the context ID must be <= 32, we digest the context * data with sha256. */ - rad_assert(conf->session_id_name); + fr_assert(conf->session_id_name); { char *context_id; EVP_MD_CTX *md_ctx; diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c index 64894293c5c..b9a3d3b5fc3 100644 --- a/src/lib/tls/validate.c +++ b/src/lib/tls/validate.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/src/lib/unlang/base.c b/src/lib/unlang/base.c index 788437f70d5..bc295c61e5f 100644 --- a/src/lib/unlang/base.c +++ b/src/lib/unlang/base.c @@ -60,7 +60,7 @@ bool unlang_section(CONF_SECTION *cs) */ void unlang_register(int type, unlang_op_t *op) { - rad_assert(type < UNLANG_TYPE_MAX); /* Unlang max isn't a valid type */ + fr_assert(type < UNLANG_TYPE_MAX); /* Unlang max isn't a valid type */ memcpy(&unlang_ops[type], op, sizeof(unlang_ops[type])); } diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c index c492a7963fb..5ea35d04904 100644 --- a/src/lib/unlang/compile.c +++ b/src/lib/unlang/compile.c @@ -256,7 +256,7 @@ static bool pass2_fixup_xlat(CONF_ITEM const *ci, vp_tmpl_t **pvpt, bool convert vpt = *pvpt; - rad_assert(tmpl_is_xlat(vpt) || tmpl_is_exec(vpt)); + fr_assert(tmpl_is_xlat(vpt) || tmpl_is_exec(vpt)); slen = xlat_tokenize(vpt, &head, vpt->name, talloc_array_length(vpt->name) - 1, rules); @@ -335,7 +335,7 @@ static bool pass2_fixup_regex(CONF_ITEM const *ci, vp_tmpl_t *vpt, vp_tmpl_rules ssize_t slen; regex_t *preg; - rad_assert(tmpl_is_regex(vpt)); + fr_assert(tmpl_is_regex(vpt)); /* * It's a dynamic expansion. We can't expand the string, @@ -380,7 +380,7 @@ static bool pass2_fixup_undefined(CONF_ITEM const *ci, vp_tmpl_t *vpt, vp_tmpl_r { fr_dict_attr_t const *da; - rad_assert(tmpl_is_attr_undefined(vpt)); + fr_assert(tmpl_is_attr_undefined(vpt)); if (fr_dict_attr_by_qualified_name(&da, rules->dict_def, vpt->tmpl_unknown_name, true) != FR_DICT_ATTR_OK) { ssize_t slen; @@ -568,7 +568,7 @@ static bool pass2_fixup_map(fr_cond_t *c, vp_tmpl_rules_t const *rules) /* * Just in case someone adds a new fixup later. */ - rad_assert((c->pass2_fixup == PASS2_FIXUP_NONE) || + fr_assert((c->pass2_fixup == PASS2_FIXUP_NONE) || (c->pass2_fixup == PASS2_PAIRCOMPARE)); /* @@ -718,7 +718,7 @@ static bool pass2_fixup_map(fr_cond_t *c, vp_tmpl_rules_t const *rules) return false; } } - rad_assert(!tmpl_is_regex(map->lhs)); + fr_assert(!tmpl_is_regex(map->lhs)); #endif /* @@ -797,7 +797,7 @@ static bool pass2_cond_callback(fr_cond_t *c, void *uctx) * Fix up the template. */ case COND_TYPE_EXISTS: - rad_assert(!tmpl_is_regex(c->data.vpt)); + fr_assert(!tmpl_is_regex(c->data.vpt)); return pass2_fixup_tmpl(c->ci, &c->data.vpt, unlang_ctx->rules, true); /* @@ -810,7 +810,7 @@ static bool pass2_cond_callback(fr_cond_t *c, void *uctx) * Nothing else has pass2 fixups */ default: - rad_assert(0); + fr_assert(0); return false; } } @@ -818,7 +818,7 @@ static bool pass2_cond_callback(fr_cond_t *c, void *uctx) static bool pass2_fixup_update_map(vp_map_t *map, vp_tmpl_rules_t const *rules) { if (tmpl_is_xlat(map->lhs) || tmpl_is_exec(map->lhs)) { - rad_assert(map->lhs->tmpl_xlat == NULL); + fr_assert(map->lhs->tmpl_xlat == NULL); /* * FIXME: compile to attribute && handle @@ -838,7 +838,7 @@ static bool pass2_fixup_update_map(vp_map_t *map, vp_tmpl_rules_t const *rules) if (map->rhs) { if (tmpl_is_xlat(map->rhs) || tmpl_is_exec(map->rhs)) { - rad_assert(map->rhs->tmpl_xlat == NULL); + fr_assert(map->rhs->tmpl_xlat == NULL); /* * FIXME: compile to attribute && handle @@ -849,7 +849,7 @@ static bool pass2_fixup_update_map(vp_map_t *map, vp_tmpl_rules_t const *rules) } } - rad_assert(!tmpl_is_regex(map->rhs)); + fr_assert(!tmpl_is_regex(map->rhs)); if (tmpl_is_attr_undefined(map->rhs)) { if (!pass2_fixup_undefined(map->ci, map->rhs, rules)) return false; @@ -1906,7 +1906,7 @@ static bool add_child(unlang_group_t *g, unlang_t *c, CONF_ITEM *ci) if (!g->children) { g->children = g->tail = c; } else { - rad_assert(g->tail->next == NULL); + fr_assert(g->tail->next == NULL); g->tail->next = c; g->tail = c; } @@ -2072,7 +2072,7 @@ static unlang_t *compile_children(unlang_group_t *g, unlang_t *parent, unlang_co } } } else { - rad_assert(0); + fr_assert(0); } } @@ -2292,7 +2292,7 @@ static unlang_t *compile_case(unlang_t *parent, unlang_compile_t *unlang_ctx, CO } f = unlang_generic_to_group(parent); - rad_assert(f->vpt != NULL); + fr_assert(f->vpt != NULL); /* * Do type-specific checks on the case statement @@ -2305,7 +2305,7 @@ static unlang_t *compile_case(unlang_t *parent, unlang_compile_t *unlang_ctx, CO */ if (tmpl_is_unparsed(vpt) && tmpl_is_attr(f->vpt)) { - rad_assert(f->vpt->tmpl_da != NULL); + fr_assert(f->vpt->tmpl_da != NULL); if (tmpl_cast_in_place(vpt, f->vpt->tmpl_da->type, f->vpt->tmpl_da) < 0) { cf_log_err(cs, "Invalid argument for case statement: %s", @@ -2419,7 +2419,7 @@ static unlang_t *compile_foreach(unlang_t *parent, unlang_compile_t *unlang_ctx, * If we don't have a negative return code, we must have a vpt * (mostly to quiet coverity). */ - rad_assert(vpt); + fr_assert(vpt); if (!tmpl_is_attr(vpt) && !tmpl_is_list(vpt)) { cf_log_err(cs, "MUST use attribute or list reference (not %s) in 'foreach'", @@ -2593,7 +2593,7 @@ static unlang_t *compile_if_subsection(unlang_t *parent, unlang_compile_t *unlan } cond = cf_data_value(cf_data_find(cs, fr_cond_t, NULL)); - rad_assert(cond != NULL); + fr_assert(cond != NULL); if (cond->type == COND_TYPE_FALSE) { cf_log_debug_prefix(cs, "Skipping contents of '%s' as it is always 'false'", @@ -2843,7 +2843,7 @@ static unlang_t *compile_load_balance_subsection(unlang_t *parent, unlang_compil return NULL; } - rad_assert(g->vpt != NULL); + fr_assert(g->vpt != NULL); /* * Fixup the templates diff --git a/src/lib/unlang/condition.c b/src/lib/unlang/condition.c index e215571ea6b..163c4f41f55 100644 --- a/src/lib/unlang/condition.c +++ b/src/lib/unlang/condition.c @@ -36,7 +36,7 @@ static unlang_action_t unlang_if(REQUEST *request, rlm_rcode_t *presult) unlang_group_t *g; g = unlang_generic_to_group(instruction); - rad_assert(g->cond != NULL); + fr_assert(g->cond != NULL); condition = cond_eval(request, *presult, 0, g->cond); if (condition < 0) { diff --git a/src/lib/unlang/foreach.c b/src/lib/unlang/foreach.c index 42db963afe8..f5d0a6aec4f 100644 --- a/src/lib/unlang/foreach.c +++ b/src/lib/unlang/foreach.c @@ -90,7 +90,7 @@ static unlang_action_t unlang_foreach_next(REQUEST *request, rlm_rcode_t *presul if (!vp) { *presult = frame->result; #ifndef NDEBUG - rad_assert(foreach->indent == request->log.unlang_indent); + fr_assert(foreach->indent == request->log.unlang_indent); #endif return UNLANG_ACTION_CALCULATE_RESULT; } @@ -100,7 +100,7 @@ static unlang_action_t unlang_foreach_next(REQUEST *request, rlm_rcode_t *presul RDEBUG2("# looping with: Foreach-Variable-%d = %pV", foreach->depth, &vp->data); #endif - rad_assert(vp); + fr_assert(vp); /* * Add the vp to the request, so that @@ -172,7 +172,7 @@ static unlang_action_t unlang_foreach(REQUEST *request, rlm_rcode_t *presult) return UNLANG_ACTION_CALCULATE_RESULT; } - rad_assert(vps != NULL); + fr_assert(vps != NULL); foreach->request = request; foreach->depth = foreach_depth; diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c index 7c6ea333c59..0ca7f8080fa 100644 --- a/src/lib/unlang/interpret.c +++ b/src/lib/unlang/interpret.c @@ -161,7 +161,7 @@ void unlang_interpret_push(REQUEST *request, unlang_t *instruction, unlang_stack_t *stack = request->stack; unlang_stack_frame_t *frame; - rad_assert(instruction || top_frame); + fr_assert(instruction || top_frame); #ifndef NDEBUG if (DEBUG_ENABLED5) RDEBUG3("unlang_interpret_push called with instruction %s - args %s %s", @@ -187,7 +187,7 @@ void unlang_interpret_push(REQUEST *request, unlang_t *instruction, frame->instruction = instruction; if (do_next_sibling) { - rad_assert(instruction != NULL); + fr_assert(instruction != NULL); frame->next = instruction->next; } /* else frame->next MUST be NULL */ @@ -292,7 +292,7 @@ static inline unlang_frame_action_t result_calculate(REQUEST *request, unlang_st /* * Not allowed in frame uflags... */ - rad_assert(!(frame->uflags & UNWIND_FLAG_NO_CLEAR)); + fr_assert(!(frame->uflags & UNWIND_FLAG_NO_CLEAR)); /* * If we are unwinding the stack due to a break / return, @@ -366,7 +366,7 @@ static inline void frame_pop(unlang_stack_t *stack) { unlang_stack_frame_t *frame; - rad_assert(stack->depth > 1); + fr_assert(stack->depth > 1); frame = &stack->frame[stack->depth]; @@ -417,7 +417,7 @@ static inline unlang_frame_action_t frame_eval(REQUEST *request, unlang_stack_fr DUMP_STACK; - rad_assert(instruction->debug_name != NULL); /* if this happens, all bets are off. */ + fr_assert(instruction->debug_name != NULL); /* if this happens, all bets are off. */ REQUEST_VERIFY(request); @@ -459,14 +459,14 @@ static inline unlang_frame_action_t frame_eval(REQUEST *request, unlang_stack_fr RDEBUG4("** [%i] %s >> %s", stack->depth, __FUNCTION__, unlang_ops[instruction->type].name); - rad_assert(frame->interpret != NULL); + fr_assert(frame->interpret != NULL); action = frame->interpret(request, result); RDEBUG4("** [%i] %s << %s (%d)", stack->depth, __FUNCTION__, fr_table_str_by_value(unlang_action_table, action, ""), *priority); - rad_assert(*priority >= -1); - rad_assert(*priority <= MOD_PRIORITY_MAX); + fr_assert(*priority >= -1); + fr_assert(*priority <= MOD_PRIORITY_MAX); switch (action) { /* @@ -482,7 +482,7 @@ static inline unlang_frame_action_t frame_eval(REQUEST *request, unlang_stack_fr * now continue at the deepest frame. */ case UNLANG_ACTION_PUSHED_CHILD: - rad_assert(&stack->frame[stack->depth] > frame); + fr_assert(&stack->frame[stack->depth] > frame); *result = frame->result; return UNLANG_FRAME_ACTION_NEXT; @@ -495,7 +495,7 @@ static inline unlang_frame_action_t frame_eval(REQUEST *request, unlang_stack_fr frame->result = *result; frame->priority = *priority; frame->next = NULL; - rad_assert(stack->unwind != UNWIND_FLAG_NONE); + fr_assert(stack->unwind != UNWIND_FLAG_NONE); return UNLANG_FRAME_ACTION_POP; /* @@ -532,7 +532,7 @@ static inline unlang_frame_action_t frame_eval(REQUEST *request, unlang_stack_fr return UNLANG_FRAME_ACTION_YIELD; default: - rad_assert(0); + fr_assert(0); return UNLANG_FRAME_ACTION_YIELD; } @@ -549,7 +549,7 @@ static inline unlang_frame_action_t frame_eval(REQUEST *request, unlang_stack_fr */ if (*result == RLM_MODULE_YIELD) goto yield; - rad_assert(*result != RLM_MODULE_UNKNOWN); + fr_assert(*result != RLM_MODULE_UNKNOWN); repeatable_clear(frame); @@ -617,7 +617,7 @@ rlm_rcode_t unlang_interpret(REQUEST *request) DUMP_STACK; #endif - rad_assert(!unlang_request_is_scheduled(request)); /* if we're running it, it can't be scheduled */ + fr_assert(!unlang_request_is_scheduled(request)); /* if we're running it, it can't be scheduled */ RDEBUG4("** [%i] %s - interpreter entered", stack->depth, __FUNCTION__); @@ -626,8 +626,8 @@ rlm_rcode_t unlang_interpret(REQUEST *request) fr_table_str_by_value(unlang_frame_action_table, fa, "")); switch (fa) { case UNLANG_FRAME_ACTION_NEXT: /* Evaluate the current frame */ - rad_assert(stack->depth > 0); - rad_assert(stack->depth < UNLANG_STACK_MAX); + fr_assert(stack->depth > 0); + fr_assert(stack->depth < UNLANG_STACK_MAX); frame = &stack->frame[stack->depth]; fa = frame_eval(request, frame, &stack->result, &priority); @@ -725,7 +725,7 @@ rlm_rcode_t unlang_interpret(REQUEST *request) continue; case UNLANG_FRAME_ACTION_YIELD: - rad_assert(stack->result == RLM_MODULE_YIELD); + fr_assert(stack->result == RLM_MODULE_YIELD); RDEBUG4("** [%i] %s - interpreter yielding", stack->depth, __FUNCTION__); return stack->result; } @@ -877,7 +877,7 @@ rlm_rcode_t unlang_interpret_synchronous(REQUEST *request, CONF_SECTION *cs, rlm el = fr_event_list_alloc(NULL, NULL, NULL); if (!el) { RPERROR("Failed creating temporary event loop"); - rad_assert(0); /* Cause debug builds to die */ + fr_assert(0); /* Cause debug builds to die */ return RLM_MODULE_FAIL; } @@ -1038,7 +1038,7 @@ static void frame_signal(REQUEST *request, fr_state_signal_t action, int limit) (void)talloc_get_type_abort(request, REQUEST); /* Check the request hasn't already been freed */ - rad_assert(stack->depth > 0); + fr_assert(stack->depth > 0); /* * Walk back up the stack, calling signal handlers @@ -1145,7 +1145,7 @@ void unlang_interpret_resumable(REQUEST *request) * are. */ while (request->parent) { - rad_assert(!unlang_request_is_scheduled(request)); + fr_assert(!unlang_request_is_scheduled(request)); request->runnable_id = -2; /* hack for now, see unlang_parallel_process() */ request = request->parent; } @@ -1179,7 +1179,7 @@ void unlang_interpret_resumable(REQUEST *request) RDEBUG3("marking as resumable"); } - rad_assert(request->backlog != NULL); + fr_assert(request->backlog != NULL); fr_heap_insert(request->backlog, request); } @@ -1258,7 +1258,7 @@ static ssize_t unlang_interpret_xlat(UNUSED TALLOC_CTX *ctx, char **out, size_t } g = (unlang_group_t const *) instruction; - rad_assert(g->cs != NULL); + fr_assert(g->cs != NULL); return snprintf(*out, outlen, "%d", cf_lineno(g->cs)); } @@ -1274,7 +1274,7 @@ static ssize_t unlang_interpret_xlat(UNUSED TALLOC_CTX *ctx, char **out, size_t } g = (unlang_group_t const *) instruction; - rad_assert(g->cs != NULL); + fr_assert(g->cs != NULL); return snprintf(*out, outlen, "%s", cf_filename(g->cs)); } diff --git a/src/lib/unlang/load_balance.c b/src/lib/unlang/load_balance.c index a4ade7a4726..19afb67f6b8 100644 --- a/src/lib/unlang/load_balance.c +++ b/src/lib/unlang/load_balance.c @@ -71,7 +71,7 @@ static unlang_action_t unlang_load_balance_next(REQUEST *request, rlm_rcode_t *p * process again. */ - rad_assert(instruction->type != UNLANG_TYPE_LOAD_BALANCE); /* this is never called again */ + fr_assert(instruction->type != UNLANG_TYPE_LOAD_BALANCE); /* this is never called again */ /* * If the current child says "return", then do diff --git a/src/lib/unlang/map.c b/src/lib/unlang/map.c index 6b11858bd2b..22184c3e9e8 100644 --- a/src/lib/unlang/map.c +++ b/src/lib/unlang/map.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -136,8 +136,8 @@ static unlang_action_t list_mod_create(REQUEST *request, rlm_rcode_t *presult) case UNLANG_UPDATE_MAP_INIT: update_state->state = UNLANG_UPDATE_MAP_EXPANDED_LHS; - rad_assert(!update_state->lhs_result); /* Should have been consumed */ - rad_assert(!update_state->rhs_result); /* Should have been consumed */ + fr_assert(!update_state->lhs_result); /* Should have been consumed */ + fr_assert(!update_state->rhs_result); /* Should have been consumed */ switch (map->lhs->type) { default: @@ -151,7 +151,7 @@ static unlang_action_t list_mod_create(REQUEST *request, rlm_rcode_t *presult) case TMPL_TYPE_REGEX: case TMPL_TYPE_REGEX_STRUCT: case TMPL_TYPE_XLAT: - rad_assert(0); + fr_assert(0); error: TALLOC_FREE(frame->state); @@ -188,7 +188,7 @@ static unlang_action_t list_mod_create(REQUEST *request, rlm_rcode_t *presult) case TMPL_TYPE_REGEX: case TMPL_TYPE_REGEX_STRUCT: case TMPL_TYPE_XLAT: - rad_assert(0); + fr_assert(0); goto error; } /* FALL-THROUGH */ @@ -333,7 +333,7 @@ static unlang_action_t unlang_map_state_init(REQUEST *request, rlm_rcode_t *pres case TMPL_TYPE_REGEX: case TMPL_TYPE_REGEX_STRUCT: case TMPL_TYPE_XLAT: - rad_assert(0); + fr_assert(0); goto error; } diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c index 2728948348e..d30a2a8bf3b 100644 --- a/src/lib/unlang/module.c +++ b/src/lib/unlang/module.c @@ -65,7 +65,7 @@ static void unlang_event_fd_read_handler(UNUSED fr_event_list_t *el, int fd, UNU void *mutable_ctx; void *mutable_inst; - rad_assert(ev->fd == fd); + fr_assert(ev->fd == fd); memcpy(&mutable_ctx, &ev->ctx, sizeof(mutable_ctx)); memcpy(&mutable_inst, &ev->inst, sizeof(mutable_inst)); @@ -138,8 +138,8 @@ int unlang_module_timeout_add(REQUEST *request, fr_unlang_module_timeout_t callb unlang_frame_state_module_t *state = talloc_get_type_abort(frame->state, unlang_frame_state_module_t); - rad_assert(stack->depth > 0); - rad_assert(frame->instruction->type == UNLANG_TYPE_MODULE); + fr_assert(stack->depth > 0); + fr_assert(frame->instruction->type == UNLANG_TYPE_MODULE); sp = unlang_generic_to_module(frame->instruction); ev = talloc_zero(request, unlang_module_event_t); @@ -198,7 +198,7 @@ static void unlang_event_fd_write_handler(UNUSED fr_event_list_t *el, int fd, UN void *mutable_ctx; void *mutable_inst; - rad_assert(ev->fd == fd); + fr_assert(ev->fd == fd); memcpy(&mutable_ctx, &ev->ctx, sizeof(mutable_ctx)); memcpy(&mutable_inst, &ev->inst, sizeof(mutable_inst)); @@ -221,7 +221,7 @@ static void unlang_event_fd_error_handler(UNUSED fr_event_list_t *el, int fd, void *mutable_ctx; void *mutable_inst; - rad_assert(ev->fd == fd); + fr_assert(ev->fd == fd); memcpy(&mutable_ctx, &ev->ctx, sizeof(mutable_ctx)); memcpy(&mutable_inst, &ev->inst, sizeof(mutable_inst)); @@ -267,9 +267,9 @@ int unlang_module_fd_add(REQUEST *request, unlang_frame_state_module_t *state = talloc_get_type_abort(frame->state, unlang_frame_state_module_t); - rad_assert(stack->depth > 0); + fr_assert(stack->depth > 0); - rad_assert(frame->instruction->type == UNLANG_TYPE_MODULE); + fr_assert(frame->instruction->type == UNLANG_TYPE_MODULE); sp = unlang_generic_to_module(frame->instruction); ev = talloc_zero(request, unlang_module_event_t); @@ -361,7 +361,7 @@ void unlang_module_push(rlm_rcode_t *out, REQUEST *request, MEM(state = talloc_zero(stack, unlang_frame_state_module_t)); state->presult = out; state->thread = module_thread(module_instance); - rad_assert(state->thread != NULL); + fr_assert(state->thread != NULL); /* * We need to have a unlang_module_t to push on the @@ -528,7 +528,7 @@ rlm_rcode_t unlang_module_yield_to_section(REQUEST *request, CONF_SECTION *subcs unlang_t *instruction = frame->instruction; unlang_module_t *sp; - rad_assert(instruction->type == UNLANG_TYPE_MODULE); + fr_assert(instruction->type == UNLANG_TYPE_MODULE); sp = unlang_generic_to_module(instruction); /* @@ -636,7 +636,7 @@ static unlang_action_t unlang_module_resume(REQUEST *request, rlm_rcode_t *presu rlm_rcode_t rcode; int stack_depth = stack->depth; - rad_assert(state->resume != NULL); + fr_assert(state->resume != NULL); /* * Lock is noop unless instance->mutex is set. @@ -671,7 +671,7 @@ static unlang_action_t unlang_module_resume(REQUEST *request, rlm_rcode_t *presu if (rcode == RLM_MODULE_YIELD) { if (stack_depth < stack->depth) return UNLANG_ACTION_PUSHED_CHILD; - rad_assert(stack_depth == stack->depth); + fr_assert(stack_depth == stack->depth); *presult = rcode; return UNLANG_ACTION_YIELD; } @@ -764,7 +764,7 @@ static unlang_action_t unlang_module(REQUEST *request, rlm_rcode_t *presult) * to dealing with it's parent. */ sp = unlang_generic_to_module(instruction); - rad_assert(sp); + fr_assert(sp); RDEBUG4("[%i] %s - %s (%s)", stack->depth, __FUNCTION__, sp->module_instance->name, sp->module_instance->module->name); @@ -774,7 +774,7 @@ static unlang_action_t unlang_module(REQUEST *request, rlm_rcode_t *presult) */ state->thread = module_thread(sp->module_instance); state->presult = NULL; - rad_assert(state->thread != NULL); + fr_assert(state->thread != NULL); /* * Return administratively configured return code @@ -818,16 +818,16 @@ static unlang_action_t unlang_module(REQUEST *request, rlm_rcode_t *presult) if (rcode == RLM_MODULE_YIELD) { state->thread->active_callers++; if (stack_depth < stack->depth) return UNLANG_ACTION_PUSHED_CHILD; - rad_assert(stack_depth == stack->depth); + fr_assert(stack_depth == stack->depth); *presult = rcode; frame->interpret = unlang_module_resume; return UNLANG_ACTION_YIELD; } done: - rad_assert(unlang_indent == request->log.unlang_indent); - rad_assert(rcode >= RLM_MODULE_REJECT); - rad_assert(rcode < RLM_MODULE_NUMCODES); + fr_assert(unlang_indent == request->log.unlang_indent); + fr_assert(rcode >= RLM_MODULE_REJECT); + fr_assert(rcode < RLM_MODULE_NUMCODES); /* * The module is done. But, running it pushed one or diff --git a/src/lib/unlang/module_priv.h b/src/lib/unlang/module_priv.h index 2a5d0e73815..1bc74de2419 100644 --- a/src/lib/unlang/module_priv.h +++ b/src/lib/unlang/module_priv.h @@ -53,7 +53,7 @@ typedef struct { static inline unlang_module_t *unlang_generic_to_module(unlang_t *p) { - rad_assert(p->type == UNLANG_TYPE_MODULE); + fr_assert(p->type == UNLANG_TYPE_MODULE); return talloc_get_type_abort(p, unlang_module_t); } diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c index 4d5c5081065..43ad63437d5 100644 --- a/src/lib/unlang/parallel.c +++ b/src/lib/unlang/parallel.c @@ -99,7 +99,7 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr */ case CHILD_INIT: RDEBUG3("parallel child %d is INIT", i); - rad_assert(state->children[i].instruction != NULL); + fr_assert(state->children[i].instruction != NULL); child = unlang_io_subrequest_alloc(request, request->dict, state->detach); child->packet->code = request->packet->code; @@ -150,7 +150,7 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr state->children[i].state = CHILD_DONE; state->children[i].instruction = NULL; - rad_assert(request->backlog != NULL); + fr_assert(request->backlog != NULL); /* * Detach the child, and insert @@ -195,7 +195,7 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr RDEBUG3("parallel child %s returns %s", state->children[i].child->name, fr_table_str_by_value(mod_rcode_table, result, "")); - rad_assert(result < NUM_ELEMENTS(state->children[i].instruction->actions)); + fr_assert(result < NUM_ELEMENTS(state->children[i].instruction->actions)); /* * Re-run all of the logic from interpret.c @@ -261,14 +261,14 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr */ if (child_state == CHILD_YIELDED) continue; - rad_assert(child_state == CHILD_DONE); + fr_assert(child_state == CHILD_DONE); break; /* * Not ready to run. */ case CHILD_YIELDED: - rad_assert(state->children[i].child != NULL); + fr_assert(state->children[i].child != NULL); if (state->children[i].child->runnable_id == -2) { /* see unlang_interpret_resumable() */ (void) fr_heap_extract(state->children[i].child->backlog, @@ -276,7 +276,7 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr goto runnable; } - rad_assert(state->children[i].instruction != NULL); + fr_assert(state->children[i].instruction != NULL); RDEBUG3("parallel child %s is already YIELDED", state->children[i].child->name); child_state = CHILD_YIELDED; continue; @@ -293,8 +293,8 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr */ case CHILD_DONE: RDEBUG3("parallel child %d is already DONE", i); - rad_assert(state->children[i].child == NULL); - rad_assert(state->children[i].instruction == NULL); + fr_assert(state->children[i].child == NULL); + fr_assert(state->children[i].instruction == NULL); continue; } @@ -307,7 +307,7 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr return UNLANG_ACTION_YIELD; } - rad_assert(child_state == CHILD_DONE); + fr_assert(child_state == CHILD_DONE); /* * Clean up all of the child requests, because once we @@ -316,8 +316,8 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr for (i = 0; i < state->num_children; i++) { switch (state->children[i].state) { case CHILD_RUNNABLE: - rad_assert(state->children[i].child->backlog == NULL); - rad_assert(state->children[i].child->runnable_id < 0); + fr_assert(state->children[i].child->backlog == NULL); + fr_assert(state->children[i].child->runnable_id < 0); /* * Un-detached children are never in the @@ -327,7 +327,7 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr case CHILD_YIELDED: REQUEST_VERIFY(state->children[i].child); - rad_assert(state->children[i].child->runnable_id < 0); + fr_assert(state->children[i].child->runnable_id < 0); /* * Signal the child that it's going to be @@ -373,7 +373,7 @@ static void unlang_parallel_signal(REQUEST *request, fr_state_signal_t action) case CHILD_RUNNABLE: case CHILD_YIELDED: - rad_assert(state->children[i].child != NULL); + fr_assert(state->children[i].child != NULL); unlang_interpret_signal(state->children[i].child, action); break; } diff --git a/src/lib/unlang/subrequest.c b/src/lib/unlang/subrequest.c index ac321e349ae..267732ab9e4 100644 --- a/src/lib/unlang/subrequest.c +++ b/src/lib/unlang/subrequest.c @@ -72,7 +72,7 @@ static void unlang_max_request_time(UNUSED fr_event_list_t *el, UNUSED fr_time_t * from the backlog. */ if (unlang_request_is_scheduled(request)) { - rad_assert(request->backlog != NULL); + fr_assert(request->backlog != NULL); (void) fr_heap_extract(request->backlog, request); } @@ -104,7 +104,7 @@ static unlang_action_t unlang_subrequest_process(REQUEST *request, rlm_rcode_t * REQUEST *child = talloc_get_type_abort(state->child, REQUEST); rlm_rcode_t rcode; - rad_assert(child != NULL); + fr_assert(child != NULL); rcode = unlang_interpret(child); if (rcode != RLM_MODULE_YIELD) { @@ -306,7 +306,7 @@ int unlang_detached_child_init(REQUEST *request) /* * Mark the child as runnable. */ - rad_assert(request->parent == NULL); + fr_assert(request->parent == NULL); if (fr_heap_insert(request->backlog, request) < 0) { RPERROR("Failed inserting ourself into the backlog."); return -1; @@ -338,7 +338,7 @@ static unlang_action_t unlang_detach(REQUEST *request, rlm_rcode_t *presult) */ RDEBUG2("detach"); - rad_assert(request->parent != NULL); + fr_assert(request->parent != NULL); /* * Get the PARENT's stack. @@ -364,7 +364,7 @@ static unlang_action_t unlang_detach(REQUEST *request, rlm_rcode_t *presult) * The parent frame no longer has a child, and therefore * can't be signaled. */ - rad_assert(parent_state->child == request); + fr_assert(parent_state->child == request); parent_state->child = NULL; frame->signal = NULL; diff --git a/src/lib/unlang/switch.c b/src/lib/unlang/switch.c index 8a37846f099..2abf4dcde35 100644 --- a/src/lib/unlang/switch.c +++ b/src/lib/unlang/switch.c @@ -51,7 +51,7 @@ static unlang_action_t unlang_switch(REQUEST *request, UNUSED rlm_rcode_t *presu map.op = T_OP_CMP_EQ; map.ci = cf_section_to_item(g->cs); - rad_assert(g->vpt != NULL); + fr_assert(g->vpt != NULL); null_case = found = NULL; data.datum.ptr = NULL; @@ -63,7 +63,7 @@ static unlang_action_t unlang_switch(REQUEST *request, UNUSED rlm_rcode_t *presu if (tmpl_is_attr(g->vpt) && (tmpl_find_vp(NULL, request, g->vpt) < 0)) { find_null_case: for (this = g->children; this; this = this->next) { - rad_assert(this->type == UNLANG_TYPE_CASE); + fr_assert(this->type == UNLANG_TYPE_CASE); h = unlang_generic_to_group(this); if (h->vpt) continue; @@ -97,7 +97,7 @@ static unlang_action_t unlang_switch(REQUEST *request, UNUSED rlm_rcode_t *presu * "case {...}" statement. */ for (this = g->children; this; this = this->next) { - rad_assert(this->type == UNLANG_TYPE_CASE); + fr_assert(this->type == UNLANG_TYPE_CASE); h = unlang_generic_to_group(this); diff --git a/src/lib/unlang/tmpl.c b/src/lib/unlang/tmpl.c index 21b5d3d1d74..9aad597ce17 100644 --- a/src/lib/unlang/tmpl.c +++ b/src/lib/unlang/tmpl.c @@ -147,10 +147,9 @@ static void unlang_tmpl_exec_waitpid(UNUSED fr_event_list_t *el, UNUSED pid_t pi state->status = status; - rad_assert(state->pid == 0); - rad_assert(state->fd < 0); - rad_assert(state->ev == NULL); - + fr_assert(state->pid == 0); + fr_assert(state->fd < 0); + fr_assert(state->ev == NULL); unlang_interpret_resumable(request); } @@ -215,7 +214,7 @@ static void unlang_tmpl_exec_read(UNUSED fr_event_list_t *el, UNUSED int fd, UNU return; } - rad_assert(p < end); + fr_assert(p < end); state->ptr = p; } diff --git a/src/lib/unlang/unlang_priv.h b/src/lib/unlang/unlang_priv.h index 642f0e62c07..dff899baee0 100644 --- a/src/lib/unlang/unlang_priv.h +++ b/src/lib/unlang/unlang_priv.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -300,7 +300,7 @@ extern size_t mod_rcode_table_len; */ static inline unlang_group_t *unlang_generic_to_group(unlang_t *p) { - rad_assert((p->type > UNLANG_TYPE_MODULE) && (p->type <= UNLANG_TYPE_POLICY)); + fr_assert((p->type > UNLANG_TYPE_MODULE) && (p->type <= UNLANG_TYPE_POLICY)); return (unlang_group_t *)p; } @@ -312,7 +312,7 @@ static inline unlang_t *unlang_group_to_generic(unlang_group_t *p) static inline unlang_tmpl_t *unlang_generic_to_tmpl(unlang_t *p) { - rad_assert(p->type == UNLANG_TYPE_TMPL); + fr_assert(p->type == UNLANG_TYPE_TMPL); return talloc_get_type_abort(p, unlang_tmpl_t); } diff --git a/src/lib/unlang/xlat.c b/src/lib/unlang/xlat.c index 8a6b4d46798..7233c015982 100644 --- a/src/lib/unlang/xlat.c +++ b/src/lib/unlang/xlat.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -142,8 +142,8 @@ int unlang_xlat_event_timeout_add(REQUEST *request, fr_unlang_xlat_timeout_t cal unlang_xlat_event_t *ev; unlang_frame_state_xlat_t *state = talloc_get_type_abort(frame->state, unlang_frame_state_xlat_t); - rad_assert(stack->depth > 0); - rad_assert(frame->instruction->type == UNLANG_TYPE_XLAT); + fr_assert(stack->depth > 0); + fr_assert(frame->instruction->type == UNLANG_TYPE_XLAT); ev = talloc_zero(request, unlang_xlat_event_t); if (!ev) return -1; @@ -244,7 +244,7 @@ static unlang_action_t unlang_xlat(REQUEST *request, rlm_rcode_t *presult) switch (xa) { case XLAT_ACTION_PUSH_CHILD: - rad_assert(child); + fr_assert(child); repeatable_set(frame); @@ -274,7 +274,7 @@ static unlang_action_t unlang_xlat(REQUEST *request, rlm_rcode_t *presult) return UNLANG_ACTION_CALCULATE_RESULT; } - rad_assert(0); + fr_assert(0); *presult = RLM_MODULE_FAIL; return UNLANG_ACTION_CALCULATE_RESULT; } @@ -319,7 +319,7 @@ static unlang_action_t unlang_xlat_resume(REQUEST *request, rlm_rcode_t *presult unlang_frame_state_xlat_t *state = talloc_get_type_abort(frame->state, unlang_frame_state_xlat_t); xlat_action_t xa; - rad_assert(state->resume != NULL); + fr_assert(state->resume != NULL); xa = xlat_frame_eval_resume(state->ctx, &state->values, state->resume, state->exp, @@ -333,7 +333,7 @@ static unlang_action_t unlang_xlat_resume(REQUEST *request, rlm_rcode_t *presult return UNLANG_ACTION_CALCULATE_RESULT; case XLAT_ACTION_PUSH_CHILD: - rad_assert(0); + fr_assert(0); /* FALL-THROUGH */ case XLAT_ACTION_FAIL: @@ -342,7 +342,7 @@ static unlang_action_t unlang_xlat_resume(REQUEST *request, rlm_rcode_t *presult /* DON'T SET DEFAULT */ } - rad_assert(0); /* Garbage xlat action */ + fr_assert(0); /* Garbage xlat action */ *presult = RLM_MODULE_FAIL; return UNLANG_ACTION_CALCULATE_RESULT; diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c index f77375d62a2..d6ad6ddc528 100644 --- a/src/lib/unlang/xlat_builtin.c +++ b/src/lib/unlang/xlat_builtin.c @@ -32,7 +32,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -552,8 +552,8 @@ static ssize_t xlat_redundant(TALLOC_CTX *ctx, char **out, NDEBUG_UNUSED size_t char const *name; xlat_t *xlat; - rad_assert((*out == NULL) && (outlen == 0)); /* Caller must not have allocated buf */ - rad_assert(xr->type == XLAT_REDUNDANT); + fr_assert((*out == NULL) && (outlen == 0)); /* Caller must not have allocated buf */ + fr_assert(xr->type == XLAT_REDUNDANT); /* * Pick the first xlat which succeeds @@ -566,7 +566,7 @@ static ssize_t xlat_redundant(TALLOC_CTX *ctx, char **out, NDEBUG_UNUSED size_t if (!cf_item_is_pair(ci)) continue; name = cf_pair_attr(cf_item_to_pair(ci)); - rad_assert(name != NULL); + fr_assert(name != NULL); xlat = xlat_func_find(name, -1); if (!xlat) continue; @@ -612,7 +612,7 @@ static ssize_t xlat_load_balance(TALLOC_CTX *ctx, char **out, NDEBUG_UNUSED size char const *name; xlat_t *xlat; - rad_assert((*out == NULL) && (outlen == 0)); /* Caller must not have allocated buf */ + fr_assert((*out == NULL) && (outlen == 0)); /* Caller must not have allocated buf */ /* * Choose a child at random. @@ -638,7 +638,7 @@ static ssize_t xlat_load_balance(TALLOC_CTX *ctx, char **out, NDEBUG_UNUSED size if (xr->type == XLAT_LOAD_BALANCE) { ssize_t slen; name = cf_pair_attr(cf_item_to_pair(found)); - rad_assert(name != NULL); + fr_assert(name != NULL); xlat = xlat_func_find(name, -1); if (!xlat) return -1; @@ -655,7 +655,7 @@ static ssize_t xlat_load_balance(TALLOC_CTX *ctx, char **out, NDEBUG_UNUSED size return slen; } - rad_assert(xr->type == XLAT_REDUNDANT_LOAD_BALANCE); + fr_assert(xr->type == XLAT_REDUNDANT_LOAD_BALANCE); /* * Try the random one we found. If it fails, keep going @@ -664,7 +664,7 @@ static ssize_t xlat_load_balance(TALLOC_CTX *ctx, char **out, NDEBUG_UNUSED size ci = found; do { name = cf_pair_attr(cf_item_to_pair(ci)); - rad_assert(name != NULL); + fr_assert(name != NULL); xlat = xlat_func_find(name, -1); if (xlat) { @@ -729,7 +729,7 @@ int xlat_register_redundant(CONF_SECTION *cs) } else if (strcmp(name1, "load-balance") == 0) { xr->type = XLAT_LOAD_BALANCE; } else { - rad_assert(0); + fr_assert(0); } xr->cs = cs; @@ -1069,7 +1069,7 @@ static ssize_t xlat_func_explode(TALLOC_CTX *ctx, char **out, size_t outlen, break; default: - rad_assert(0); + fr_assert(0); } fr_cursor_append(&to_merge, nvp); @@ -1522,7 +1522,7 @@ static ssize_t xlat_func_rpad(TALLOC_CTX *ctx, char **out, UNUSED size_t outlen, vp_tmpl_t *vpt; char *to_pad = NULL; - rad_assert(!*out); + fr_assert(!*out); if (parse_pad(&vpt, &pad, &fill, request, fmt) <= 0) return 0; @@ -1644,7 +1644,7 @@ static xlat_action_t xlat_func_base64_encode(TALLOC_CTX *ctx, fr_cursor_t *out, return XLAT_ACTION_FAIL; } - rad_assert((size_t)elen <= alen); + fr_assert((size_t)elen <= alen); MEM(vb = fr_value_box_alloc_null(ctx)); @@ -2464,7 +2464,7 @@ static xlat_action_t xlat_func_regex(TALLOC_CTX *ctx, fr_cursor_t *out, return XLAT_ACTION_FAIL; } - rad_assert(p); + fr_assert(p); MEM(vb = fr_value_box_alloc_null(ctx)); fr_value_box_bstrsteal(vb, vb, NULL, p, false); @@ -2499,7 +2499,7 @@ static xlat_action_t xlat_func_regex(TALLOC_CTX *ctx, fr_cursor_t *out, return XLAT_ACTION_FAIL; } - rad_assert(p); + fr_assert(p); MEM(vb = fr_value_box_alloc_null(ctx)); fr_value_box_bstrsteal(vb, vb, NULL, p, false); @@ -2526,7 +2526,7 @@ static xlat_action_t xlat_func_regex(TALLOC_CTX *ctx, fr_cursor_t *out, return XLAT_ACTION_FAIL; } - rad_assert(p); + fr_assert(p); MEM(vb = fr_value_box_alloc_null(ctx)); fr_value_box_bstrsteal(vb, vb, NULL, p, false); @@ -2819,7 +2819,7 @@ static xlat_action_t xlat_func_sub_regex(TALLOC_CTX *ctx, fr_cursor_t *out, */ p += slen; - rad_assert(*p == ' '); + fr_assert(*p == ' '); p++; /* Skip space */ rep = p; @@ -2980,7 +2980,7 @@ static xlat_action_t xlat_func_sub(TALLOC_CTX *ctx, fr_cursor_t *out, talloc_free(vb); return XLAT_ACTION_FAIL; } - rad_assert(vb->type != FR_TYPE_INVALID); + fr_assert(vb->type != FR_TYPE_INVALID); fr_cursor_append(out, vb); return XLAT_ACTION_DONE; diff --git a/src/lib/unlang/xlat_eval.c b/src/lib/unlang/xlat_eval.c index 78b7b70c9bb..7f02ec534d9 100644 --- a/src/lib/unlang/xlat_eval.c +++ b/src/lib/unlang/xlat_eval.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include #include @@ -403,7 +403,7 @@ static xlat_action_t xlat_eval_one_letter(TALLOC_CTX *ctx, fr_cursor_t *out, REQ break; default: - rad_assert(0); + fr_assert(0); return XLAT_ACTION_FAIL; } @@ -561,7 +561,7 @@ static xlat_action_t xlat_eval_pair_real(TALLOC_CTX *ctx, fr_cursor_t *out, REQU fr_cursor_t cursor; - rad_assert(tmpl_is_attr(vpt) || tmpl_is_list(vpt)); + fr_assert(tmpl_is_attr(vpt) || tmpl_is_list(vpt)); /* * See if we're dealing with an attribute in the request @@ -861,7 +861,7 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_cursor_t *out, { fr_cursor_t from; - rad_assert(alternate); + fr_assert(alternate); /* * No result from the first child, try the alternate @@ -896,7 +896,7 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_cursor_t *out, (void) talloc_list_get_type_abort(*result, fr_value_box_t); fr_cursor_init(&from, result); fr_cursor_merge(out, &from); - rad_assert(!*result); + fr_assert(!*result); } break; @@ -908,7 +908,7 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_cursor_t *out, XLAT_DEBUG("** [%i] %s(child) - continuing %%{%s ...}", unlang_interpret_stack_depth(request), __FUNCTION__, node->fmt); - rad_assert(*result != NULL); + fr_assert(*result != NULL); (void) talloc_list_get_type_abort(*result, fr_value_box_t); box = fr_value_box_alloc(ctx, FR_TYPE_GROUP, NULL, false); @@ -920,12 +920,12 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_cursor_t *out, fr_cursor_init(&from, &box); fr_cursor_merge(out, &from); - rad_assert(!box); + fr_assert(!box); } break; default: - rad_assert(0); + fr_assert(0); return XLAT_ACTION_FAIL; } @@ -1088,8 +1088,8 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_cursor_t *out, xlat_exp_t cons case XLAT_ALTERNATE: XLAT_DEBUG("** [%i] %s(alternate) - %%{%%{%s}:-%%{%s}}", unlang_interpret_stack_depth(request), __FUNCTION__, node->child->fmt, node->alternate->fmt); - rad_assert(node->child != NULL); - rad_assert(node->alternate != NULL); + fr_assert(node->child != NULL); + fr_assert(node->alternate != NULL); *child = node->child; xa = XLAT_ACTION_PUSH_CHILD; @@ -1349,8 +1349,8 @@ static char *xlat_aprint(TALLOC_CTX *ctx, REQUEST *request, xlat_exp_t const * c case XLAT_ALTERNATE: XLAT_DEBUG("%.*sxlat_aprint ALTERNATE", lvl, xlat_spaces); - rad_assert(node->child != NULL); - rad_assert(node->alternate != NULL); + fr_assert(node->child != NULL); + fr_assert(node->alternate != NULL); /* * Call xlat_process recursively. The child / @@ -1509,11 +1509,11 @@ static ssize_t _xlat_eval_compiled(TALLOC_CTX *ctx, char **out, size_t outlen, R char *buff; ssize_t len; - rad_assert(node != NULL); + fr_assert(node != NULL); len = xlat_process(ctx, &buff, request, node, escape, escape_ctx); if ((len < 0) || !buff) { - rad_assert(buff == NULL); + fr_assert(buff == NULL); if (*out) **out = '\0'; return len; } @@ -1595,7 +1595,7 @@ static ssize_t _xlat_eval(TALLOC_CTX *ctx, char **out, size_t outlen, REQUEST *r ssize_t xlat_eval(char *out, size_t outlen, REQUEST *request, char const *fmt, xlat_escape_t escape, void const *escape_ctx) { - rad_assert(done_init); + fr_assert(done_init); return _xlat_eval(request, &out, outlen, request, fmt, escape, escape_ctx); } @@ -1603,7 +1603,7 @@ ssize_t xlat_eval(char *out, size_t outlen, REQUEST *request, ssize_t xlat_eval_compiled(char *out, size_t outlen, REQUEST *request, xlat_exp_t const *xlat, xlat_escape_t escape, void const *escape_ctx) { - rad_assert(done_init); + fr_assert(done_init); return _xlat_eval_compiled(request, &out, outlen, request, xlat, escape, escape_ctx); } @@ -1611,7 +1611,7 @@ ssize_t xlat_eval_compiled(char *out, size_t outlen, REQUEST *request, ssize_t xlat_aeval(TALLOC_CTX *ctx, char **out, REQUEST *request, char const *fmt, xlat_escape_t escape, void const *escape_ctx) { - rad_assert(done_init); + fr_assert(done_init); *out = NULL; return _xlat_eval(ctx, out, 0, request, fmt, escape, escape_ctx); @@ -1620,7 +1620,7 @@ ssize_t xlat_aeval(TALLOC_CTX *ctx, char **out, REQUEST *request, char const *fm ssize_t xlat_aeval_compiled(TALLOC_CTX *ctx, char **out, REQUEST *request, xlat_exp_t const *xlat, xlat_escape_t escape, void const *escape_ctx) { - rad_assert(done_init); + fr_assert(done_init); *out = NULL; return _xlat_eval_compiled(ctx, out, 0, request, xlat, escape, escape_ctx); @@ -1654,7 +1654,7 @@ int xlat_aeval_compiled_argv(TALLOC_CTX *ctx, char ***argv, REQUEST *request, MEM(my_argv = talloc_zero_array(ctx, char *, xlat->count + 1)); *argv = my_argv; - rad_assert(done_init); + fr_assert(done_init); for (i = 0, node = xlat; node != NULL; i++, node = node->next) { my_argv[i] = NULL; @@ -1681,7 +1681,7 @@ int xlat_flatten_compiled_argv(TALLOC_CTX *ctx, xlat_exp_t const ***argv, xlat_e MEM(my_argv = talloc_zero_array(ctx, xlat_exp_t const *, xlat->count + 1)); *argv = my_argv; - rad_assert(done_init); + fr_assert(done_init); for (i = 0, node = xlat; node != NULL; i++, node = node->next) { my_argv[i] = node->child; @@ -1819,7 +1819,7 @@ int xlat_eval_walk(xlat_exp_t *exp, xlat_walker_t walker, xlat_type_t type, void int xlat_eval_init(void) { - rad_assert(!done_init); + fr_assert(!done_init); if (fr_dict_autoload(xlat_eval_dict) < 0) { PERROR("%s", __FUNCTION__); diff --git a/src/lib/unlang/xlat_inst.c b/src/lib/unlang/xlat_inst.c index 607e54de0dd..0a77803f37e 100644 --- a/src/lib/unlang/xlat_inst.c +++ b/src/lib/unlang/xlat_inst.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -82,7 +82,7 @@ static int _xlat_thread_inst_cmp(void const *a, void const *b) */ static int _xlat_thread_inst_detach(xlat_thread_inst_t *thread_inst) { - rad_assert(thread_inst->node->type == XLAT_FUNC); + fr_assert(thread_inst->node->type == XLAT_FUNC); if (thread_inst->node->xlat->thread_detach) { (void) thread_inst->node->xlat->thread_detach(thread_inst->data, thread_inst->node->xlat->thread_uctx); @@ -127,8 +127,8 @@ static xlat_thread_inst_t *xlat_thread_inst_alloc(TALLOC_CTX *ctx, xlat_inst_t * thread_inst->node = inst->node; - rad_assert(inst->node->type == XLAT_FUNC); - rad_assert(!inst->node->thread_inst); /* May be missing inst, but this is OK */ + fr_assert(inst->node->type == XLAT_FUNC); + fr_assert(!inst->node->thread_inst); /* May be missing inst, but this is OK */ talloc_set_destructor(thread_inst, _xlat_thread_inst_detach); if (inst->node->xlat->thread_inst_size) { @@ -159,7 +159,7 @@ static xlat_thread_inst_t *xlat_thread_inst_alloc(TALLOC_CTX *ctx, xlat_inst_t * static int _xlat_inst_detach(xlat_inst_t *inst) { (void)talloc_get_type_abort_const(inst->node, xlat_exp_t); - rad_assert(inst->node->type == XLAT_FUNC); + fr_assert(inst->node->type == XLAT_FUNC); /* * Remove permanent data from the instance tree. @@ -193,9 +193,9 @@ static xlat_inst_t *xlat_inst_alloc(xlat_exp_t *node) (void)talloc_get_type_abort(node, xlat_exp_t); - rad_assert(xlat_inst_tree); /* xlat_inst_init must have been called */ - rad_assert(node->type == XLAT_FUNC); - rad_assert(!node->inst); + fr_assert(xlat_inst_tree); /* xlat_inst_init must have been called */ + fr_assert(node->type == XLAT_FUNC); + fr_assert(!node->inst); if (node->xlat->inst_size) { MEM(inst = talloc_zero_pooled_object(node, xlat_inst_t, 1, node->xlat->inst_size)); @@ -237,7 +237,7 @@ static xlat_inst_t *xlat_inst_alloc(xlat_exp_t *node) */ static int _xlat_instantiate_ephemeral_walker(xlat_exp_t *node, UNUSED void *uctx) { - rad_assert(!node->inst && !node->thread_inst); + fr_assert(!node->inst && !node->thread_inst); node->inst = xlat_inst_alloc(node); if (!node->inst) return -1; @@ -324,13 +324,13 @@ xlat_thread_inst_t *xlat_thread_instance_find(xlat_exp_t const *node) { xlat_thread_inst_t *found; - rad_assert(xlat_thread_inst_tree); - rad_assert(node->type == XLAT_FUNC); + fr_assert(xlat_thread_inst_tree); + fr_assert(node->type == XLAT_FUNC); if (node->ephemeral) return node->thread_inst; found = rbtree_finddata(xlat_thread_inst_tree, &(xlat_thread_inst_t){ .node = node }); - rad_assert(found); + fr_assert(found); return found; } @@ -436,8 +436,8 @@ static int _xlat_bootstrap_walker(xlat_exp_t *node, UNUSED void *uctx) { bool ret; - rad_assert(node->type == XLAT_FUNC); - rad_assert(!node->inst && !node->thread_inst); + fr_assert(node->type == XLAT_FUNC); + fr_assert(!node->inst && !node->thread_inst); node->inst = xlat_inst_alloc(node); if (!node->inst) return -1; @@ -467,7 +467,7 @@ int xlat_bootstrap(xlat_exp_t *root) * If thread instantiate has been called, it's too late to * bootstrap new xlats. */ - rad_assert(!xlat_thread_inst_tree); + fr_assert(!xlat_thread_inst_tree); if (!xlat_inst_tree) xlat_instantiate_init(); diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c index a170266b8b6..b83df8d2a96 100644 --- a/src/lib/unlang/xlat_tokenize.c +++ b/src/lib/unlang/xlat_tokenize.c @@ -26,7 +26,7 @@ RCSID("$Id$") -#include +#include #include #include #include @@ -121,10 +121,10 @@ static ssize_t xlat_tokenize_alternation(TALLOC_CTX *ctx, xlat_exp_t **head, cha char const *p = in; xlat_exp_t *node; - rad_assert(in[0] == '%'); - rad_assert(in[1] == '{'); - rad_assert(in[2] == '%'); - rad_assert(in[3] == '{'); + fr_assert(in[0] == '%'); + fr_assert(in[1] == '{'); + fr_assert(in[2] == '%'); + fr_assert(in[3] == '{'); XLAT_DEBUG("ALTERNATE <-- %s", in); @@ -208,8 +208,8 @@ static inline ssize_t xlat_tokenize_regex(TALLOC_CTX *ctx, xlat_exp_t **head, ch */ if (inlen < 4) return 0; - rad_assert(in[0] == '%'); - rad_assert(in[1] == '{'); + fr_assert(in[0] == '%'); + fr_assert(in[1] == '{'); p = in + 2; end = in + inlen; @@ -272,8 +272,8 @@ static inline ssize_t xlat_tokenize_function(TALLOC_CTX *ctx, xlat_exp_t **head, if (inlen < 2) return 0; - rad_assert(in[0] == '%'); - rad_assert(in[1] == '{'); + fr_assert(in[0] == '%'); + fr_assert(in[1] == '{'); p = in + 2; end = in + inlen; @@ -352,8 +352,8 @@ static inline ssize_t xlat_tokenize_attribute(TALLOC_CTX *ctx, xlat_exp_t **head if (inlen < 2) return 0; - rad_assert(in[0] == '%'); - rad_assert(in[1] == '{'); + fr_assert(in[0] == '%'); + fr_assert(in[1] == '{'); if (rules) { memcpy(&our_rules, rules, sizeof(our_rules)); @@ -431,8 +431,8 @@ static ssize_t xlat_tokenize_expansion(TALLOC_CTX *ctx, xlat_exp_t **head, char if (inlen < 2) return 0; - rad_assert(in[0] == '%'); - rad_assert(in[1] == '{'); + fr_assert(in[0] == '%'); + fr_assert(in[1] == '{'); /* * %{%{...}:-bar} @@ -529,7 +529,7 @@ static ssize_t xlat_tokenize_expansion(TALLOC_CTX *ctx, xlat_exp_t **head, char case '[': slen = xlat_tokenize_attribute(ctx, head, in, inlen, rules); if (slen < 0) return slen; - rad_assert(slen != 0); + fr_assert(slen != 0); p += slen; break; @@ -612,7 +612,7 @@ static ssize_t xlat_tokenize_literal(TALLOC_CTX *ctx, xlat_exp_t **head, char co } p += slen; - rad_assert(node->next != NULL); + fr_assert(node->next != NULL); /* * Short-circuit the recursive call. @@ -628,7 +628,7 @@ static ssize_t xlat_tokenize_literal(TALLOC_CTX *ctx, xlat_exp_t **head, char co * LITERAL " bar" */ slen = xlat_tokenize_literal(node->next, &(node->next->next), p, end - p, brace, rules); - rad_assert(slen != 0); + fr_assert(slen != 0); if (slen < 0) { talloc_free(node); return slen - (p - in); @@ -683,7 +683,7 @@ static ssize_t xlat_tokenize_literal(TALLOC_CTX *ctx, xlat_exp_t **head, char co * And recurse. */ slen = xlat_tokenize_literal(node->next, &(node->next->next), p, end - p, brace, rules); - rad_assert(slen != 0); + fr_assert(slen != 0); if (slen < 0) { talloc_free(node); return slen - (p - in); @@ -927,7 +927,7 @@ ssize_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_t **head, char const *in, s static void xlat_tokenize_debug(REQUEST *request, xlat_exp_t const *node) { - rad_assert(node != NULL); + fr_assert(node != NULL); RINDENT(); while (node) { @@ -950,9 +950,9 @@ static void xlat_tokenize_debug(REQUEST *request, xlat_exp_t const *node) break; case XLAT_ATTRIBUTE: - rad_assert(node->attr->tmpl_da != NULL); + fr_assert(node->attr->tmpl_da != NULL); RDEBUG3("attribute --> %s", node->attr->tmpl_da->name); - rad_assert(node->child == NULL); + fr_assert(node->child == NULL); if ((node->attr->tmpl_tag != TAG_ANY) || (node->attr->tmpl_num != NUM_ANY)) { RDEBUG3("{"); @@ -978,12 +978,12 @@ static void xlat_tokenize_debug(REQUEST *request, xlat_exp_t const *node) break; case XLAT_VIRTUAL: - rad_assert(node->fmt != NULL); + fr_assert(node->fmt != NULL); RDEBUG3("virtual --> %s", node->fmt); break; case XLAT_FUNC: - rad_assert(node->xlat != NULL); + fr_assert(node->xlat != NULL); RDEBUG3("xlat --> %s", node->xlat->name); if (node->child) { RDEBUG3("{"); diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c index a7eaa7bdc74..68faa4f6269 100644 --- a/src/lib/util/debug.c +++ b/src/lib/util/debug.c @@ -1324,7 +1324,7 @@ void fr_fault_set_log_fd(int fd) * @param[in] ... Arguments for msg string. * @return the value of cond. */ -bool fr_cond_assert_fail(char const *file, int line, char const *expr, char const *msg, ...) +bool _fr_assert_fail(char const *file, int line, char const *expr, char const *msg, ...) { if (msg) { char str[256]; /* Decent compilers won't allocate this unless fmt is !NULL... */ @@ -1351,87 +1351,68 @@ bool fr_cond_assert_fail(char const *file, int line, char const *expr, char cons return false; } -/* - * Logs an error message and aborts the program +/** A fatal assertion which triggers the fault handler in debug builds or exits * + * @param[in] file the assertion failed in. + * @param[in] line of the assertion in the file. + * @param[in] expr that was evaluated. + * @param[in] msg Message to print (may be NULL). + * @param[in] ... Arguments for msg string. */ -#ifndef NDEBUG -bool fr_assert_exit(char const *file, unsigned int line, char const *expr) -{ - FR_FAULT_LOG("ASSERT FAILED %s[%u]: %s", file, line, expr); - fr_fault(SIGABRT); - fr_exit_now(1); -} -#else -bool fr_assert_exit(char const *file, unsigned int line, char const *expr) +void _fr_assert_fatal(char const *file, int line, char const *expr, char const *msg, ...) { - FR_FAULT_LOG("ASSERT WOULD FAIL %s[%u]: %s", file, line, expr); - return false; -} -#endif - + if (msg) { + char str[256]; /* Decent compilers won't allocate this unless fmt is !NULL... */ + va_list ap; -/** Exit possibly printing a message about why we're exiting. - * - * @note Use the fr_exit(status) macro instead of calling this function directly. - * - * @param file where fr_exit() was called. - * @param line where fr_exit() was called. - * @param status we're exiting with. - */ -#ifndef NDEBUG -void NEVER_RETURNS _fr_exit(char const *file, int line, int status) -{ - char const *error = fr_strerror(); + va_start(ap, msg); + (void)vsnprintf(str, sizeof(str), msg, ap); + va_end(ap); - if (error && *error && (status != 0)) { - FR_FAULT_LOG("EXIT(%i) CALLED %s[%u]. Last error was: %s", status, file, line, error); + FR_FAULT_LOG("FATAL ASSERT %s[%u]: %s: %s", file, line, expr, str); } else { - FR_FAULT_LOG("EXIT(%i) CALLED %s[%u]", status, file, line); + FR_FAULT_LOG("FATAL ASSERT %s[%u]: %s", file, line, expr); } - fr_debug_break(false); /* If running under GDB we'll break here */ +#ifdef NDEBUG + _fr_exit_now(file, line, 128 + SIGABRT); - exit(status); -} #else -void NEVER_RETURNS _fr_exit(UNUSED char const *file, UNUSED int line, int status) -{ - fr_debug_break(false); /* If running under GDB we'll break here */ - - exit(status); -} + fr_fault(SIGABRT); + _Exit(128 + SIGABRT); /* Don't hit the debugger twice */ #endif +} /** Exit possibly printing a message about why we're exiting. * - * @note Use the fr_exit_now(status) macro instead of calling this function directly. + * @note Use the fr_exit(status) macro instead of calling this function directly. * - * @param file where fr_exit_now() was called. - * @param line where fr_exit_now() was called. - * @param status we're exiting with. + * @param[in] file where fr_exit() was called. + * @param[in] line where fr_exit() was called. + * @param[in] status we're exiting with. + * @param[in] now Exit immediately. */ #ifndef NDEBUG -void NEVER_RETURNS _fr_exit_now(char const *file, int line, int status) +void NEVER_RETURNS _fr_exit(char const *file, int line, int status, bool now) { char const *error = fr_strerror(); if (error && *error && (status != 0)) { - FR_FAULT_LOG("_EXIT(%i) CALLED %s[%u]. Last error was: %s", status, file, line, error); + FR_FAULT_LOG("%sEXIT(%i) CALLED %s[%u]. Last error was: %s", now ? "_" : "", status, file, line, error); } else { - FR_FAULT_LOG("_EXIT(%i) CALLED %s[%u]", status, file, line); + FR_FAULT_LOG("%sEXIT(%i) CALLED %s[%u]", now ? "_" : "", status, file, line); } - fr_debug_break(false); /* If running under GDB we'll break here */ + if (status != EXIT_SUCCESS) fr_debug_break(false); /* If running under GDB we'll break here */ - _exit(status); + now ? _Exit(status) : exit(status); } #else -void NEVER_RETURNS _fr_exit_now(UNUSED char const *file, UNUSED int line, int status) +void NEVER_RETURNS _fr_exit(UNUSED char const *file, UNUSED int line, int status, bool now) { - fr_debug_break(false); /* If running under GDB we'll break here */ + if (status != EXIT_SUCCESS) fr_debug_break(false); /* If running under GDB we'll break here */ - _exit(status); + now ? _Exit(status) : exit(status); } #endif diff --git a/src/lib/util/debug.h b/src/lib/util/debug.h index 0e67a79e476..9fa3b783139 100644 --- a/src/lib/util/debug.h +++ b/src/lib/util/debug.h @@ -32,7 +32,7 @@ extern "C" { #ifdef NO_ASSERT # define MEM(x) error "Use of MEM() not allowed in this source file. Deal with memory allocation failure gracefully" #else -# define MEM(x) do { if (!(x)) { fr_cond_assert_msg((x), "OUT OF MEMORY"); _fr_exit_now(__FILE__, __LINE__, EXIT_FAILURE); } } while (0) +# define MEM(x) do { if (!(x)) { fr_cond_assert_msg((x), "OUT OF MEMORY"); _fr_exit(__FILE__, __LINE__, EXIT_FAILURE, true); } } while (0) #endif typedef enum { @@ -62,29 +62,70 @@ typedef void (*fr_fault_log_t)(char const *msg, ...) CC_HINT(format (printf, 1, typedef int (*fr_fault_cb_t)(int signum); typedef struct fr_bt_marker fr_bt_marker_t; -int fr_get_lsan_state(void); -int fr_get_debug_state(void); -void fr_debug_state_store(void); -char const *fr_debug_state_to_msg(fr_debug_state_t state); -void fr_debug_break(bool always); -void backtrace_print(fr_fring_t *fring, void *obj); -int fr_backtrace_do(fr_bt_marker_t *marker); -fr_bt_marker_t *fr_backtrace_attach(fr_fring_t **fring, TALLOC_CTX *obj); - -void fr_panic_on_free(TALLOC_CTX *ctx); -int fr_set_dumpable_init(void); -int fr_set_dumpable(bool allow_core_dumps); -int fr_reset_dumpable(void); -int fr_log_talloc_report(TALLOC_CTX const *ctx); -void fr_fault(int sig); -void fr_talloc_fault_setup(void); -void fr_disable_null_tracking_on_free(TALLOC_CTX *ctx); -int fr_fault_setup(TALLOC_CTX *ctx, char const *cmd, char const *program); -void fr_fault_set_cb(fr_fault_cb_t func); -void fr_fault_set_log_fd(int fd); -void fr_fault_log(char const *msg, ...) CC_HINT(format (printf, 1, 2)); -bool fr_cond_assert_fail(char const *file, int line, char const *expr, char const *msg, ...) - CC_HINT(format (printf, 4, 5)); +int fr_get_lsan_state(void); + +int fr_get_debug_state(void); + +void fr_debug_state_store(void); + +char const *fr_debug_state_to_msg(fr_debug_state_t state); + +void fr_debug_break(bool always); + +void backtrace_print(fr_fring_t *fring, void *obj); + +int fr_backtrace_do(fr_bt_marker_t *marker); + +fr_bt_marker_t *fr_backtrace_attach(fr_fring_t **fring, TALLOC_CTX *obj); + +void fr_panic_on_free(TALLOC_CTX *ctx); + +int fr_set_dumpable_init(void); + +int fr_set_dumpable(bool allow_core_dumps); + +int fr_reset_dumpable(void); + +int fr_log_talloc_report(TALLOC_CTX const *ctx); + +void fr_fault(int sig); + +void fr_talloc_fault_setup(void); + +void fr_disable_null_tracking_on_free(TALLOC_CTX *ctx); + +int fr_fault_setup(TALLOC_CTX *ctx, char const *cmd, char const *program); + +void fr_fault_set_cb(fr_fault_cb_t func); + +void fr_fault_set_log_fd(int fd); + +void fr_fault_log(char const *msg, ...) CC_HINT(format (printf, 1, 2)); + +/** @name Assertion support functions + * @{ + */ +bool _fr_assert_fail(char const *file, int line, char const *expr, char const *msg, ...) + CC_HINT(format (printf, 4, 5)); + +void NEVER_RETURNS _fr_assert_fatal(char const *file, int line, char const *expr, char const *msg, ...) + CC_HINT(format (printf, 4, 5)); + +void NEVER_RETURNS _fr_exit(char const *file, int line, int status, bool now); +/** @} */ + +/** @name Assertion and exit macros + * @{ + */ + +/** For systems with an old version libc, define static_assert. + * + */ +#ifndef static_assert +# define static_assert _Static_assert +# else +# include +#endif /** Calls panic_action ifndef NDEBUG, else logs error and evaluates to value of _x * @@ -99,16 +140,37 @@ bool fr_cond_assert_fail(char const *file, int line, char const *expr, char con * * @param _x expression to test (should evaluate to true) */ -#define fr_cond_assert(_x) likely((bool)((_x) ? true : (fr_cond_assert_fail(__FILE__, __LINE__, #_x, NULL) && false))) +#define fr_cond_assert(_x) likely((bool)((_x) ? true : (_fr_assert_fail(__FILE__, __LINE__, #_x, NULL) && false))) -/** Calls panic_action ifndef NDEBUG, else logs error +/** Calls panic_action ifndef NDEBUG, else logs error and evaluates to value of _x * - * @param[in] _msg to log. - * @param[in] ... args. + * Should be wrapped in a condition, and if false, should cause function to return + * an error code. This allows control to return to the caller if a precondition is + * not satisfied and we're not debugging. + * + * Example: + @verbatim + if (!fr_cond_assert_msg(request, "Bad stuff happened: %s", fr_syserror(errno)))) return -1 + @endverbatim + * + * @param _x expression to test (should evaluate to true) + * @param _fmt of message to log. + * @param ... fmt arguments. */ -#define fr_assert_fail(_msg, ...) fr_cond_assert_fail(__FILE__, __LINE__, "false", _msg, ## __VA_ARGS__) +#define fr_cond_assert_msg(_x, _fmt, ...) likely((bool)((_x) ? true : (_fr_assert_fail(__FILE__, __LINE__, #_x, _fmt, ## __VA_ARGS__) && false))) -/** Calls panic_action ifndef NDEBUG, else logs error and evaluates to value of _x +/** Calls panic_action ifndef NDEBUG, else logs error and causes the server to exit immediately with code 134 + * + * Example: + @verbatim + fr_fatal_assert(); + @endverbatim + * + * @param _x expression to test (should evaluate to true) + */ +#define fr_fatal_assert(_x) (likely((bool)((_x)) || _fr_assert_exit(__FILE__, __LINE__, #_x, NULL)) + +/** Calls panic_action ifndef NDEBUG, else logs error and causes the server to exit immediately with code 134 * * Should be wrapped in a condition, and if false, should cause function to return * an error code. This allows control to return to the caller if a precondition is @@ -116,26 +178,53 @@ bool fr_cond_assert_fail(char const *file, int line, char const *expr, char con * * Example: @verbatim - if (!fr_cond_assert_msg(request, "Bad stuff happened: %s", fr_syserror(errno)))) return -1 + fr_fatal_assert(); @endverbatim * * @param _x expression to test (should evaluate to true) * @param _fmt of message to log. * @param ... fmt arguments. */ -#define fr_cond_assert_msg(_x, _fmt, ...) likely((bool)((_x) ? true : (fr_cond_assert_fail(__FILE__, __LINE__, #_x, _fmt, ## __VA_ARGS__) && false))) +#define fr_fatal_assert_msg(_x) (likely((bool)((_x) || _fr_assert_fatal(__FILE__, __LINE__, #_x, _fmt, ## __VA_ARGS__)) -#ifndef NDEBUG -bool fr_assert_exit(char const *file, unsigned int line, char const *expr) CC_HINT(noreturn); +/** Calls panic_action ifndef NDEBUG, else logs error and causes the server to exit immediately with code 134 + * + * @param[in] _msg to log. + * @param[in] ... args. + */ +#define fr_assert_fatal_fail(_msg, ...) _fr_assert_fatal(__FILE__, __LINE__, "false", _msg, ## __VA_ARGS__) + +#ifdef NDEBUG +# define fr_assert(_x) +#elif !defined(__clang_analyzer__) +/** Calls panic_action ifndef NDEBUG, else logs error + * + * @param _x expression to test (should evaluate to true) + */ +# define fr_assert(_x) (likely((bool)(_x)) || _fr_assert_fail(__FILE__, __LINE__, #_x, NULL)) +/** Calls panic_action ifndef NDEBUG, else logs error + * + * @param[in] _msg to log. + * @param[in] ... args. + */ +#define fr_assert_fail(_msg, ...) _fr_assert_fail(__FILE__, __LINE__, "false", _msg, ## __VA_ARGS__) #else -bool fr_assert_exit(char const *file, unsigned int line, char const *expr); +# include +# define fr_assert assert #endif -void NEVER_RETURNS _fr_exit(char const *file, int line, int status); -# define fr_exit(_x) _fr_exit(__FILE__, __LINE__, (_x)) +/** Exit, producing a log message in debug builds + * + * @param[in] _x code to exit with. + */ +# define fr_exit(_x) _fr_exit(__FILE__, __LINE__, (_x), false) -void NEVER_RETURNS _fr_exit_now(char const *file, int line, int status); -# define fr_exit_now(_x) _fr_exit_now(__FILE__, __LINE__, (_x)) +/** Exit without calling atexit() handlers, producing a log message in debug builds + * + * @param[in] _x code to exit with. + */ +# define fr_exit_now(_x) _fr_exit(__FILE__, __LINE__, (_x), true) +/** @} */ void fr_sign_struct(void *ptr, size_t size, size_t offset); void fr_verify_struct(void const *ptr, size_t size, size_t offset); diff --git a/src/lib/util/dl.c b/src/lib/util/dl.c index a2a80473d44..123564388a9 100644 --- a/src/lib/util/dl.c +++ b/src/lib/util/dl.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -113,7 +113,7 @@ static int dl_symbol_init_cmp(void const *one, void const *two) dl_symbol_init_t const *a = one, *b = two; int ret; - rad_assert(a && b); + fr_assert(a && b); ret = ((void *)a->func > (void *)b->func) - ((void *)a->func < (void *)b->func); if (ret != 0) return ret; @@ -135,7 +135,7 @@ static int dl_symbol_free_cmp(void const *one, void const *two) dl_symbol_free_t const *a = one, *b = two; int ret; - rad_assert(a && b); + fr_assert(a && b); ret = ((void *)a->func > (void *)b->func) - ((void *)a->func < (void *)b->func); if (ret != 0) return ret; diff --git a/src/lib/util/event.c b/src/lib/util/event.c index 2fb3e670d1b..1844c146c56 100644 --- a/src/lib/util/event.c +++ b/src/lib/util/event.c @@ -957,7 +957,7 @@ int fr_event_filter_insert(TALLOC_CTX *ctx, fr_event_list_t *el, int fd, * functions associated with the file descriptor. */ } else { - rad_assert(ef->is_registered == true); + fr_assert(ef->is_registered == true); /* * Take a copy of the current set of active @@ -1057,7 +1057,7 @@ static int _event_timer_free(fr_event_timer_t *ev) } ev_p = ev->parent; - rad_assert(*(ev->parent) == ev); + fr_assert(*(ev->parent) == ev); *ev_p = NULL; /* @@ -1135,7 +1135,7 @@ int fr_event_timer_at(TALLOC_CTX *ctx, fr_event_list_t *el, fr_event_timer_t con } else { memcpy(&ev, ev_p, sizeof(ev)); /* Not const to us */ - rad_assert(*ev_p == ev); + fr_assert(*ev_p == ev); /* * We can't disarm the linking context due to @@ -1484,7 +1484,7 @@ int fr_event_timer_run(fr_event_list_t *el, fr_time_t *when) callback = ev->callback; memcpy(&uctx, &ev->uctx, sizeof(uctx)); - rad_assert(*ev->parent == ev); + fr_assert(*ev->parent == ev); /* * Delete the event before calling it. @@ -1665,7 +1665,7 @@ void fr_event_service(fr_event_list_t *el) if (el->events[i].ident == 0) continue; user = talloc_get_type_abort((void *)el->events[i].ident, fr_event_user_t); - rad_assert(user->ident == el->events[i].ident); + fr_assert(user->ident == el->events[i].ident); user->callback(el->kq, &el->events[i], user->uctx); } @@ -1678,8 +1678,8 @@ void fr_event_service(fr_event_list_t *el) pev = talloc_get_type_abort((void *)el->events[i].udata, fr_event_pid_t); - rad_assert(pev->pid == (pid_t) el->events[i].ident); - rad_assert((el->events[i].fflags & NOTE_EXIT) != 0); + fr_assert(pev->pid == (pid_t) el->events[i].ident); + fr_assert((el->events[i].fflags & NOTE_EXIT) != 0); pid = pev->pid; pev->pid = 0; /* so we won't hit kevent again when it's freed */ @@ -1866,7 +1866,7 @@ service: (void)fr_dlist_remove(&el->ev_to_add, ev); if (unlikely(fr_heap_insert(el->times, ev) < 0)) { talloc_free(ev); - rad_assert(0); /* Die in debug builds */ + fr_assert(0); /* Die in debug builds */ } } diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c new file mode 100644 index 00000000000..256517acb2f --- /dev/null +++ b/src/lib/util/pair_print.c @@ -0,0 +1,282 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/** Pair serialisation API + * + * @file src/lib/util/pair_print.c + * + * @copyright 2020 The FreeRADIUS server project + */ + +char *fr_pair_type_asprint(TALLOC_CTX *ctx, fr_type_t type) +{ + switch (type) { + case FR_TYPE_STRING : + return talloc_typed_strdup(ctx, "_"); + + case FR_TYPE_UINT64: + case FR_TYPE_SIZE: + case FR_TYPE_INT32: + case FR_TYPE_UINT8: + case FR_TYPE_UINT16: + case FR_TYPE_UINT32: + case FR_TYPE_DATE: + return talloc_typed_strdup(ctx, "0"); + + case FR_TYPE_IPV4_ADDR: + return talloc_typed_strdup(ctx, "?.?.?.?"); + + case FR_TYPE_IPV4_PREFIX: + return talloc_typed_strdup(ctx, "?.?.?.?/?"); + + case FR_TYPE_IPV6_ADDR: + return talloc_typed_strdup(ctx, "[:?:]"); + + case FR_TYPE_IPV6_PREFIX: + return talloc_typed_strdup(ctx, "[:?:]/?"); + + case FR_TYPE_OCTETS: + return talloc_typed_strdup(ctx, "??"); + + case FR_TYPE_ETHERNET: + return talloc_typed_strdup(ctx, "??:??:??:??:??:??:??:??"); + +#ifdef WITH_ASCEND_BINARY + case FR_TYPE_ABINARY: + return talloc_typed_strdup(ctx, "??"); +#endif + + case FR_TYPE_GROUP: + return talloc_typed_strdup(ctx, "{ ? }"); + + default : + break; + } + + return talloc_typed_strdup(ctx, ""); +} + +/** Print one attribute and value to a string + * + * Print a VALUE_PAIR in the format: +@verbatim + [:tag] +@endverbatim + * to a string. + * + * @param out Where to write the string. + * @param outlen Length of output buffer. + * @param vp to print. + * @return + * - Length of data written to out. + * - value >= outlen on truncation. + */ +size_t fr_pair_snprint(char *out, size_t outlen, VALUE_PAIR const *vp) +{ + char const *token = NULL; + size_t len, freespace = outlen; + + if (!out) return 0; + + *out = '\0'; + if (!vp || !vp->da) return 0; + + VP_VERIFY(vp); + + if ((vp->op > T_INVALID) && (vp->op < T_TOKEN_LAST)) { + token = fr_tokens[vp->op]; + } else { + token = ""; + } + + if (vp->da->flags.has_tag && (vp->tag != 0) && (vp->tag != TAG_ANY)) { + len = snprintf(out, freespace, "%s:%d %s ", vp->da->name, vp->tag, token); + } else { + len = snprintf(out, freespace, "%s %s ", vp->da->name, token); + } + + if (is_truncated(len, freespace)) return len; + out += len; + freespace -= len; + + len = fr_pair_value_snprint(out, freespace, vp, '"'); + if (is_truncated(len, freespace)) return (outlen - freespace) + len; + freespace -= len; + + return (outlen - freespace); +} + +/** Print one attribute and value to FP + * + * Complete string with '\\t' and '\\n' is written to buffer before printing to + * avoid issues when running with multiple threads. + * + * @param fp to output to. + * @param vp to print. + */ +void fr_pair_fprint(FILE *fp, VALUE_PAIR const *vp) +{ + char buf[1024]; + char *p = buf; + size_t len; + + if (!fp) return; + VP_VERIFY(vp); + + *p++ = '\t'; + len = fr_pair_snprint(p, sizeof(buf) - 1, vp); + if (!len) { + return; + } + p += len; + + /* + * Deal with truncation gracefully + */ + if (((size_t) (p - buf)) >= (sizeof(buf) - 2)) { + p = buf + (sizeof(buf) - 2); + } + + *p++ = '\n'; + *p = '\0'; + + fputs(buf, fp); +} + + +/** Print a list of attributes and enumv + * + * @param[in] log to output to. + * @param[in] vp to print. + * @param[in] file where the message originated + * @param[in] line where the message originated + */ +void _fr_pair_list_log(fr_log_t const *log, VALUE_PAIR const *vp, char const *file, int line) +{ + VALUE_PAIR *our_vp; + fr_cursor_t cursor; + + memcpy(&our_vp, &vp, sizeof(vp)); /* const work-arounds */ + + for (vp = fr_cursor_init(&cursor, &our_vp); vp; vp = fr_cursor_next(&cursor)) { + fr_log(log, L_DBG, file, line, "\t%pP", vp); + } +} + +/** Print one attribute and value to a string + * + * Print a VALUE_PAIR in the format: +@verbatim + [:tag] +@endverbatim + * to a string. + * + * @param ctx to allocate string in. + * @param vp to print. + * @param[in] quote the quotation character + * @return a talloced buffer with the attribute operator and value. + */ +char *fr_pair_asprint(TALLOC_CTX *ctx, VALUE_PAIR const *vp, char quote) +{ + char const *token = NULL; + char *str, *value; + + if (!vp || !vp->da) return 0; + + VP_VERIFY(vp); + + if ((vp->op > T_INVALID) && (vp->op < T_TOKEN_LAST)) { + token = fr_tokens[vp->op]; + } else { + token = ""; + } + + value = fr_pair_value_asprint(ctx, vp, quote); + + if (vp->da->flags.has_tag) { + if (quote && (vp->vp_type == FR_TYPE_STRING)) { + str = talloc_typed_asprintf(ctx, "%s:%d %s %c%s%c", vp->da->name, vp->tag, token, quote, value, quote); + } else { + str = talloc_typed_asprintf(ctx, "%s:%d %s %s", vp->da->name, vp->tag, token, value); + } + } else { + if (quote && (vp->vp_type == FR_TYPE_STRING)) { + str = talloc_typed_asprintf(ctx, "%s %s %c%s%c", vp->da->name, token, quote, value, quote); + } else { + str = talloc_typed_asprintf(ctx, "%s %s %s", vp->da->name, token, value); + } + } + + talloc_free(value); + + return str; +} + +/** Print the attribute portion of a pair (only) + * + * @param[out] out Where to write the output attribute. + * @param[in] end of the output buffer. + * @param[in] vp to print the attribute name for. + * @return + * - >= 0 number of bytes written to out on success. + * - < 0 number of bytes we need to write out the value. + */ +static inline ssize_t fr_pair_snprint_attr(char * const out, char const * const end, VALUE_PAIR const *vp) +{ + char *p = out; + size_t len = strlen(vp->da->name); + + RETURN_SLEN_IF_NO_SPACE(len, p, end); + memcpy(p, vp->da->name, len); + p += len; + + if (vp->tag) { + size_t ret; + + RETURN_SLEN_IF_NO_SPACE(1, p, end); + *p++ = ':'; + + ret = snprintf(p, end - p, "%u", vp->tag); + RETURN_SLEN_IF_TRUNCATED(ret, p, end); + + p += ret; + } + + return p - out; +} + +/** Print a leaf attribute pair i.e. + * + * @param[out] out Where to write the output attribute. + * @param[in] end of the output buffer. + * @param[in] vp to print. + * @param[in] str_quote to use when printing quoted string values. + */ +static inline ssize_t fr_pair_snprintf_leaf(char * const out, char const * const end, + VALUE_PAIR const *vp, char str_quote) +{ + char *p = out; + + if ((vp->op > T_INVALID) && (vp->op < T_TOKEN_LAST)) { + token = fr_tokens[vp->op]; + } else { + token = ""; + } + + fr_value_box_snprint(out, ) +} + + diff --git a/src/lib/util/time.h b/src/lib/util/time.h index 7edf9730cea..883992cc9da 100644 --- a/src/lib/util/time.h +++ b/src/lib/util/time.h @@ -30,7 +30,6 @@ RCSIDH(time_h, "$Id$") * For sys/time.h and time.h */ #include -#include #include #include #include diff --git a/src/lib/util/uint128.h b/src/lib/util/uint128.h index 665c720aecd..6acf0f34a2c 100644 --- a/src/lib/util/uint128.h +++ b/src/lib/util/uint128.h @@ -66,7 +66,7 @@ static inline uint128_t uint128_gen_mask(uint8_t bits) { uint128_t ret; - rad_assert(bits < 128); + fr_assert(bits < 128); if (bits > 64) { ret.l = 0xffffffffffffffff; @@ -190,7 +190,7 @@ static inline uint128_t uint128_mul(uint128_t n, uint128_t m) */ static inline uint128_t uint128_lshift(uint128_t num, uint8_t bits) { - rad_assert(bits < 128); + fr_assert(bits < 128); if (bits >= 64) { num.l = 0; @@ -209,7 +209,7 @@ static inline uint128_t uint128_lshift(uint128_t num, uint8_t bits) */ static inline uint128_t uint128_rshift(uint128_t num, uint8_t bits) { - rad_assert(bits < 128); + fr_assert(bits < 128); if (bits >= 64) { num.h = 0; diff --git a/src/modules/proto_arp/proto_arp.c b/src/modules/proto_arp/proto_arp.c index a1407a527f6..097a9de14e3 100644 --- a/src/modules/proto_arp/proto_arp.c +++ b/src/modules/proto_arp/proto_arp.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c index e4fbebcf309..61f0e5cea24 100644 --- a/src/modules/proto_bfd/proto_bfd.c +++ b/src/modules/proto_bfd/proto_bfd.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include @@ -655,8 +655,8 @@ static void bfd_calc_md5(bfd_state_t *session, bfd_packet_t *bfd) { bfd_auth_md5_t *md5 = &bfd->auth.md5; - rad_assert(session->secret_len <= sizeof(md5->digest)); - rad_assert(md5->auth_len == sizeof(*md5)); + fr_assert(session->secret_len <= sizeof(md5->digest)); + fr_assert(md5->auth_len == sizeof(*md5)); memset(md5->digest, 0, sizeof(md5->digest)); memcpy(md5->digest, session->secret, session->secret_len); @@ -722,8 +722,8 @@ static void bfd_calc_sha1(bfd_state_t *session, bfd_packet_t *bfd) fr_sha1_ctx ctx; bfd_auth_sha1_t *sha1 = &bfd->auth.sha1; - rad_assert(session->secret_len <= sizeof(sha1->digest)); - rad_assert(sha1->auth_len == sizeof(*sha1)); + fr_assert(session->secret_len <= sizeof(sha1->digest)); + fr_assert(sha1->auth_len == sizeof(*sha1)); memset(sha1->digest, 0, sizeof(sha1->digest)); memcpy(sha1->digest, session->secret, session->secret_len); @@ -945,7 +945,7 @@ static int bfd_start_packets(bfd_state_t *session) if (fr_event_timer_in(session, session->el, &session->ev_packet, fr_time_delta_from_usec(interval), bfd_send_packet, session) < 0) { - rad_assert("Failed to insert event" == NULL); + fr_assert("Failed to insert event" == NULL); } return 0; @@ -972,7 +972,7 @@ static void bfd_set_timeout(bfd_state_t *session, fr_time_t when) if (fr_event_timer_at(session, session->el, &session->ev_timeout, now, bfd_detection_timeout, session) < 0) { - rad_assert("Failed to insert event" == NULL); + fr_assert("Failed to insert event" == NULL); } } @@ -989,7 +989,7 @@ static int bfd_start_control(bfd_state_t *session) !session->doing_poll) { DEBUG("BFD %d warning: asked to start UP / UP ?", session->number); - rad_assert(0 == 1); + fr_assert(0 == 1); bfd_stop_control(session); return 0; } @@ -1049,8 +1049,8 @@ static int bfd_stop_poll(bfd_state_t *session) * re-set the timers. */ if (!session->remote_demand_mode) { - rad_assert(session->ev_timeout != NULL); - rad_assert(session->ev_packet != NULL); + fr_assert(session->ev_timeout != NULL); + fr_assert(session->ev_packet != NULL); session->doing_poll = 0; bfd_stop_control(session); @@ -1616,21 +1616,21 @@ static int bfd_init_sessions(CONF_SECTION *cs, bfd_socket_t *sock, int sockfd) */ static int bfd_socket_send(UNUSED rad_listen_t *listener, UNUSED REQUEST *request) { - rad_assert(0 == 1); + fr_assert(0 == 1); return 0; } static int bfd_socket_encode(UNUSED rad_listen_t *listener, UNUSED REQUEST *request) { - rad_assert(0 == 1); + fr_assert(0 == 1); return 0; } static int bfd_socket_decode(UNUSED rad_listen_t *listener, UNUSED REQUEST *request) { - rad_assert(0 == 1); + fr_assert(0 == 1); return 0; } @@ -1658,7 +1658,7 @@ static int bfd_socket_parse(CONF_SECTION *cs, rad_listen_t *this) uint16_t listen_port; fr_ipaddr_t ipaddr; - rad_assert(sock != NULL); + fr_assert(sock != NULL); if (bfd_parse_ip_port(cs, &ipaddr, &listen_port) < 0) { return -1; diff --git a/src/modules/proto_control/proto_control.c b/src/modules/proto_control/proto_control.c index a958ebde13f..d6fbae54f25 100644 --- a/src/modules/proto_control/proto_control.c +++ b/src/modules/proto_control/proto_control.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "proto_control.h" extern fr_app_t proto_control; @@ -101,10 +101,10 @@ static int type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF_ITEM dl_module_inst_t *parent_inst; // fr_dict_enum_t const *type_enum; - rad_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); + fr_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_control")); - rad_assert(parent_inst); + fr_assert(parent_inst); // inst = talloc_get_type_abort(parent_inst->data, proto_control_t); @@ -146,7 +146,7 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF if (!transport_cs) transport_cs = cf_section_alloc(listen_cs, listen_cs, name, NULL); parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_control")); - rad_assert(parent_inst); + fr_assert(parent_inst); /* * Set the allowed codes so that we can compile them as @@ -168,7 +168,7 @@ static int mod_decode(void const *instance, REQUEST *request, uint8_t *const dat fr_io_address_t *address = track->address; RADCLIENT const *client; - rad_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE); /* * Set the request dictionary so that we can do @@ -256,7 +256,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe } client = address->radclient; - rad_assert(client); + fr_assert(client); /* * Dynamic client stuff @@ -264,7 +264,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe if (client->dynamic && !client->active) { RADCLIENT *new_client; - rad_assert(buffer_len >= sizeof(client)); + fr_assert(buffer_len >= sizeof(client)); /* * Allocate the client. If that fails, send back a NAK. @@ -318,7 +318,7 @@ static void mod_entry_point_set(void const *instance, REQUEST *request) return; } - rad_assert(inst->process != NULL); + fr_assert(inst->process != NULL); request->async->process = inst->process; } @@ -517,7 +517,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) * We will need this for dynamic clients and connected sockets. */ inst->io.dl_inst = dl_module_instance_by_data(inst); - rad_assert(inst != NULL); + fr_assert(inst != NULL); /* * Bootstrap the master IO handler. diff --git a/src/modules/proto_control/proto_control_tcp.c b/src/modules/proto_control/proto_control_tcp.c index 48dff1ce81b..e3b5dd18b07 100644 --- a/src/modules/proto_control/proto_control_tcp.c +++ b/src/modules/proto_control/proto_control_tcp.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "proto_control.h" extern fr_app_io_t proto_control_tcp; @@ -210,7 +210,7 @@ static int mod_open(fr_listen_t *li) CONF_SECTION *server_cs; CONF_ITEM *ci; - rad_assert(!inst->connection); + fr_assert(!inst->connection); li->fd = sockfd = fr_socket_server_tcp(&inst->ipaddr, &port, inst->port_name, true); if (sockfd < 0) { @@ -234,9 +234,9 @@ static int mod_open(fr_listen_t *li) inst->sockfd = sockfd; ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); diff --git a/src/modules/proto_control/proto_control_unix.c b/src/modules/proto_control/proto_control_unix.c index a1f9c2a58d7..c8091e93c93 100644 --- a/src/modules/proto_control/proto_control_unix.c +++ b/src/modules/proto_control/proto_control_unix.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -604,7 +604,7 @@ static int fr_server_domain_socket_perm(char const *path, uid_t uid, gid_t gid) socklen_t socklen; struct sockaddr_un salocal; - rad_assert(path); + fr_assert(path); euid = geteuid(); egid = getegid(); @@ -939,7 +939,7 @@ static int mod_open(fr_listen_t *li) CONF_ITEM *ci; CONF_SECTION *server_cs; - rad_assert(!thread->connection); + fr_assert(!thread->connection); if (inst->peercred) { sockfd = fr_server_domain_socket_peercred(inst->filename, inst->uid, inst->gid); @@ -960,9 +960,9 @@ static int mod_open(fr_listen_t *li) li->fd = thread->sockfd = sockfd; ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); @@ -980,7 +980,7 @@ static int mod_open(fr_listen_t *li) thread->radclient.src_ipaddr.af = AF_INET; thread->radclient.server_cs = cf_item_to_section(cf_parent(cf_parent(inst->cs))); - rad_assert(thread->radclient.server_cs != NULL); + fr_assert(thread->radclient.server_cs != NULL); thread->radclient.server = cf_section_name2(thread->radclient.server_cs); return 0; diff --git a/src/modules/proto_detail/proto_detail.c b/src/modules/proto_detail/proto_detail.c index 447ed4f2402..5bf34644e6f 100644 --- a/src/modules/proto_detail/proto_detail.c +++ b/src/modules/proto_detail/proto_detail.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "proto_detail.h" extern fr_app_t proto_detail; @@ -153,7 +153,7 @@ static int type_parse(TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM *ci, U fr_dict_attr_t const *attr_packet_type; proto_detail_t *inst = parent; - rad_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); + fr_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); if (!inst->dict) { cf_log_err(ci, "Please define 'dictionary' BEFORE 'type'"); @@ -179,7 +179,7 @@ static int type_parse(TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM *ci, U inst->code = type_enum->value->vb_uint32; parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_detail")); - rad_assert(parent_inst); + fr_assert(parent_inst); /* * Parent dl_module_inst_t added in virtual_servers.c (listen_parse) @@ -225,7 +225,7 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, if (!transport_cs) transport_cs = cf_section_alloc(listen_cs, listen_cs, name, NULL); parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_detail")); - rad_assert(parent_inst); + fr_assert(parent_inst); return dl_module_instance(ctx, out, transport_cs, parent_inst, name, DL_MODULE_TYPE_SUBMODULE); } @@ -451,7 +451,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, CONF_SECTION *conf) return -1; } - rad_assert(li->app_io->get_name); + fr_assert(li->app_io->get_name); li->name = li->app_io->get_name(li); /* @@ -625,7 +625,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) transport_cs = cf_section_find(inst->cs, "work", NULL); parent_inst = cf_data_value(cf_data_find(inst->cs, dl_module_inst_t, "proto_detail")); - rad_assert(parent_inst); + fr_assert(parent_inst); if (!transport_cs) { transport_cs = cf_section_dup(inst->cs, inst->cs, inst->app_io_conf, diff --git a/src/modules/proto_detail/proto_detail_file.c b/src/modules/proto_detail/proto_detail_file.c index 50ca0f3411b..c1d7da4ff10 100644 --- a/src/modules/proto_detail/proto_detail_file.c +++ b/src/modules/proto_detail/proto_detail_file.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include @@ -387,7 +387,7 @@ static int work_exists(proto_detail_file_thread_t *thread, int fd) } opened = true; - rad_assert(li->app_io->get_name); + fr_assert(li->app_io->get_name); li->name = li->app_io->get_name(li); if (!fr_schedule_listen_add(inst->parent->sc, li)) { @@ -474,7 +474,7 @@ static void work_init(proto_detail_file_thread_t *thread) goto delay; } - rad_assert(thread->vnode_fd < 0); + fr_assert(thread->vnode_fd < 0); /* * See if there is a "detail.work" file. If not, try to @@ -621,7 +621,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) * was. */ dl_inst = dl_module_instance_by_data(instance); - rad_assert(dl_inst); + fr_assert(dl_inst); #ifndef __linux__ /* diff --git a/src/modules/proto_detail/proto_detail_process.c b/src/modules/proto_detail/proto_detail_process.c index 2ef085a0553..5646b5e04dd 100644 --- a/src/modules/proto_detail/proto_detail_process.c +++ b/src/modules/proto_detail/proto_detail_process.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "proto_detail.h" @@ -84,7 +84,7 @@ static rlm_rcode_t mod_process(void *instance, UNUSED void *thread, REQUEST *req if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { /* @@ -156,7 +156,7 @@ static rlm_rcode_t mod_process(void *instance, UNUSED void *thread, REQUEST *req if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: @@ -218,10 +218,10 @@ static int mod_instantiate(void *instance, CONF_SECTION *listen_cs) memset(&parse_rules, 0, sizeof(parse_rules)); parse_rules.dict_def = inst->dict; - rad_assert(listen_cs); + fr_assert(listen_cs); server_cs = cf_item_to_section(cf_parent(listen_cs)); - rad_assert(strcmp(cf_section_name1(server_cs), "server") == 0); + fr_assert(strcmp(cf_section_name1(server_cs), "server") == 0); return virtual_server_compile_sections(server_cs, compile_list, &parse_rules, inst); } diff --git a/src/modules/proto_detail/proto_detail_work.c b/src/modules/proto_detail/proto_detail_work.c index 19b33cbe645..ab064e935e1 100644 --- a/src/modules/proto_detail/proto_detail_work.c +++ b/src/modules/proto_detail/proto_detail_work.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "proto_detail.h" #include @@ -157,8 +157,8 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time uint8_t *stopped_search; off_t done_offset; - rad_assert(*leftover < buffer_len); - rad_assert(thread->fd >= 0); + fr_assert(*leftover < buffer_len); + fr_assert(thread->fd >= 0); MPRINT("AT COUNT %d offset %ld", thread->count, (long) thread->read_offset); @@ -174,7 +174,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time * Don't over-write "leftover" bytes! */ if (*leftover) { - rad_assert(thread->leftover == 0); + fr_assert(thread->leftover == 0); if (!thread->leftover_buffer) MEM(thread->leftover_buffer = talloc_array(thread, uint8_t, buffer_len)); memcpy(thread->leftover_buffer, buffer, *leftover); @@ -182,7 +182,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time *leftover = 0; } - rad_assert(buffer_len >= track->packet_len); + fr_assert(buffer_len >= track->packet_len); memcpy(buffer, track->packet, track->packet_len); DEBUG("Retrying packet %d (retransmission %u)", track->id, track->retry.count); @@ -208,7 +208,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time * we have to check this ourselves. */ if (thread->outstanding >= inst->max_outstanding) { - rad_assert(thread->paused); + fr_assert(thread->paused); return 0; } @@ -217,8 +217,8 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time * copy it back. */ if (thread->leftover) { - rad_assert(*leftover == 0); - rad_assert(thread->leftover < buffer_len); + fr_assert(*leftover == 0); + fr_assert(thread->leftover < buffer_len); memcpy(buffer, thread->leftover_buffer, thread->leftover); *leftover = thread->leftover; @@ -277,7 +277,7 @@ static ssize_t mod_read(fr_listen_t *li, void **packet_ctx, fr_time_t *recv_time * We didn't read any more data from the file, * but there should be data left in the buffer. */ - rad_assert(*leftover > 0); + fr_assert(*leftover > 0); end = buffer + *leftover; } @@ -292,7 +292,7 @@ redo: * Note that all of the data MUST be printable, and raw * LFs are forbidden in attribute contents. */ - rad_assert((buffer + thread->last_search) <= end); + fr_assert((buffer + thread->last_search) <= end); MPRINT("Starting search from offset %ld", thread->last_search); @@ -450,7 +450,7 @@ redo: goto redo; } - rad_assert(*leftover == 0); + fr_assert(*leftover == 0); goto done; } @@ -511,7 +511,7 @@ done: * If we're at EOF, mark us as "closing". */ if (thread->eof) { - rad_assert(!thread->closing); + fr_assert(!thread->closing); thread->closing = (*leftover == 0); MPRINT("AT EOF, BUT CLOSING %d", thread->closing); } @@ -557,7 +557,7 @@ static void work_retransmit(UNUSED fr_event_list_t *el, UNUSED fr_time_t now, vo thread->paused = false; } - rad_assert(thread->fd >= 0); + fr_assert(thread->fd >= 0); /* * Seek to the START of the file, so that the FD will @@ -582,8 +582,8 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, UNUSED fr_time_t req if (buffer_len < 1) return -1; - rad_assert(thread->outstanding > 0); - rad_assert(thread->fd >= 0); + fr_assert(thread->outstanding > 0); + fr_assert(thread->fd >= 0); if (!buffer[0]) { if (track->retry.start == 0) { @@ -716,8 +716,8 @@ static int mod_open(fr_listen_t *li) thread->file_size = 1; } - rad_assert(thread->name == NULL); - rad_assert(thread->filename_work != NULL); + fr_assert(thread->name == NULL); + fr_assert(thread->filename_work != NULL); thread->name = talloc_typed_asprintf(thread, "proto_detail working file %s", thread->filename_work); DEBUG("Listening on %s bound to virtual server %s", @@ -851,7 +851,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) * was. */ dl_inst = dl_module_instance_by_data(instance); - rad_assert(dl_inst); + fr_assert(dl_inst); inst->parent = talloc_get_type_abort(dl_inst->parent->data, proto_detail_t); inst->cs = cs; diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4.c b/src/modules/proto_dhcpv4/proto_dhcpv4.c index a25e4c02f82..dd653d6aa11 100644 --- a/src/modules/proto_dhcpv4/proto_dhcpv4.c +++ b/src/modules/proto_dhcpv4/proto_dhcpv4.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "proto_dhcpv4.h" extern fr_app_t proto_dhcpv4; @@ -136,7 +136,7 @@ static int type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, fr_dict_enum_t const *type_enum; uint32_t code; - rad_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); + fr_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); /* * Allow the process module to be specified by @@ -173,7 +173,7 @@ static int type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, } parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_dhcpv4")); - rad_assert(parent_inst); + fr_assert(parent_inst); /* * Set the allowed codes so that we can compile them as @@ -227,7 +227,7 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, if (!transport_cs) transport_cs = cf_section_alloc(listen_cs, listen_cs, name, NULL); parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_dhcpv4")); - rad_assert(parent_inst); + fr_assert(parent_inst); /* * Set the allowed codes so that we can compile them as @@ -250,7 +250,7 @@ static int mod_decode(void const *instance, REQUEST *request, uint8_t *const dat RADCLIENT const *client; RADIUS_PACKET *packet = request->packet; - rad_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE); /* * Set the request dictionary so that we can do @@ -340,7 +340,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe } client = address->radclient; - rad_assert(client); + fr_assert(client); /* * Dynamic client stuff @@ -348,7 +348,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe if (client->dynamic && !client->active) { RADCLIENT *new_client; - rad_assert(buffer_len >= sizeof(client)); + fr_assert(buffer_len >= sizeof(client)); /* * Allocate the client. If that fails, send back a NAK. @@ -417,8 +417,8 @@ static void mod_entry_point_set(void const *instance, REQUEST *request) dl_module_inst_t *type_submodule; fr_io_track_t *track = request->async->packet_ctx; - rad_assert(request->packet->code != 0); - rad_assert(request->packet->code < FR_DHCP_MAX); + fr_assert(request->packet->code != 0); + fr_assert(request->packet->code < FR_DHCP_MAX); request->server_cs = inst->io.server_cs; @@ -450,8 +450,8 @@ static int mod_priority_set(void const *instance, uint8_t const *buffer, UNUSED { proto_dhcpv4_t const *inst = talloc_get_type_abort_const(instance, proto_dhcpv4_t); - rad_assert(buffer[0] > 0); - rad_assert(buffer[0] < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(buffer[0] > 0); + fr_assert(buffer[0] < FR_RADIUS_MAX_PACKET_CODE); /* * Disallowed packet @@ -561,8 +561,8 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) */ inst->io.server_cs = cf_item_to_section(cf_parent(conf)); - rad_assert(dict_dhcpv4 != NULL); - rad_assert(attr_message_type != NULL); + fr_assert(dict_dhcpv4 != NULL); + fr_assert(attr_message_type != NULL); /* * Bootstrap the app_process modules. @@ -593,7 +593,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) * We will need this for dynamic clients and connected sockets. */ inst->io.dl_inst = dl_module_instance_by_data(inst); - rad_assert(inst != NULL); + fr_assert(inst != NULL); /* * Bootstrap the master IO handler. diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_process.c b/src/modules/proto_dhcpv4/proto_dhcpv4_process.c index c91088e1c62..b78c5d320c5 100644 --- a/src/modules/proto_dhcpv4/proto_dhcpv4_process.c +++ b/src/modules/proto_dhcpv4/proto_dhcpv4_process.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -129,8 +129,8 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE VALUE_PAIR *vp; REQUEST_VERIFY(request); - rad_assert(request->packet->code > 0); - rad_assert(request->packet->code <= FR_DHCP_LEASE_QUERY); + fr_assert(request->packet->code > 0); + fr_assert(request->packet->code <= FR_DHCP_LEASE_QUERY); switch (request->request_state) { case REQUEST_INIT: @@ -164,7 +164,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); /* * Allow the admin to explicitly set the reply @@ -229,7 +229,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c b/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c index 7af55689dca..ecf59d4a425 100644 --- a/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c +++ b/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include "proto_dhcpv4.h" @@ -229,7 +229,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, UNUSED fr_time_t req flags = UDP_FLAGS_CONNECTED * (thread->connection != NULL); - rad_assert(track->reply_len == 0); + fr_assert(track->reply_len == 0); /* * Swap src/dst IP/port @@ -513,9 +513,9 @@ static int mod_open(fr_listen_t *li) thread->sockfd = sockfd; ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); @@ -652,9 +652,9 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) } ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c index 9a3d240451b..ef99646a965 100644 --- a/src/modules/proto_ldap_sync/proto_ldap_sync.c +++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c @@ -32,7 +32,7 @@ USES_APPLE_DEPRECATED_API #include #include #include -#include +#include #include #include "sync.h" @@ -231,7 +231,7 @@ fr_dict_attr_autoload_t proto_ldap_sync_dict_attr[] = { static REQUEST *request_setup(UNUSED TALLOC_CTX *ctx, UNUSED rad_listen_t *listener, UNUSED RADIUS_PACKET *packet, UNUSED RADCLIENT *client, UNUSED RAD_REQUEST_FUNP fun) { - rad_assert(0 == 1); + fr_assert(0 == 1); return NULL; } @@ -399,7 +399,7 @@ static void request_running(REQUEST *request, fr_state_signal_t action) break; default: - rad_assert(0); + fr_assert(0); return; } unlang = cf_section_find(request->server_cs, verb, state); @@ -439,7 +439,7 @@ static void request_running(REQUEST *request, fr_state_signal_t action) default: break; } - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); //request_delete(request); break; } @@ -1105,7 +1105,7 @@ static int proto_ldap_socket_parse(CONF_SECTION *cs, rad_listen_t *listen) talloc_set_type(inst, proto_ldap_inst_t); - rad_assert(inst->handle_config.server_str[0]); + fr_assert(inst->handle_config.server_str[0]); inst->handle_config.name = talloc_typed_asprintf(inst, "proto_ldap_conn (%s)", listen->server); memcpy(&inst->handle_config.server, &inst->handle_config.server_str[0], sizeof(inst->handle_config.server)); diff --git a/src/modules/proto_ldap_sync/sync.c b/src/modules/proto_ldap_sync/sync.c index b8b089136d3..a0c406ec22e 100644 --- a/src/modules/proto_ldap_sync/sync.c +++ b/src/modules/proto_ldap_sync/sync.c @@ -32,7 +32,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API #include -#include +#include #include #include "sync.h" @@ -183,9 +183,9 @@ static int sync_search_entry_or_reference(sync_state_t *sync, LDAPMessage *msg, sync_states_t state = SYNC_STATE_INVALID; bool new_cookie; - rad_assert(sync->conn); - rad_assert(sync); - rad_assert(msg); + fr_assert(sync->conn); + fr_assert(sync); + fr_assert(msg); if (!ctrls) { missing_control: @@ -607,9 +607,9 @@ static int sync_search_result(sync_state_t *sync, LDAPMessage *msg, LDAPControl ber_len_t len; bool new_cookie; - rad_assert(sync->conn); - rad_assert(sync); - rad_assert(msg); + fr_assert(sync->conn); + fr_assert(sync); + fr_assert(msg); /* * Should not happen with refreshAndPersist @@ -726,7 +726,7 @@ int sync_demux(int *sync_id, fr_ldap_connection_t *conn) tree = talloc_get_type_abort(conn->uctx, rbtree_t); - rad_assert(conn); + fr_assert(conn); /* * Drain any messages outstanding on this connection @@ -734,7 +734,7 @@ int sync_demux(int *sync_id, fr_ldap_connection_t *conn) ret = ldap_result(conn->handle, LDAP_RES_ANY, LDAP_MSG_RECEIVED, &poll, &head); switch (ret) { case 0: /* timeout - shouldn't happen */ - rad_assert(0); + fr_assert(0); case -1: rcode = fr_ldap_error_check(NULL, conn, NULL, NULL); @@ -863,7 +863,7 @@ static int _sync_state_free(sync_state_t *sync) rbtree_t *tree = talloc_get_type_abort(conn->uctx, rbtree_t); sync_state_t find = { .msgid = sync->msgid }; - rad_assert(sync->conn->handle); + fr_assert(sync->conn->handle); DEBUG3("Abandoning sync"); @@ -981,8 +981,8 @@ int sync_state_init(fr_ldap_connection_t *conn, sync_config_t const *config, sync_state_t *sync; rbtree_t *tree; - rad_assert(conn); - rad_assert(config); + fr_assert(conn); + fr_assert(config); mode = config->persist ? LDAP_SYNC_REFRESH_AND_PERSIST : LDAP_SYNC_REFRESH_ONLY; diff --git a/src/modules/proto_ldap_sync/sync_touch.c b/src/modules/proto_ldap_sync/sync_touch.c index 7730811b014..8f35205c6ca 100644 --- a/src/modules/proto_ldap_sync/sync_touch.c +++ b/src/modules/proto_ldap_sync/sync_touch.c @@ -28,7 +28,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API #include -#include +#include typedef struct { uint64_t id; //!< Bitfield ID. diff --git a/src/modules/proto_radius/dynamic_clients.c b/src/modules/proto_radius/dynamic_clients.c index c8d9e2bee99..d7300bfb351 100644 --- a/src/modules/proto_radius/dynamic_clients.c +++ b/src/modules/proto_radius/dynamic_clients.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "proto_radius.h" typedef struct { diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c index a552eb3a902..54087169e12 100644 --- a/src/modules/proto_radius/proto_radius.c +++ b/src/modules/proto_radius/proto_radius.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "proto_radius.h" extern fr_app_t proto_radius; @@ -141,7 +141,7 @@ static int type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF_ITEM fr_dict_enum_t const *type_enum; uint32_t code; - rad_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); + fr_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); /* * Allow the process module to be specified by @@ -193,7 +193,7 @@ static int type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF_ITEM if (!name) goto invalid_type; parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_radius")); - rad_assert(parent_inst); + fr_assert(parent_inst); /* * Set the allowed codes so that we can compile them as @@ -248,7 +248,7 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF transport_cs = cf_section_find(listen_cs, name, NULL); parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_radius")); - rad_assert(parent_inst); + fr_assert(parent_inst); /* * Set the allowed codes so that we can compile them as @@ -280,7 +280,7 @@ static int mod_decode(void const *instance, REQUEST *request, uint8_t *const dat fr_io_address_t *address = track->address; RADCLIENT const *client; - rad_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE); /* * Set the request dictionary so that we can do @@ -344,7 +344,7 @@ static int mod_decode(void const *instance, REQUEST *request, uint8_t *const dat fr_cursor_t cursor; VALUE_PAIR *vp; - rad_assert(client->dynamic); + fr_assert(client->dynamic); for (vp = fr_cursor_init(&cursor, &request->packet->vps); vp != NULL; @@ -422,7 +422,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe } client = address->radclient; - rad_assert(client); + fr_assert(client); /* * Dynamic client stuff @@ -430,7 +430,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe if (client->dynamic && !client->active) { RADCLIENT *new_client; - rad_assert(buffer_len >= sizeof(client)); + fr_assert(buffer_len >= sizeof(client)); /* * We don't accept the new client, so don't do @@ -520,8 +520,8 @@ static void mod_entry_point_set(void const *instance, REQUEST *request) dl_module_inst_t *type_submodule; fr_io_track_t *track = request->async->packet_ctx; - rad_assert(request->packet->code != 0); - rad_assert(request->packet->code <= FR_RADIUS_MAX_PACKET_CODE); + fr_assert(request->packet->code != 0); + fr_assert(request->packet->code <= FR_RADIUS_MAX_PACKET_CODE); request->server_cs = inst->io.server_cs; @@ -554,8 +554,8 @@ static int mod_priority_set(void const *instance, uint8_t const *buffer, UNUSED { proto_radius_t const *inst = talloc_get_type_abort_const(instance, proto_radius_t); - rad_assert(buffer[0] > 0); - rad_assert(buffer[0] < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(buffer[0] > 0); + fr_assert(buffer[0] < FR_RADIUS_MAX_PACKET_CODE); /* * Disallowed packet @@ -706,7 +706,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) * We will need this for dynamic clients and connected sockets. */ inst->io.dl_inst = dl_module_instance_by_data(inst); - rad_assert(inst != NULL); + fr_assert(inst != NULL); /* * Bootstrap the master IO handler. diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c index 8a5bf8dba24..273139c3b40 100644 --- a/src/modules/proto_radius/proto_radius_acct.c +++ b/src/modules/proto_radius/proto_radius_acct.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -87,7 +87,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { /* @@ -144,7 +144,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { /* @@ -198,7 +198,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c index c2fd8a1a8c6..63631952d09 100644 --- a/src/modules/proto_radius/proto_radius_auth.c +++ b/src/modules/proto_radius/proto_radius_auth.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include @@ -316,7 +316,7 @@ static rlm_rcode_t mod_process(void *instance, UNUSED void *thread, REQUEST *req if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: @@ -437,7 +437,7 @@ static rlm_rcode_t mod_process(void *instance, UNUSED void *thread, REQUEST *req if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { /* @@ -571,7 +571,7 @@ static rlm_rcode_t mod_process(void *instance, UNUSED void *thread, REQUEST *req if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_FAIL: @@ -742,11 +742,11 @@ static int mod_bootstrap(UNUSED void *instance, CONF_SECTION *process_app_cs) CONF_SECTION *listen_cs = cf_item_to_section(cf_parent(process_app_cs)); CONF_SECTION *server_cs; - rad_assert(process_app_cs); - rad_assert(listen_cs); + fr_assert(process_app_cs); + fr_assert(listen_cs); server_cs = cf_item_to_section(cf_parent(listen_cs)); - rad_assert(strcmp(cf_section_name1(server_cs), "server") == 0); + fr_assert(strcmp(cf_section_name1(server_cs), "server") == 0); if (virtual_server_section_attribute_define(server_cs, "authenticate", attr_auth_type) < 0) return -1; diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c index 857cd3c8192..75625f91a56 100644 --- a/src/modules/proto_radius/proto_radius_coa.c +++ b/src/modules/proto_radius/proto_radius_coa.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -109,7 +109,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: @@ -154,7 +154,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE rerun_nak: RDEBUG("Running 'send %s' from file %s", cf_section_name2(unlang), cf_filename(unlang)); unlang_interpret_push_section(request, unlang, RLM_MODULE_NOOP, UNLANG_TOP_FRAME); - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); request->request_state = REQUEST_SEND; /* FALL-THROUGH */ @@ -166,7 +166,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { /* diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c index 3717fd51564..380c0bb2ef2 100644 --- a/src/modules/proto_radius/proto_radius_dynamic_client.c +++ b/src/modules/proto_radius/proto_radius_dynamic_client.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -89,7 +89,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_OK: @@ -125,7 +125,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: diff --git a/src/modules/proto_radius/proto_radius_load.c b/src/modules/proto_radius/proto_radius_load.c index 0077b38ff0f..4d7828c60ff 100644 --- a/src/modules/proto_radius/proto_radius_load.c +++ b/src/modules/proto_radius/proto_radius_load.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "proto_radius.h" @@ -219,9 +219,9 @@ static int mod_open(fr_listen_t *li) li->app_io_addr = fr_app_io_socket_addr(li, IPPROTO_UDP, &ipaddr, 0); ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c index f433570a118..814317709f1 100644 --- a/src/modules/proto_radius/proto_radius_status.c +++ b/src/modules/proto_radius/proto_radius_status.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -84,7 +84,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_OK: @@ -129,7 +129,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: diff --git a/src/modules/proto_radius/proto_radius_tcp.c b/src/modules/proto_radius/proto_radius_tcp.c index 930aba19fbd..0f7411a4249 100644 --- a/src/modules/proto_radius/proto_radius_tcp.c +++ b/src/modules/proto_radius/proto_radius_tcp.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "proto_radius.h" extern fr_app_io_t proto_radius_tcp; @@ -231,8 +231,8 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, UNUSED fr_time_t req /* * We only write RADIUS packets. */ - rad_assert(buffer_len >= 20); - rad_assert(written < buffer_len); + fr_assert(buffer_len >= 20); + fr_assert(written < buffer_len); /* * Only write replies if they're RADIUS packets. @@ -293,7 +293,7 @@ static int mod_open(fr_listen_t *li) CONF_SECTION *server_cs; CONF_ITEM *ci; - rad_assert(!thread->connection); + fr_assert(!thread->connection); li->fd = sockfd = fr_socket_server_tcp(&inst->ipaddr, &port, inst->port_name, true); if (sockfd < 0) { @@ -317,9 +317,9 @@ static int mod_open(fr_listen_t *li) thread->sockfd = sockfd; ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); diff --git a/src/modules/proto_radius/proto_radius_udp.c b/src/modules/proto_radius/proto_radius_udp.c index eeb2cd94e5b..5e7f06c2c47 100644 --- a/src/modules/proto_radius/proto_radius_udp.c +++ b/src/modules/proto_radius/proto_radius_udp.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "proto_radius.h" @@ -242,7 +242,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, UNUSED fr_time_t req /* * We only write RADIUS packets. */ - rad_assert(buffer_len >= 20); + fr_assert(buffer_len >= 20); /* * Only write replies if they're RADIUS packets. @@ -355,9 +355,9 @@ static int mod_open(fr_listen_t *li) thread->sockfd = sockfd; ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); @@ -496,9 +496,9 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) } ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); diff --git a/src/modules/proto_tacacs/proto_tacacs.c b/src/modules/proto_tacacs/proto_tacacs.c index da09c36b025..840d57c4502 100644 --- a/src/modules/proto_tacacs/proto_tacacs.c +++ b/src/modules/proto_tacacs/proto_tacacs.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include @@ -85,7 +85,7 @@ fr_dict_attr_autoload_t proto_tacacs_dict_attr[] = { static REQUEST *request_setup(UNUSED TALLOC_CTX *ctx, UNUSED rad_listen_t *listener, UNUSED RADIUS_PACKET *packet, UNUSED RADCLIENT *client, UNUSED RAD_REQUEST_FUNP fun) { - rad_assert(0 == 1); + fr_assert(0 == 1); return NULL; } @@ -207,7 +207,7 @@ static void state_add(REQUEST *request, RADIUS_PACKET *packet) uint32_t session_id; uint8_t buf[16] = { 0 }; /* FIXME state.c:sizeof(struct state_comp) */ - rad_assert(sizeof(request->listener) + sizeof(vp->vp_uint32) <= sizeof(buf)); //-V568 + fr_assert(sizeof(request->listener) + sizeof(vp->vp_uint32) <= sizeof(buf)); //-V568 /* session_id is per TCP connection */ memcpy(&buf[0], &request->listener, sizeof(request->listener)); //-V568 @@ -289,7 +289,7 @@ stop_processing: if (rcode == RLM_MODULE_YIELD) return; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: @@ -381,7 +381,7 @@ stop_processing: if (rcode == RLM_MODULE_YIELD) return; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { /* @@ -431,7 +431,7 @@ setup_send: if (rcode == RLM_MODULE_YIELD) return; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); send_reply: request->reply->timestamp = fr_time(); diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c index f11b17843cb..c6924917871 100644 --- a/src/modules/proto_vmps/proto_vmps.c +++ b/src/modules/proto_vmps/proto_vmps.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include @@ -118,7 +118,7 @@ static int type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, fr_dict_enum_t const *type_enum; uint32_t code; - rad_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); + fr_assert(listen_cs && (strcmp(cf_section_name1(listen_cs), "listen") == 0)); /* * Allow the process module to be specified by @@ -151,7 +151,7 @@ static int type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, } parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_vmps")); - rad_assert(parent_inst); + fr_assert(parent_inst); /* * Set the allowed codes so that we can compile them as @@ -208,7 +208,7 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, if (!transport_cs) transport_cs = cf_section_alloc(listen_cs, listen_cs, name, NULL); parent_inst = cf_data_value(cf_data_find(listen_cs, dl_module_inst_t, "proto_vmps")); - rad_assert(parent_inst); + fr_assert(parent_inst); /* * Set the allowed codes so that we can compile them as @@ -231,7 +231,7 @@ static int mod_decode(void const *instance, REQUEST *request, uint8_t *const dat RADCLIENT const *client; RADIUS_PACKET *packet = request->packet; - rad_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE); RHEXDUMP3(data, data_len, "proto_vmps decode packet"); @@ -319,7 +319,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe } client = address->radclient; - rad_assert(client); + fr_assert(client); /* * Dynamic client stuff @@ -327,7 +327,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe if (client->dynamic && !client->active) { RADCLIENT *new_client; - rad_assert(buffer_len >= sizeof(client)); + fr_assert(buffer_len >= sizeof(client)); /* * Allocate the client. If that fails, send back a NAK. @@ -389,8 +389,8 @@ static void mod_entry_point_set(void const *instance, REQUEST *request) dl_module_inst_t *type_submodule; fr_io_track_t *track = request->async->packet_ctx; - rad_assert(request->packet->code != 0); - rad_assert(request->packet->code <= FR_VQP_MAX_CODE); + fr_assert(request->packet->code != 0); + fr_assert(request->packet->code <= FR_VQP_MAX_CODE); request->server_cs = inst->io.server_cs; @@ -529,8 +529,8 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) */ inst->io.server_cs = cf_item_to_section(cf_parent(conf)); - rad_assert(dict_vmps != NULL); - rad_assert(attr_packet_type != NULL); + fr_assert(dict_vmps != NULL); + fr_assert(attr_packet_type != NULL); /* * Bootstrap the app_process modules. @@ -561,7 +561,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) * We will need this for dynamic clients and connected sockets. */ inst->io.dl_inst = dl_module_instance_by_data(inst); - rad_assert(inst != NULL); + fr_assert(inst != NULL); /* * Bootstrap the master IO handler. diff --git a/src/modules/proto_vmps/proto_vmps_dynamic_client.c b/src/modules/proto_vmps/proto_vmps_dynamic_client.c index e63dc1022f3..34fb44024cb 100644 --- a/src/modules/proto_vmps/proto_vmps_dynamic_client.c +++ b/src/modules/proto_vmps/proto_vmps_dynamic_client.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include static fr_dict_t const *dict_freeradius; @@ -91,7 +91,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_OK: @@ -127,7 +127,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: diff --git a/src/modules/proto_vmps/proto_vmps_process.c b/src/modules/proto_vmps/proto_vmps_process.c index f2f2bae6382..5d8a0cd2d97 100644 --- a/src/modules/proto_vmps/proto_vmps_process.c +++ b/src/modules/proto_vmps/proto_vmps_process.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -89,7 +89,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: @@ -134,7 +134,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE if (rcode == RLM_MODULE_YIELD) return RLM_MODULE_YIELD; - rad_assert(request->log.unlang_indent == 0); + fr_assert(request->log.unlang_indent == 0); switch (rcode) { case RLM_MODULE_NOOP: diff --git a/src/modules/proto_vmps/proto_vmps_udp.c b/src/modules/proto_vmps/proto_vmps_udp.c index d09aef4c4e1..f8533344588 100644 --- a/src/modules/proto_vmps/proto_vmps_udp.c +++ b/src/modules/proto_vmps/proto_vmps_udp.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include @@ -248,7 +248,7 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, UNUSED fr_time_t req /* * We only write VMPS packets. */ - rad_assert(buffer_len >= 8); + fr_assert(buffer_len >= 8); /* * Only write replies if they're VMPS packets. @@ -339,9 +339,9 @@ static int mod_open(fr_listen_t *li) thread->sockfd = sockfd; ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); @@ -460,9 +460,9 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) } ci = cf_parent(inst->cs); /* listen { ... } */ - rad_assert(ci != NULL); + fr_assert(ci != NULL); ci = cf_parent(ci); - rad_assert(ci != NULL); + fr_assert(ci != NULL); server_cs = cf_item_to_section(ci); diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c index 390d1c3aa72..c2d10372a1f 100644 --- a/src/modules/rlm_attr_filter/rlm_attr_filter.c +++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -305,7 +305,7 @@ static rlm_rcode_t CC_HINT(nonnull(1,2)) attr_filter_common(void const *instance * No entry matched. We didn't do anything. */ if (!found) { - rad_assert(!output); + fr_assert(!output); return RLM_MODULE_NOOP; } diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c index d0488bde744..9b75a72cbea 100644 --- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c +++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "../../rlm_cache.h" #include "../../serialize.h" @@ -114,7 +114,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) char buffer[256]; rlm_cache_config_t const *config = dl_module_parent_data_by_child_data(instance); - rad_assert(config); + fr_assert(config); snprintf(buffer, sizeof(buffer), "rlm_cache (%s)", config->name); diff --git a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c index cb19a6c2b75..b9511a2b19c 100644 --- a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c +++ b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c @@ -23,7 +23,7 @@ */ #include #include -#include +#include #include "../../rlm_cache.h" typedef struct { @@ -171,7 +171,7 @@ static cache_status_t cache_entry_find(rlm_cache_entry_t **out, rlm_cache_entry_t *c; - rad_assert(driver->cache); + fr_assert(driver->cache); /* * Clear out old entries @@ -236,7 +236,7 @@ static cache_status_t cache_entry_insert(rlm_cache_config_t const *config, void rlm_cache_rbtree_t *driver = talloc_get_type_abort(instance, rlm_cache_rbtree_t); rlm_cache_entry_t *my_c; - rad_assert(handle == request); + fr_assert(handle == request); if (!request) return CACHE_ERROR; diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c index b1cf67d034d..ddfc43bb333 100644 --- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c +++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c @@ -24,7 +24,7 @@ #define LOG_PREFIX "rlm_cache_redis - " #include -#include +#include #include "../../rlm_cache.h" #include @@ -78,7 +78,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) char buffer[256]; rlm_cache_config_t const *config = dl_module_parent_data_by_child_data(instance); - rad_assert(config); + fr_assert(config); buffer[0] = '\0'; diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c index dba38691013..47a4707f10a 100644 --- a/src/modules/rlm_cache/rlm_cache.c +++ b/src/modules/rlm_cache/rlm_cache.c @@ -30,7 +30,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include "rlm_cache.h" @@ -104,7 +104,7 @@ static void cache_release(rlm_cache_t const *inst, REQUEST *request, rlm_cache_h */ static int cache_reconnect(rlm_cache_handle_t **handle, rlm_cache_t const *inst, REQUEST *request) { - rad_assert(inst->driver->reconnect); + fr_assert(inst->driver->reconnect); return inst->driver->reconnect(handle, &inst->config, inst->driver_inst->dl_inst->data, request); } @@ -182,7 +182,7 @@ static rlm_rcode_t cache_merge(rlm_cache_t const *inst, REQUEST *request, rlm_ca REXDENT(); if (inst->config.stats) { - rad_assert(request->packet != NULL); + fr_assert(request->packet != NULL); MEM(pair_update_request(&vp, attr_cache_entry_hits) >= 0); vp->vp_uint32 = c->hits; } @@ -335,7 +335,7 @@ static rlm_rcode_t cache_insert(rlm_cache_t const *inst, REQUEST *request, rlm_c VALUE_PAIR *to_cache = NULL; fr_cursor_t cursor; - rad_assert(map->lhs && map->rhs); + fr_assert(map->lhs && map->rhs); /* * Calling map_to_vp gives us exactly the same result, @@ -438,7 +438,7 @@ static rlm_rcode_t cache_insert(rlm_cache_t const *inst, REQUEST *request, rlm_c goto do_rhs; default: - rad_assert(0); + fr_assert(0); } *last = c_map; last = &(*last)->next; @@ -598,7 +598,7 @@ static rlm_rcode_t mod_cache_it(void *instance, UNUSED void *thread, REQUEST *re rcode = cache_find(&c, inst, request, &handle, key, key_len); if (rcode == RLM_MODULE_FAIL) goto finish; - rad_assert(!inst->driver->acquire || handle); + fr_assert(!inst->driver->acquire || handle); rcode = c ? RLM_MODULE_OK: RLM_MODULE_NOTFOUND; @@ -657,9 +657,9 @@ static rlm_rcode_t mod_cache_it(void *instance, UNUSED void *thread, REQUEST *re break; default: - rad_assert(0); + fr_assert(0); } - rad_assert(!inst->driver->acquire || handle); + fr_assert(!inst->driver->acquire || handle); } /* @@ -671,7 +671,7 @@ static rlm_rcode_t mod_cache_it(void *instance, UNUSED void *thread, REQUEST *re */ if (expire && ((exists == -1) || (exists == 1))) { if (!insert) { - rad_assert(!set_ttl); + fr_assert(!set_ttl); switch (cache_expire(inst, request, &handle, key, key_len)) { case RLM_MODULE_FAIL: rcode = RLM_MODULE_FAIL; @@ -686,7 +686,7 @@ static rlm_rcode_t mod_cache_it(void *instance, UNUSED void *thread, REQUEST *re break; default: - rad_assert(0); + fr_assert(0); break; } /* If it previously existed, it doesn't now */ @@ -716,16 +716,16 @@ static rlm_rcode_t mod_cache_it(void *instance, UNUSED void *thread, REQUEST *re break; default: - rad_assert(0); + fr_assert(0); } - rad_assert(!inst->driver->acquire || handle); + fr_assert(!inst->driver->acquire || handle); } /* * We can only alter the TTL on an entry if it exists. */ if (set_ttl && (exists == 1)) { - rad_assert(c); + fr_assert(c); c->expires = fr_time_to_unix_time(request->packet->timestamp) + fr_unix_time_from_sec(ttl); @@ -740,7 +740,7 @@ static rlm_rcode_t mod_cache_it(void *instance, UNUSED void *thread, REQUEST *re goto finish; default: - rad_assert(0); + fr_assert(0); } } @@ -765,9 +765,9 @@ static rlm_rcode_t mod_cache_it(void *instance, UNUSED void *thread, REQUEST *re break; default: - rad_assert(0); + fr_assert(0); } - rad_assert(!inst->driver->acquire || handle); + fr_assert(!inst->driver->acquire || handle); goto finish; } @@ -950,10 +950,10 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) /* * Non optional fields and callbacks */ - rad_assert(inst->driver->name); - rad_assert(inst->driver->find); - rad_assert(inst->driver->insert); - rad_assert(inst->driver->expire); + fr_assert(inst->driver->name); + fr_assert(inst->driver->find); + fr_assert(inst->driver->insert); + fr_assert(inst->driver->expire); /* * Register the cache xlat function @@ -973,7 +973,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) inst->cs = conf; - rad_assert(inst->config.key); + fr_assert(inst->config.key); if (inst->config.ttl == 0) { cf_log_err(conf, "Must set 'ttl' to non-zero"); diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c index dc5c40051be..f2bd9e7da5f 100644 --- a/src/modules/rlm_chap/rlm_chap.c +++ b/src/modules/rlm_chap/rlm_chap.c @@ -253,7 +253,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) return -1; } inst->auth_type = fr_dict_enum_by_name(attr_auth_type, inst->name, -1); - rad_assert(inst->auth_type); + fr_assert(inst->auth_type); return 0; } diff --git a/src/modules/rlm_cipher/rlm_cipher.c b/src/modules/rlm_cipher/rlm_cipher.c index 77c1fe7baba..a0e1526db9f 100644 --- a/src/modules/rlm_cipher/rlm_cipher.c +++ b/src/modules/rlm_cipher/rlm_cipher.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -591,7 +591,7 @@ static xlat_action_t cipher_rsa_sign_xlat(TALLOC_CTX *ctx, fr_cursor_t *out, fr_tls_log_error(request, "Failed finalising message digest"); return XLAT_ACTION_FAIL; } - rad_assert((size_t)digest_len == talloc_array_length(xt->digest_buff)); + fr_assert((size_t)digest_len == talloc_array_length(xt->digest_buff)); /* * Then sign the digest @@ -814,7 +814,7 @@ static xlat_action_t cipher_rsa_verify_xlat(TALLOC_CTX *ctx, fr_cursor_t *out, fr_tls_log_error(request, "Failed finalising message digest"); return XLAT_ACTION_FAIL; } - rad_assert((size_t)digest_len == talloc_array_length(xt->digest_buff)); + fr_assert((size_t)digest_len == talloc_array_length(xt->digest_buff)); /* * Now check the signature matches what we expected @@ -941,7 +941,7 @@ static int cipher_rsa_padding_params_set(EVP_PKEY_CTX *evp_pkey_ctx, cipher_rsa_ return 0; default: - rad_assert(0); + fr_assert(0); return -1; } } @@ -1127,7 +1127,7 @@ static int mod_thread_instantiate(CONF_SECTION const *conf, void *instance, return cipher_rsa_thread_instantiate(conf, instance, el, thread); case RLM_CIPHER_TYPE_INVALID: - rad_assert(0); + fr_assert(0); } return 0; @@ -1239,7 +1239,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) * the value is unrecognised we've got an issue. */ default: - rad_assert(0); + fr_assert(0); return -1; }; diff --git a/src/modules/rlm_client/rlm_client.c b/src/modules/rlm_client/rlm_client.c index 3dd0fe151d3..869ef0b0153 100644 --- a/src/modules/rlm_client/rlm_client.c +++ b/src/modules/rlm_client/rlm_client.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include #include -#include +#include /** Client field * @@ -48,7 +48,7 @@ static int _map_proc_client_get_vp(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *r fr_dict_attr_t const *da; CONF_PAIR const *cp; - rad_assert(ctx != NULL); + fr_assert(ctx != NULL); fr_cursor_init(&cursor, &head); diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c index 101cedcbccb..b398c77f847 100644 --- a/src/modules/rlm_couchbase/rlm_couchbase.c +++ b/src/modules/rlm_couchbase/rlm_couchbase.c @@ -31,7 +31,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -109,7 +109,7 @@ static rlm_rcode_t mod_authorize(void *instance, UNUSED void *thread, REQUEST *r ssize_t slen; /* assert packet as not null */ - rad_assert(request->packet != NULL); + fr_assert(request->packet != NULL); /* attempt to build document key */ slen = tmpl_expand(&dockey, buffer, sizeof(buffer), request, inst->user_key, NULL, NULL); @@ -252,7 +252,7 @@ static rlm_rcode_t mod_accounting(void *instance, UNUSED void *thread, REQUEST * ssize_t slen; /* assert packet as not null */ - rad_assert(request->packet != NULL); + fr_assert(request->packet != NULL); /* sanity check */ if ((vp = fr_pair_find_by_da(request->packet->vps, attr_acct_status_type, TAG_ANY)) == NULL) { diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c index a83c5a51fc4..6b6a70f4b7e 100644 --- a/src/modules/rlm_csv/rlm_csv.c +++ b/src/modules/rlm_csv/rlm_csv.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include #include -#include +#include #include @@ -639,7 +639,7 @@ static int csv_map_getvalue(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, fr_cursor_t cursor; fr_dict_attr_t const *da; - rad_assert(ctx != NULL); + fr_assert(ctx != NULL); fr_cursor_init(&cursor, &head); /* @@ -667,7 +667,7 @@ static int csv_map_getvalue(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST *request, } vp = fr_pair_afrom_da(ctx, da); - rad_assert(vp); + fr_assert(vp); if (fr_pair_value_from_str(vp, str, talloc_array_length(str) - 1, '\0', true) < 0) { RWDEBUG("Failed parsing value \"%pV\" for attribute %s: %s", fr_box_strvalue_buffer(str), diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c index e3314c2d699..1a8011d0155 100644 --- a/src/modules/rlm_delay/rlm_delay.c +++ b/src/modules/rlm_delay/rlm_delay.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c index 3ab6307e1eb..a7f69117d85 100644 --- a/src/modules/rlm_detail/rlm_detail.c +++ b/src/modules/rlm_detail/rlm_detail.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include diff --git a/src/modules/rlm_dict/rlm_dict.c b/src/modules/rlm_dict/rlm_dict.c index daf0a03ff2b..5d209ac14a5 100644 --- a/src/modules/rlm_dict/rlm_dict.c +++ b/src/modules/rlm_dict/rlm_dict.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include #include -#include +#include /** Xlat for %{attr_by_num:\} * diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c index 2eedae643c0..310a61ae603 100644 --- a/src/modules/rlm_digest/rlm_digest.c +++ b/src/modules/rlm_digest/rlm_digest.c @@ -106,7 +106,7 @@ static int digest_fix(REQUEST *request) * Check for proper format of the Digest-Attributes */ RDEBUG2("Checking for correctly formatted Digest-Attributes"); - rad_assert(attr_digest_attributes); + fr_assert(attr_digest_attributes); first = fr_cursor_iter_by_da_init(&cursor, &request->packet->vps, attr_digest_attributes); if (!first) return RLM_MODULE_NOOP; @@ -590,7 +590,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) return -1; } inst->auth_type = fr_dict_enum_by_name(attr_auth_type, inst->name, -1); - rad_assert(inst->auth_type); + fr_assert(inst->auth_type); return 0; } diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c index 0590cb2ab79..dc76027fe27 100644 --- a/src/modules/rlm_eap/rlm_eap.c +++ b/src/modules/rlm_eap/rlm_eap.c @@ -403,7 +403,7 @@ static rlm_rcode_t mod_authenticate_result(REQUEST *request, UNUSED void *instan */ case RLM_MODULE_REJECT: case RLM_MODULE_DISALLOW: - rad_assert(eap_session->this_round->request->code == FR_EAP_CODE_FAILURE); + fr_assert(eap_session->this_round->request->code == FR_EAP_CODE_FAILURE); eap_session->this_round->request->code = FR_EAP_CODE_FAILURE; break; @@ -411,7 +411,7 @@ static rlm_rcode_t mod_authenticate_result(REQUEST *request, UNUSED void *instan * Definitely shouldn't get this. */ case RLM_MODULE_YIELD: - rad_assert(0); + fr_assert(0); break; default: @@ -505,7 +505,7 @@ static rlm_rcode_t eap_method_select(rlm_eap_t *inst, UNUSED void *thread, eap_s /* * Session must have been thawed... */ - rad_assert(eap_session->request); + fr_assert(eap_session->request); /* * Don't trust anyone. @@ -562,9 +562,9 @@ static rlm_rcode_t eap_method_select(rlm_eap_t *inst, UNUSED void *thread, eap_s /* * If any of these fail, we messed badly somewhere */ - rad_assert(next >= FR_EAP_METHOD_MD5); - rad_assert(next < FR_EAP_METHOD_MAX); - rad_assert(inst->methods[next].submodule); + fr_assert(next >= FR_EAP_METHOD_MD5); + fr_assert(next < FR_EAP_METHOD_MAX); + fr_assert(inst->methods[next].submodule); eap_session->process = inst->methods[next].submodule->session_init; eap_session->type = next; @@ -806,7 +806,7 @@ static rlm_rcode_t mod_post_proxy(void *instance, UNUSED void *thread, REQUEST * VALUE_PAIR *username; eap_session = eap_session_thaw(request); - rad_assert(eap_session); + fr_assert(eap_session); /* * Grab the tunnel callbacks from the request. @@ -1001,7 +1001,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) return -1; } inst->auth_type = fr_dict_enum_by_name(attr_auth_type, inst->name, -1); - rad_assert(inst->name); + fr_assert(inst->name); /* * Load and bootstrap the submodules now diff --git a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c index 6661c20ce33..daef4247b4f 100644 --- a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c +++ b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include diff --git a/src/modules/rlm_eap/types/rlm_eap_aka_prime/rlm_eap_aka_prime.c b/src/modules/rlm_eap/types/rlm_eap_aka_prime/rlm_eap_aka_prime.c index 86bc4b9867b..06419f79ff4 100644 --- a/src/modules/rlm_eap/types/rlm_eap_aka_prime/rlm_eap_aka_prime.c +++ b/src/modules/rlm_eap/types/rlm_eap_aka_prime/rlm_eap_aka_prime.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include 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 68bb8a58e2c..96bbd9bbb64 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c +++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c @@ -32,7 +32,7 @@ RCSID("$Id$") #include #include -#define RANDFILL(x) do { rad_assert(sizeof(x) % sizeof(uint32_t) == 0); for (size_t i = 0; i < sizeof(x); i += sizeof(uint32_t)) *((uint32_t *)&x[i]) = fr_rand(); } while(0) +#define RANDFILL(x) do { fr_assert(sizeof(x) % sizeof(uint32_t) == 0); for (size_t i = 0; i < sizeof(x); i += sizeof(uint32_t)) *((uint32_t *)&x[i]) = fr_rand(); } while(0) /** * RFC 4851 section 5.1 - EAP-FAST Authentication Phase 1: Key Derivations @@ -46,10 +46,10 @@ static void eap_fast_init_keys(REQUEST *request, fr_tls_session_t *tls_session) RDEBUG2("Deriving EAP-FAST keys"); - rad_assert(t->s_imck == NULL); + fr_assert(t->s_imck == NULL); ksize = fr_tls_utils_keyblock_size_get(request, tls_session->ssl); - rad_assert(ksize > 0); + fr_assert(ksize > 0); buf = talloc_array(request, uint8_t, ksize + sizeof(*t->keyblock)); scratch = talloc_array(request, uint8_t, ksize + sizeof(*t->keyblock)); @@ -164,7 +164,7 @@ static void eap_fast_send_pac_tunnel(REQUEST *request, fr_tls_session_t *tls_ses pac.key.hdr.type = htons(EAP_FAST_TLV_MANDATORY | attr_eap_fast_pac_key->attr); pac.key.hdr.length = htons(sizeof(pac.key.data)); - rad_assert(sizeof(pac.key.data) % sizeof(uint32_t) == 0); + fr_assert(sizeof(pac.key.data) % sizeof(uint32_t) == 0); RANDFILL(pac.key.data); pac.info.lifetime.hdr.type = htons(attr_eap_fast_pac_info_pac_lifetime->attr); @@ -198,9 +198,9 @@ static void eap_fast_send_pac_tunnel(REQUEST *request, fr_tls_session_t *tls_ses RHEXDUMP3((uint8_t const *)&opaque_plaintext, sizeof(opaque_plaintext), "PAC-Opaque plaintext data section"); - rad_assert(PAC_A_ID_LENGTH <= EVP_GCM_TLS_TAG_LEN); + fr_assert(PAC_A_ID_LENGTH <= EVP_GCM_TLS_TAG_LEN); memcpy(pac.opaque.aad, t->a_id, PAC_A_ID_LENGTH); - rad_assert(RAND_bytes(pac.opaque.iv, sizeof(pac.opaque.iv)) != 0); + fr_assert(RAND_bytes(pac.opaque.iv, sizeof(pac.opaque.iv)) != 0); dlen = eap_fast_encrypt((unsigned const char *)&opaque_plaintext, sizeof(opaque_plaintext), t->a_id, PAC_A_ID_LENGTH, t->pac_opaque_key, pac.opaque.iv, pac.opaque.data, pac.opaque.tag); @@ -226,7 +226,7 @@ static void eap_fast_append_crypto_binding(REQUEST *request, fr_tls_session_t *t binding.received_version = EAP_FAST_VERSION; /* FIXME use the clients value */ binding.subtype = EAP_FAST_TLV_CRYPTO_BINDING_SUBTYPE_REQUEST; - rad_assert(sizeof(binding.nonce) % sizeof(uint32_t) == 0); + fr_assert(sizeof(binding.nonce) % sizeof(uint32_t) == 0); RANDFILL(binding.nonce); binding.nonce[sizeof(binding.nonce) - 1] &= ~0x01; /* RFC 4851 section 4.2.8 */ RHEXDUMP3(binding.nonce, sizeof(binding.nonce), "NONCE"); @@ -251,7 +251,7 @@ static int eap_fast_verify(REQUEST *request, fr_tls_session_t *tls_session, uint eap_fast_tunnel_t *t = talloc_get_type_abort(tls_session->opaque, eap_fast_tunnel_t); uint32_t present = 0; - rad_assert(sizeof(present) * 8 > EAP_FAST_TLV_MAX); + fr_assert(sizeof(present) * 8 > EAP_FAST_TLV_MAX); while (remaining > 0) { if (remaining < 4) { @@ -580,7 +580,7 @@ static FR_CODE eap_fast_eap_payload(REQUEST *request, eap_session_t *eap_session * Allocate a fake REQUEST structure. */ fake = request_alloc_fake(request, NULL); - rad_assert(!fake->packet->vps); + fr_assert(!fake->packet->vps); t = talloc_get_type_abort(tls_session->opaque, eap_fast_tunnel_t); @@ -605,7 +605,7 @@ static FR_CODE eap_fast_eap_payload(REQUEST *request, eap_session_t *eap_session * an EAP-Identity, and pull it out of there. */ if (!t->username) { - rad_assert(vp->da == attr_eap_message); /* cached from above */ + fr_assert(vp->da == attr_eap_message); /* cached from above */ if ((vp->vp_length >= EAP_HEADER_LEN + 2) && (vp->vp_strvalue[0] == FR_EAP_CODE_RESPONSE) && @@ -684,7 +684,7 @@ static FR_CODE eap_fast_eap_payload(REQUEST *request, eap_session_t *eap_session /* * Seed the proxy packet with the tunneled request. */ - rad_assert(!request->proxy); + fr_assert(!request->proxy); /* * FIXME: Actually proxy stuff @@ -925,7 +925,7 @@ FR_CODE eap_fast_process(REQUEST *request, eap_session_t *eap_session, fr_tls_se if (!eap_fast_verify(request, tls_session, data, data_len)) return FR_CODE_ACCESS_REJECT; if (t->stage == EAP_FAST_TLS_SESSION_HANDSHAKE) { - rad_assert(t->mode == EAP_FAST_UNKNOWN); + fr_assert(t->mode == EAP_FAST_UNKNOWN); char buf[256]; if (strstr(SSL_CIPHER_description(SSL_get_current_cipher(tls_session->ssl), diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c index 01ffc21544c..edc41b2cf98 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c +++ b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c @@ -226,7 +226,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *cs) return -1; } - rad_assert(PAC_A_ID_LENGTH == MD5_DIGEST_LENGTH); + fr_assert(PAC_A_ID_LENGTH == MD5_DIGEST_LENGTH); fr_md5_calc(inst->a_id, (uint8_t const *)inst->authority_identity, talloc_array_length(inst->authority_identity) - 1); @@ -262,7 +262,7 @@ static void eap_fast_session_ticket(fr_tls_session_t *tls_session, const SSL *s, eap_fast_tunnel_t *t = talloc_get_type_abort(tls_session->opaque, eap_fast_tunnel_t); uint8_t seed[2 * SSL3_RANDOM_SIZE]; - rad_assert(t->pac.key); + fr_assert(t->pac.key); SSL_get_server_random(s, seed, SSL3_RANDOM_SIZE); SSL_get_client_random(s, &seed[SSL3_RANDOM_SIZE], SSL3_RANDOM_SIZE); @@ -392,10 +392,10 @@ error: char *value; if (vp->da == attr_eap_fast_pac_info_pac_type) { - rad_assert(t->pac.type == 0); + fr_assert(t->pac.type == 0); t->pac.type = vp->vp_uint32; } else if (vp->da == attr_eap_fast_pac_info_pac_lifetime) { - rad_assert(t->pac.expires == 0); + fr_assert(t->pac.expires == 0); t->pac.expires = vp->vp_uint32; t->pac.expired = (vp->vp_uint32 <= time(NULL)); /* @@ -403,10 +403,10 @@ error: * The original enum didn't match a specific TLV nesting level */ } else if (vp->da == attr_eap_fast_pac_key) { - rad_assert(t->pac.key == NULL); - rad_assert(vp->vp_length == PAC_KEY_LENGTH); + fr_assert(t->pac.key == NULL); + fr_assert(vp->vp_length == PAC_KEY_LENGTH); t->pac.key = talloc_array(t, uint8_t, PAC_KEY_LENGTH); - rad_assert(t->pac.key != NULL); + fr_assert(t->pac.key != NULL); memcpy(t->pac.key, vp->vp_octets, PAC_KEY_LENGTH); } else { value = fr_pair_asprint(tls_session, vp, '"'); @@ -486,7 +486,7 @@ static rlm_rcode_t mod_process(void *instance, UNUSED void *thread, REQUEST *req */ case EAP_TLS_ESTABLISHED: fr_tls_session_send(request, tls_session); - rad_assert(tls_session->opaque != NULL); + fr_assert(tls_session->opaque != NULL); break; /* diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c index ba7a3dfeb97..4ea631b063b 100644 --- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c +++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c @@ -26,7 +26,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_eap_gtc - " #include -#include +#include #include static int auth_type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c index 7c41ea69f31..bacf924db3e 100644 --- a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c +++ b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c @@ -190,7 +190,7 @@ int eap_md5_compose(eap_round_t *eap_round, MD5_PACKET *reply) if (reply->code < 3) { eap_round->request->type.num = FR_EAP_METHOD_MD5; - rad_assert(reply->length > 0); + fr_assert(reply->length > 0); eap_round->request->type.data = talloc_array(eap_round->request, uint8_t, diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c index 26aecd357e6..64b11075551 100644 --- a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c +++ b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c @@ -23,7 +23,7 @@ RCSID("$Id$") -#include +#include #include #include "eap_md5.h" @@ -59,7 +59,7 @@ static rlm_rcode_t mod_process(UNUSED void *instance, UNUSED void *thread, REQUE /* * Get the Cleartext-Password for this user. */ - rad_assert(eap_session->request != NULL); + fr_assert(eap_session->request != NULL); known_good = password_find(&ephemeral, request, request->parent, allowed_passwords, NUM_ELEMENTS(allowed_passwords), @@ -116,7 +116,7 @@ static rlm_rcode_t mod_session_init(UNUSED void *instance, UNUSED void *thread, MD5_PACKET *reply; int i; - rad_assert(eap_session != NULL); + fr_assert(eap_session != NULL); /* * Allocate an EAP-MD5 packet. diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c index 32cae852801..5f26e76c71b 100644 --- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c +++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c @@ -22,7 +22,7 @@ RCSID("$Id$") -#include +#include #include #include "eap_mschapv2.h" @@ -276,7 +276,7 @@ static int CC_HINT(nonnull) mschap_postproxy(eap_session_t *eap_session, UNUSED REQUEST *request = eap_session->request; data = talloc_get_type_abort(eap_session->opaque, mschapv2_opaque_t); - rad_assert(request != NULL); + fr_assert(request != NULL); RDEBUG2("Passing reply from proxy back into the tunnel %d", request->reply->code); @@ -831,7 +831,7 @@ static rlm_rcode_t mod_session_init(void *instance, UNUSED void *thread, REQUEST * Keep track of the challenge. */ data = talloc_zero(eap_session, mschapv2_opaque_t); - rad_assert(data != NULL); + fr_assert(data != NULL); /* * We're at the stage where we're challenging the user. 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 8574108e230..36b4c408742 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c +++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c @@ -307,7 +307,7 @@ static VALUE_PAIR *eap_peap_inner_to_pairs(UNUSED REQUEST *request, RADIUS_PACKE */ static int eap_peap_inner_from_pairs(REQUEST *request, fr_tls_session_t *tls_session, VALUE_PAIR *vp) { - rad_assert(vp != NULL); + fr_assert(vp != NULL); VALUE_PAIR *this; fr_cursor_t cursor; @@ -552,7 +552,7 @@ rlm_rcode_t eap_peap_process(REQUEST *request, eap_session_t *eap_session, fr_tl case PEAP_STATUS_WAIT_FOR_SOH_RESPONSE: fake = request_alloc_fake(request, NULL); - rad_assert(!fake->packet->vps); + fr_assert(!fake->packet->vps); eap_peap_soh_verify(fake, fake->packet, data, data_len); setup_fake_request(request, fake, t); @@ -572,9 +572,9 @@ rlm_rcode_t eap_peap_process(REQUEST *request, eap_session_t *eap_session, fr_tl } /* save the SoH VPs */ - rad_assert(!t->soh_reply_vps); + fr_assert(!t->soh_reply_vps); MEM(fr_pair_list_copy(t, &t->soh_reply_vps, fake->reply->vps) >= 0); - rad_assert(!fake->reply->vps); + fr_assert(!fake->reply->vps); TALLOC_FREE(fake); if (t->session_resumption_state == PEAP_RESUMPTION_YES) { @@ -652,7 +652,7 @@ rlm_rcode_t eap_peap_process(REQUEST *request, eap_session_t *eap_session, fr_tl } fake = request_alloc_fake(request, NULL); - rad_assert(!fake->packet->vps); + fr_assert(!fake->packet->vps); switch (t->status) { /* @@ -665,7 +665,7 @@ rlm_rcode_t eap_peap_process(REQUEST *request, eap_session_t *eap_session, fr_tl size_t len; uint8_t *q; - rad_assert(t->username); + fr_assert(t->username); len = t->username->vp_length + EAP_HEADER_LEN + 1; t->status = PEAP_STATUS_PHASE2; @@ -717,7 +717,7 @@ rlm_rcode_t eap_peap_process(REQUEST *request, eap_session_t *eap_session, fr_tl */ if ((data[0] == FR_EAP_METHOD_IDENTITY) && (data_len > 1)) { MEM(t->username = fr_pair_afrom_da(t, attr_user_name)); - rad_assert(t->username != NULL); + fr_assert(t->username != NULL); t->username->vp_tainted = true; fr_pair_value_bstrncpy(t->username, data + 1, data_len - 1); diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c index 3dfd577d1ea..69ffa2ea59d 100644 --- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c +++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c @@ -91,7 +91,7 @@ static int send_pwd_request(REQUEST *request, pwd_session_t *session, eap_round_ pwd_hdr *hdr; len = (session->out_len - session->out_pos) + sizeof(pwd_hdr); - rad_assert(len > 0); + fr_assert(len > 0); eap_round->request->code = FR_EAP_CODE_REQUEST; eap_round->request->type.num = FR_EAP_METHOD_PWD; eap_round->request->type.length = (len > session->mtu) ? session->mtu : len; diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c index a17464087e1..5b5838b6171 100644 --- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c +++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c index 2e93c435b3d..9293f8841b6 100644 --- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c +++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c @@ -86,7 +86,7 @@ static rlm_rcode_t eap_tls_success_with_prf(REQUEST *request, eap_session_t *eap switch (SSL_SESSION_get_protocol_version(SSL_get_session(tls_session->ssl))) { case SSL2_VERSION: /* Should never happen */ case SSL3_VERSION: /* Should never happen */ - rad_assert(0); + fr_assert(0); return RLM_MODULE_INVALID; case TLS1_VERSION: @@ -158,7 +158,7 @@ static rlm_rcode_t eap_tls_virtual_server(rlm_eap_tls_t *inst, REQUEST *request, } } else { server_cs = virtual_server_find(inst->virtual_server); - rad_assert(server_cs); + fr_assert(server_cs); } section = cf_section_find(server_cs, "recv", "Access-Request"); 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 b1113227608..eee926f03ad 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c @@ -151,7 +151,7 @@ static ssize_t eap_ttls_decode_pair(TALLOC_CTX *ctx, fr_cursor_t *cursor, fr_dic fr_dict_attr_t const *attr_radius; dict_radius = fr_dict_by_protocol_name("radius"); - rad_assert(dict_radius != NULL); + fr_assert(dict_radius != NULL); attr_radius = fr_dict_root(dict_radius); while (p < end) { @@ -461,7 +461,7 @@ static rlm_rcode_t CC_HINT(nonnull) process_reply(NDEBUG_UNUSED eap_session_t *e ttls_tunnel_t *t = tls_session->opaque; - rad_assert(eap_session->request == request); + fr_assert(eap_session->request == request); /* * If the response packet was Access-Accept, then diff --git a/src/modules/rlm_escape/rlm_escape.c b/src/modules/rlm_escape/rlm_escape.c index 5aa2cc4403e..d7d46b85b1d 100644 --- a/src/modules/rlm_escape/rlm_escape.c +++ b/src/modules/rlm_escape/rlm_escape.c @@ -27,7 +27,7 @@ USES_APPLE_DEPRECATED_API #include #include -#include +#include #include diff --git a/src/modules/rlm_example/rlm_example.c b/src/modules/rlm_example/rlm_example.c index 4a8dc268d8f..c1723c3147e 100644 --- a/src/modules/rlm_example/rlm_example.c +++ b/src/modules/rlm_example/rlm_example.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include #include -#include +#include /* * Define a structure for our module configuration. @@ -77,7 +77,7 @@ fr_dict_attr_autoload_t rlm_example_dict_attr[] = { static int rlm_example_cmp(UNUSED void *instance, REQUEST *request, UNUSED VALUE_PAIR *thing, VALUE_PAIR *check, UNUSED VALUE_PAIR *check_pairs, UNUSED VALUE_PAIR **reply_pairs) { - rad_assert(check->vp_type == FR_TYPE_STRING); + fr_assert(check->vp_type == FR_TYPE_STRING); RINFO("Example-Paircmp called with \"%pV\"", &check->data); diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c index 2594adca601..fdc3d5ad509 100644 --- a/src/modules/rlm_exec/rlm_exec.c +++ b/src/modules/rlm_exec/rlm_exec.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include -#include +#include /* * Define a structure for our module configuration. diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c index 945165c2bbd..bc2ae91e213 100644 --- a/src/modules/rlm_expr/rlm_expr.c +++ b/src/modules/rlm_expr/rlm_expr.c @@ -28,7 +28,7 @@ USES_APPLE_DEPRECATED_API #include #include -#include +#include #include diff --git a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c index a5eaebed087..1d00e7cd3b5 100644 --- a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c +++ b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include @@ -1241,7 +1241,7 @@ static int match_keyword(rlm_isc_dhcp_info_t *parent, rlm_isc_dhcp_tokenizer_t * return -1; } - rad_assert(half >= 0); + fr_assert(half >= 0); /* * "option" has multiple parse possibilities, so we treat diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c index 67f98947114..d11e3cc43fb 100644 --- a/src/modules/rlm_json/rlm_json.c +++ b/src/modules/rlm_json/rlm_json.c @@ -31,7 +31,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -153,10 +153,10 @@ static ssize_t jpath_validate_xlat(UNUSED TALLOC_CTX *ctx, char **out, size_t ou slen = fr_jpath_parse(request, &head, fmt, strlen(fmt)); if (slen <= 0) { - rad_assert(head == NULL); + fr_assert(head == NULL); return snprintf(*out, outlen, "%zd:%s", -(slen), fr_strerror()); } - rad_assert(talloc_get_type_abort(head, fr_jpath_node_t)); + fr_assert(talloc_get_type_abort(head, fr_jpath_node_t)); jpath_str = fr_jpath_asprint(request, head); ret = snprintf(*out, outlen, "%zu:%s", (size_t) slen, jpath_str); @@ -420,7 +420,7 @@ static int _json_map_proc_get_value(TALLOC_CTX *ctx, VALUE_PAIR **out, REQUEST * return -1; } if (ret == 0) return 0; - rad_assert(head); + fr_assert(head); for (fr_cursor_init(&cursor, out), value = head; value; diff --git a/src/modules/rlm_krb5/krb5.c b/src/modules/rlm_krb5/krb5.c index 44ffe6747e1..d7a8f9cb10f 100644 --- a/src/modules/rlm_krb5/krb5.c +++ b/src/modules/rlm_krb5/krb5.c @@ -27,7 +27,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_krb5 (%s) - " #define LOG_PREFIX_ARGS inst->name -#include +#include #include #include "krb5.h" diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c index 8ce012c7e65..20d771c0a78 100644 --- a/src/modules/rlm_krb5/rlm_krb5.c +++ b/src/modules/rlm_krb5/rlm_krb5.c @@ -31,7 +31,7 @@ RCSID("$Id$") #include #include -#include +#include #include "krb5.h" static const CONF_PARSER module_config[] = { @@ -287,7 +287,7 @@ static rlm_rcode_t krb5_parse_user(krb5_principal *client, KRB5_UNUSED rlm_krb5_ */ static rlm_rcode_t krb5_process_error(rlm_krb5_t const *inst, REQUEST *request, rlm_krb5_handle_t *conn, int ret) { - rad_assert(ret != 0); + fr_assert(ret != 0); if (!fr_cond_assert(inst)) return RLM_MODULE_FAIL; if (!fr_cond_assert(conn)) return RLM_MODULE_FAIL; /* Silences warnings */ diff --git a/src/modules/rlm_ldap/clients.c b/src/modules/rlm_ldap/clients.c index b6c2bf4d31e..1028116b9da 100644 --- a/src/modules/rlm_ldap/clients.c +++ b/src/modules/rlm_ldap/clients.c @@ -27,7 +27,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API -#include +#include #include #define LOG_PREFIX "rlm_ldap (%s) - " @@ -125,7 +125,7 @@ int rlm_ldap_client_load(rlm_ldap_t const *inst, CONF_SECTION *tmpl, CONF_SECTIO DEBUG("Loading dynamic clients"); - rad_assert(inst->clientobj_base_dn); + fr_assert(inst->clientobj_base_dn); count = cf_pair_count(map); count++; @@ -159,7 +159,7 @@ int rlm_ldap_client_load(rlm_ldap_t const *inst, CONF_SECTION *tmpl, CONF_SECTIO goto finish; } - rad_assert(conn); + fr_assert(conn); conn->rebound = false; } @@ -180,7 +180,7 @@ int rlm_ldap_client_load(rlm_ldap_t const *inst, CONF_SECTION *tmpl, CONF_SECTIO goto finish; } - rad_assert(conn); + fr_assert(conn); entry = ldap_first_entry(conn->handle, result); if (!entry) { int ldap_errno; diff --git a/src/modules/rlm_ldap/conn.c b/src/modules/rlm_ldap/conn.c index 925d7facbb0..31fd2394c0c 100644 --- a/src/modules/rlm_ldap/conn.c +++ b/src/modules/rlm_ldap/conn.c @@ -30,7 +30,7 @@ USES_APPLE_DEPRECATED_API #define LOG_PREFIX "%s - " #define LOG_PREFIX_ARGS handle_config->name -#include +#include #include "rlm_ldap.h" @@ -47,7 +47,7 @@ fr_ldap_connection_t *mod_conn_get(rlm_ldap_t const *inst, REQUEST *request) conn = fr_pool_connection_get(inst->pool, request); - rad_assert(!conn || conn->config); + fr_assert(!conn || conn->config); #ifdef LDAP_CONTROL_X_SESSION_TRACKING /* diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c index e8649d19701..0cd28df3125 100644 --- a/src/modules/rlm_ldap/groups.c +++ b/src/modules/rlm_ldap/groups.c @@ -28,7 +28,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API -#include +#include #include #define LOG_PREFIX "rlm_ldap (%s) - " @@ -288,8 +288,8 @@ rlm_rcode_t rlm_ldap_cacheable_userobj(rlm_ldap_t const *inst, REQUEST *request, int is_dn, i, count; - rad_assert(entry); - rad_assert(attr); + fr_assert(entry); + fr_assert(attr); /* * Parse the membership information we got in the initial user query. @@ -304,8 +304,8 @@ rlm_rcode_t rlm_ldap_cacheable_userobj(rlm_ldap_t const *inst, REQUEST *request, list = radius_list(request, PAIR_LIST_CONTROL); list_ctx = radius_list_ctx(request, PAIR_LIST_CONTROL); - rad_assert(list != NULL); - rad_assert(list_ctx != NULL); + fr_assert(list != NULL); + fr_assert(list_ctx != NULL); /* * Simplifies freeing temporary values @@ -441,7 +441,7 @@ rlm_rcode_t rlm_ldap_cacheable_groupobj(rlm_ldap_t const *inst, REQUEST *request VALUE_PAIR *vp; char *dn; - rad_assert(inst->groupobj_base_dn); + fr_assert(inst->groupobj_base_dn); if (!inst->groupobj_membership_filter) { RDEBUG2("Skipping caching group objects as directive 'group.membership_filter' is not set"); @@ -548,7 +548,7 @@ rlm_rcode_t rlm_ldap_check_groupobj_dynamic(rlm_ldap_t const *inst, REQUEST *req char filter[LDAP_MAX_FILTER_STR_LEN + 1]; int ret; - rad_assert(inst->groupobj_base_dn); + fr_assert(inst->groupobj_base_dn); switch (check->op) { case T_OP_CMP_EQ: @@ -808,7 +808,7 @@ rlm_rcode_t rlm_ldap_check_userobj_dynamic(rlm_ldap_t const *inst, REQUEST *requ continue; } - rad_assert(0); + fr_assert(0); } finish: diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c index 04bbc754729..300caf8b130 100644 --- a/src/modules/rlm_ldap/rlm_ldap.c +++ b/src/modules/rlm_ldap/rlm_ldap.c @@ -31,7 +31,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API -#include +#include #include "rlm_ldap.h" @@ -354,8 +354,8 @@ static ssize_t ldap_xlat(UNUSED TALLOC_CTX *ctx, char **out, size_t outlen, goto free_socket; } - rad_assert(conn); - rad_assert(result); + fr_assert(conn); + fr_assert(result); entry = ldap_first_entry(conn->handle, result); if (!entry) { @@ -497,8 +497,8 @@ static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, REQUEST goto free_socket; } - rad_assert(conn); - rad_assert(result); + fr_assert(conn); + fr_assert(result); for (entry = ldap_first_entry(conn->handle, result); entry; @@ -602,7 +602,7 @@ static int rlm_ldap_groupcmp(void *instance, REQUEST *request, UNUSED VALUE_PAIR fr_ldap_connection_t *conn = NULL; char const *user_dn; - rad_assert(inst->groupobj_base_dn); + fr_assert(inst->groupobj_base_dn); RDEBUG2("Searching for user in group \"%pV\"", &check->data); @@ -653,7 +653,7 @@ static int rlm_ldap_groupcmp(void *instance, REQUEST *request, UNUSED VALUE_PAIR return 1; } - rad_assert(conn); + fr_assert(conn); /* * Check groupobj user membership @@ -671,7 +671,7 @@ static int rlm_ldap_groupcmp(void *instance, REQUEST *request, UNUSED VALUE_PAIR } } - rad_assert(conn); + fr_assert(conn); /* * Check userobj group membership @@ -689,7 +689,7 @@ static int rlm_ldap_groupcmp(void *instance, REQUEST *request, UNUSED VALUE_PAIR } } - rad_assert(conn); + fr_assert(conn); finish: if (conn) ldap_mod_conn_release(inst, request, conn); @@ -869,7 +869,7 @@ static rlm_rcode_t rlm_ldap_map_profile(rlm_ldap_t const *inst, REQUEST *request char const *filter; char filter_buff[LDAP_MAX_FILTER_STR_LEN]; - rad_assert(inst->profile_filter); /* We always have a default filter set */ + fr_assert(inst->profile_filter); /* We always have a default filter set */ if (!dn || !*dn) return RLM_MODULE_OK; @@ -895,8 +895,8 @@ static rlm_rcode_t rlm_ldap_map_profile(rlm_ldap_t const *inst, REQUEST *request return RLM_MODULE_FAIL; } - rad_assert(*pconn); - rad_assert(result); + fr_assert(*pconn); + fr_assert(result); entry = ldap_first_entry(handle, result); if (!entry) { @@ -1198,7 +1198,7 @@ static rlm_rcode_t user_modify(rlm_ldap_t const *inst, REQUEST *request, ldap_ac char *p = path; - rad_assert(section); + fr_assert(section); /* * Locate the update section were going to be using @@ -1272,7 +1272,7 @@ static rlm_rcode_t user_modify(rlm_ldap_t const *inst, REQUEST *request, ldap_ac break; default: - rad_assert(0); + fr_assert(0); goto error; } diff --git a/src/modules/rlm_ldap/user.c b/src/modules/rlm_ldap/user.c index f16cfa581c5..367b58ccaba 100644 --- a/src/modules/rlm_ldap/user.c +++ b/src/modules/rlm_ldap/user.c @@ -28,7 +28,7 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API -#include +#include #include #define LOG_PREFIX "rlm_ldap (%s) - " @@ -110,7 +110,7 @@ char const *rlm_ldap_find_user(rlm_ldap_t const *inst, REQUEST *request, fr_ldap return NULL; } - rad_assert(*pconn); + fr_assert(*pconn); (*pconn)->rebound = false; } @@ -149,7 +149,7 @@ char const *rlm_ldap_find_user(rlm_ldap_t const *inst, REQUEST *request, fr_ldap return NULL; } - rad_assert(*pconn); + fr_assert(*pconn); /* * Forbid the use of unsorted search results that diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c index 626670846a7..6a0a7b3f802 100644 --- a/src/modules/rlm_linelog/rlm_linelog.c +++ b/src/modules/rlm_linelog/rlm_linelog.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include #include -#include +#include #include #ifdef HAVE_FCNTL_H @@ -235,7 +235,7 @@ static void *mod_conn_create(TALLOC_CTX *ctx, void *instance, fr_time_delta_t ti case LINELOG_DST_INVALID: case LINELOG_DST_FILE: case LINELOG_DST_SYSLOG: - rad_assert(0); + fr_assert(0); return NULL; } @@ -395,7 +395,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) break; case LINELOG_DST_INVALID: - rad_assert(0); + fr_assert(0); break; } @@ -670,7 +670,7 @@ build_vector: exfile_close(inst->file.ef, request, fd); /* Assert on the extra fatal errors */ - rad_assert((errno != EINVAL) && (errno != EFAULT)); + fr_assert((errno != EINVAL) && (errno != EFAULT)); return RLM_MODULE_FAIL; } @@ -732,7 +732,7 @@ build_vector: /* Assert on the extra fatal errors */ case EINVAL: case EFAULT: - rad_assert(0); + fr_assert(0); /* FALL-THROUGH */ /* Normal errors that just cause the module to fail */ @@ -764,7 +764,7 @@ build_vector: break; #endif case LINELOG_DST_INVALID: - rad_assert(0); + fr_assert(0); rcode = RLM_MODULE_FAIL; break; } diff --git a/src/modules/rlm_logtee/rlm_logtee.c b/src/modules/rlm_logtee/rlm_logtee.c index 5d02c171bc4..121da0c4407 100644 --- a/src/modules/rlm_logtee/rlm_logtee.c +++ b/src/modules/rlm_logtee/rlm_logtee.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include #include #ifdef HAVE_FCNTL_H @@ -252,7 +252,7 @@ static void _logtee_conn_read(UNUSED fr_event_list_t *el, int sock, UNUSED int f * If there are, investigate why we get them... */ default: - rad_assert(0); + fr_assert(0); } } } @@ -297,7 +297,7 @@ static void _logtee_conn_writable(UNUSED fr_event_list_t *el, int sock, UNUSED i * If there are, investigate why we get them... */ default: - rad_assert(0); + fr_assert(0); } } @@ -420,7 +420,7 @@ static fr_connection_state_t _logtee_conn_init(void **h_out, fr_connection_t *co */ case LOGTEE_DST_INVALID: case LOGTEE_DST_FILE: - rad_assert(0); + fr_assert(0); return FR_CONNECTION_STATE_FAILED; } @@ -462,7 +462,7 @@ static void logtee_it(fr_log_type_t type, fr_log_lvl_t lvl, REQUEST *request, VALUE_PAIR *vp; log_dst_t *dst; - rad_assert(t->msg->vp_length == 0); /* Should have been cleared before returning */ + fr_assert(t->msg->vp_length == 0); /* Should have been cleared before returning */ /* * None of this should involve mallocs unless msg > 1k @@ -645,7 +645,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) break; case LOGTEE_DST_INVALID: - rad_assert(0); + fr_assert(0); break; } diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c index 485baf5545a..208265d073d 100644 --- a/src/modules/rlm_lua/lua.c +++ b/src/modules/rlm_lua/lua.c @@ -29,7 +29,7 @@ RCSID("$Id$") #define LOG_PREFIX_ARGS inst->xlat_name #include -#include +#include #include "config.h" #include "lua.h" @@ -318,10 +318,10 @@ static int _lua_pair_get(lua_State *L) VALUE_PAIR *vp = NULL; int index; - rad_assert(lua_islightuserdata(L, lua_upvalueindex(1))); + fr_assert(lua_islightuserdata(L, lua_upvalueindex(1))); da = lua_touserdata(L, lua_upvalueindex(1)); - rad_assert(da); + fr_assert(da); /* * @fixme Packet list should be light user data too at some point @@ -365,10 +365,10 @@ static int _lua_pair_set(lua_State *L) * This function should only be called as a closure. * As we control the upvalues, we should assert on errors. */ - rad_assert(lua_islightuserdata(L, lua_upvalueindex(1))); + fr_assert(lua_islightuserdata(L, lua_upvalueindex(1))); da = lua_touserdata(L, lua_upvalueindex(1)); - rad_assert(da); + fr_assert(da); delete = lua_isnil(L, -1); @@ -418,10 +418,10 @@ static int _lua_pair_iterator(lua_State *L) * As we control the upvalues, we should assert on errors. */ - rad_assert(lua_isuserdata(L, lua_upvalueindex(1))); + fr_assert(lua_isuserdata(L, lua_upvalueindex(1))); cursor = lua_touserdata(L, lua_upvalueindex(1)); - rad_assert(cursor); + fr_assert(cursor); /* Packet list should be light user data too at some point... */ vp = fr_cursor_next(cursor); @@ -447,10 +447,10 @@ static int _lua_pair_iterator_init(lua_State *L) * This function should only be called as a closure. * As we control the upvalues, we should assert on errors. */ - rad_assert(lua_isuserdata(L, lua_upvalueindex(2))); + fr_assert(lua_isuserdata(L, lua_upvalueindex(2))); da = lua_touserdata(L, lua_upvalueindex(2)); - rad_assert(da); + fr_assert(da); cursor = (fr_cursor_t*) lua_newuserdata(L, sizeof(fr_cursor_t)); if (!cursor) { @@ -471,10 +471,10 @@ static int _lua_list_iterator(lua_State *L) fr_cursor_t *cursor; VALUE_PAIR *vp; - rad_assert(lua_isuserdata(L, lua_upvalueindex(1))); + fr_assert(lua_isuserdata(L, lua_upvalueindex(1))); cursor = lua_touserdata(L, lua_upvalueindex(1)); - rad_assert(cursor); + fr_assert(cursor); /* Packet list should be light user data too at some point... */ vp = fr_cursor_current(cursor); diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c index b509e466f3c..1ab937f2e9e 100644 --- a/src/modules/rlm_lua/rlm_lua.c +++ b/src/modules/rlm_lua/rlm_lua.c @@ -29,7 +29,7 @@ RCSID("$Id$") #define LOG_PREFIX_ARGS inst->xlat_name #include -#include +#include #include #include "lua.h" diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c index 63da659c585..7bdc830ddb6 100644 --- a/src/modules/rlm_mruby/rlm_mruby.c +++ b/src/modules/rlm_mruby/rlm_mruby.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include "rlm_mruby.h" @@ -295,7 +295,7 @@ static int mruby_vps_to_array(REQUEST *request, mrb_value *out, mrb_state *mrb, break; case FR_TYPE_NON_VALUES: - rad_assert(0); + fr_assert(0); return -1; } diff --git a/src/modules/rlm_mschap/auth_wbclient.c b/src/modules/rlm_mschap/auth_wbclient.c index ad4800f61cf..e443049e556 100644 --- a/src/modules/rlm_mschap/auth_wbclient.c +++ b/src/modules/rlm_mschap/auth_wbclient.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -100,7 +100,7 @@ int do_auth_wbclient(rlm_mschap_t const *inst, REQUEST *request, /* * wb_username must be set for this function to be called */ - rad_assert(inst->wb_username); + fr_assert(inst->wb_username); MEM(authparams = talloc_zero_pooled_object(NULL, struct wbcAuthUserParams, 2, 1024)); /* diff --git a/src/modules/rlm_mschap/mschap.c b/src/modules/rlm_mschap/mschap.c index 9c39e0ce98f..aff12247039 100644 --- a/src/modules/rlm_mschap/mschap.c +++ b/src/modules/rlm_mschap/mschap.c @@ -32,7 +32,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include diff --git a/src/modules/rlm_mschap/opendir.c b/src/modules/rlm_mschap/opendir.c index e94480aca11..42d37f714a6 100644 --- a/src/modules/rlm_mschap/opendir.c +++ b/src/modules/rlm_mschap/opendir.c @@ -23,7 +23,7 @@ USES_APPLE_DEPRECATED_API #include #include -#include +#include #include #include diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c index 6c67e50f571..9e336366d14 100644 --- a/src/modules/rlm_mschap/rlm_mschap.c +++ b/src/modules/rlm_mschap/rlm_mschap.c @@ -31,7 +31,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -1561,7 +1561,7 @@ found_password: return 0; } - rad_assert(password->da == attr_nt_password); + fr_assert(password->da == attr_nt_password); if (RDEBUG_ENABLED3) { RDEBUG3("Found &control:%pP", password); @@ -2093,7 +2093,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authenticate(void *instance, UNUSED void break; default: - rad_assert(0); + fr_assert(0); break; } @@ -2194,7 +2194,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) return -1; } inst->auth_type = fr_dict_enum_by_name(attr_auth_type, inst->name, -1); - rad_assert(inst->auth_type); + fr_assert(inst->auth_type); xlat_register(inst, inst->name, mschap_xlat, NULL, NULL, 0, XLAT_DEFAULT_BUF_LEN, true); diff --git a/src/modules/rlm_opendirectory/rlm_opendirectory.c b/src/modules/rlm_opendirectory/rlm_opendirectory.c index 330f9914cd3..b2700b7d1cc 100644 --- a/src/modules/rlm_opendirectory/rlm_opendirectory.c +++ b/src/modules/rlm_opendirectory/rlm_opendirectory.c @@ -31,7 +31,7 @@ USES_APPLE_DEPRECATED_API #include #include -#include +#include #include #include @@ -522,7 +522,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) return -1; } inst->auth_type = fr_dict_enum_by_name(attr_auth_type, inst->name, -1); - rad_assert(inst->auth_type); + fr_assert(inst->auth_type); return 0; } diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c index 3686dd55d8c..96a5a9e3adf 100644 --- a/src/modules/rlm_pap/rlm_pap.c +++ b/src/modules/rlm_pap/rlm_pap.c @@ -30,7 +30,7 @@ USES_APPLE_DEPRECATED_API #include #include #include -#include +#include #include #include #include @@ -295,7 +295,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_auth_evp_md(UNUSED rlm_pap_t const *inst EVP_DigestFinal_ex(ctx, digest, &digest_len); EVP_MD_CTX_destroy(ctx); - rad_assert((size_t) digest_len == known_good->vp_length); /* This would be an OpenSSL bug... */ + fr_assert((size_t) digest_len == known_good->vp_length); /* This would be an OpenSSL bug... */ if (fr_digest_cmp(digest, known_good->vp_octets, known_good->vp_length) != 0) { REDEBUG("%s digest does not match \"known good\" digest", name); @@ -324,7 +324,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_auth_evp_md_salted(UNUSED rlm_pap_t cons EVP_DigestFinal_ex(ctx, digest, &digest_len); EVP_MD_CTX_destroy(ctx); - rad_assert((size_t) digest_len == min_len); /* This would be an OpenSSL bug... */ + fr_assert((size_t) digest_len == min_len); /* This would be an OpenSSL bug... */ /* * Only compare digest_len bytes, the rest is salt. @@ -666,7 +666,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_auth_nt(UNUSED rlm_pap_t const *inst, RE RDEBUG2("Comparing with \"known-good\" NT-Password"); - rad_assert(password->da == attr_user_password); + fr_assert(password->da == attr_user_password); if (known_good->vp_length != MD4_DIGEST_LENGTH) { REDEBUG("\"known good\" NT-Password has incorrect length, expected 16 got %zu", known_good->vp_length); @@ -878,10 +878,10 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authenticate(void *instance, UNUSED void return RLM_MODULE_FAIL; } - rad_assert(known_good->da->attr < NUM_ELEMENTS(auth_func_table)); + fr_assert(known_good->da->attr < NUM_ELEMENTS(auth_func_table)); auth_func = auth_func_table[known_good->da->attr]; - rad_assert(auth_func); + fr_assert(auth_func); if (RDEBUG_ENABLED3) { RDEBUG3("Comparing with \"known good\" %pP (%zu)", known_good, known_good->vp_length); @@ -927,7 +927,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) return -1; } inst->auth_type = fr_dict_enum_by_name(attr_auth_type, inst->name, -1); - rad_assert(inst->auth_type); + fr_assert(inst->auth_type); return 0; } diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c index 26f5416951b..91865cd5c57 100644 --- a/src/modules/rlm_passwd/rlm_passwd.c +++ b/src/modules/rlm_passwd/rlm_passwd.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include struct mypasswd { struct mypasswd *next; @@ -397,8 +397,8 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) fr_dict_attr_t const *da; rlm_passwd_t *inst = instance; - rad_assert(inst->filename && *inst->filename); - rad_assert(inst->format && *inst->format); + fr_assert(inst->filename && *inst->filename); + fr_assert(inst->format && *inst->format); if (inst->hash_size == 0) { cf_log_err(conf, "Invalid value '0' for hash_size"); diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c index c44942f6fb7..d63e5ee0d20 100644 --- a/src/modules/rlm_perl/rlm_perl.c +++ b/src/modules/rlm_perl/rlm_perl.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include #ifdef INADDR_ANY # undef INADDR_ANY diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c index a0eb067c199..7892a48be33 100644 --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -33,7 +33,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -487,7 +487,7 @@ static int mod_populate_vptuple(rlm_python_t const *inst, REQUEST *request, PyOb break; case FR_TYPE_NON_VALUES: - rad_assert(0); + fr_assert(0); return -1; } @@ -909,7 +909,7 @@ static PyObject *python_module_init(void) NULL, /* m_free */ }; - rad_assert(inst && conf); + fr_assert(inst && conf); module = PyModule_Create(&py_module_def); if (!module) { @@ -1242,7 +1242,7 @@ static int mod_load(void) #define LOAD_INFO(_fmt, ...) fr_log(LOG_DST, L_INFO, __FILE__, __LINE__, "rlm_python - " _fmt, ## __VA_ARGS__) #define LOAD_WARN(_fmt, ...) fr_log(LOG_DST, L_WARN, __FILE__, __LINE__, "rlm_python - " _fmt, ## __VA_ARGS__) - rad_assert(!Py_IsInitialized()); + fr_assert(!Py_IsInitialized()); LOAD_INFO("Python version: %s", Py_GetVersion()); dependency_version_number_add(NULL, "python", Py_GetVersion()); @@ -1282,7 +1282,7 @@ static int mod_load(void) #if PY_VERSION_HEX < 0x03070000 PyEval_InitThreads(); /* This also grabs a lock (which we then need to release) */ #endif - rad_assert(PyEval_ThreadsInitialized()); + fr_assert(PyEval_ThreadsInitialized()); /* * Set program name (i.e. the software calling the interpreter) diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c index c9b9d3090b1..b2f6c99224c 100644 --- a/src/modules/rlm_radius/rlm_radius.c +++ b/src/modules/rlm_radius/rlm_radius.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -181,7 +181,7 @@ static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *parent, /* * Must be the RADIUS module */ - rad_assert(cs && (strcmp(cf_section_name1(cs), "radius") == 0)); + fr_assert(cs && (strcmp(cf_section_name1(cs), "radius") == 0)); /* * Allow the process module to be specified by @@ -247,7 +247,7 @@ static int transport_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, if (!transport_cs) transport_cs = cf_section_alloc(cs, cs, name, NULL); parent_inst = cf_data_value(cf_data_find(cs, dl_module_inst_t, "rlm_radius")); - rad_assert(parent_inst); + fr_assert(parent_inst); return dl_module_instance(ctx, out, transport_cs, parent_inst, name, DL_MODULE_TYPE_SUBMODULE); } @@ -330,7 +330,7 @@ static int status_check_update_parse(TALLOC_CTX *ctx, void *out, UNUSED void *pa char const *name2; vp_map_t *head = NULL; - rad_assert(cf_item_is_section(ci)); + fr_assert(cf_item_is_section(ci)); cs = cf_item_to_section(ci); name2 = cf_section_name2(cs); @@ -486,7 +486,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_process(void *instance, void *thread, RE */ rcode = inst->io->enqueue(&rctx, inst->io_instance, t->io_thread, request); if (rcode != RLM_MODULE_YIELD) { - rad_assert(rctx == NULL); + fr_assert(rctx == NULL); return rcode; } @@ -600,7 +600,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) } num_types = talloc_array_length(inst->types); - rad_assert(num_types > 0); + fr_assert(num_types > 0); /* * Allow for O(1) lookup later... @@ -609,13 +609,13 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) uint32_t code; code = inst->types[i]; - rad_assert(code > 0); - rad_assert(code < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(code > 0); + fr_assert(code < FR_RADIUS_MAX_PACKET_CODE); inst->allowed[code] = true; } - rad_assert(inst->status_check < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(inst->status_check < FR_RADIUS_MAX_PACKET_CODE); /* * If we're replicating, we don't care if the other end @@ -743,9 +743,9 @@ setup_io_submodule: inst->io_instance = inst->io_submodule->data; inst->io_conf = inst->io_submodule->conf; - rad_assert(inst->io->thread_inst_size > 0); - rad_assert(inst->io->bootstrap != NULL); - rad_assert(inst->io->instantiate != NULL); + fr_assert(inst->io->thread_inst_size > 0); + fr_assert(inst->io->bootstrap != NULL); + fr_assert(inst->io->instantiate != NULL); /* * Get random Proxy-State identifier for this module. diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c index 67c0fff61c0..df353d03ab6 100644 --- a/src/modules/rlm_radius/rlm_radius_udp.c +++ b/src/modules/rlm_radius/rlm_radius_udp.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include #include @@ -313,7 +313,7 @@ static void udp_request_reset(udp_request_t *u) */ static void status_check_reset(udp_handle_t *h, udp_request_t *u) { - rad_assert(u->status_check == true); + fr_assert(u->status_check == true); h->status_checking = false; u->num_replies = 0; /* Reset */ @@ -443,7 +443,7 @@ static void conn_error_status_check(UNUSED fr_event_list_t *el, UNUSED int fd, U /* * Connection must be in the connecting state when this fires */ - rad_assert(conn->state == FR_CONNECTION_STATE_CONNECTING); + fr_assert(conn->state == FR_CONNECTION_STATE_CONNECTING); h = talloc_get_type_abort(conn->h, udp_handle_t); @@ -465,7 +465,7 @@ static void conn_status_check_timeout(fr_event_list_t *el, fr_time_t now, void * /* * Connection must be in the connecting state when this fires */ - rad_assert(conn->state == FR_CONNECTION_STATE_CONNECTING); + fr_assert(conn->state == FR_CONNECTION_STATE_CONNECTING); h = talloc_get_type_abort(conn->h, udp_handle_t); u = h->status_u; @@ -497,7 +497,7 @@ static void conn_status_check_timeout(fr_event_list_t *el, fr_time_t now, void * return; } - rad_assert(0); + fr_assert(0); } /** Send the next status check packet @@ -659,7 +659,7 @@ static void conn_writable_status_check(fr_event_list_t *el, UNUSED int fd, UNUSE h->module_name, fr_packet_codes[u->code], u->id, u->packet_len, h->name, fr_syserror(errno)); goto fail; } - rad_assert((size_t)slen == u->packet_len); + fr_assert((size_t)slen == u->packet_len); /* * Switch to waiting on read and insert the event @@ -686,7 +686,7 @@ static void conn_writable_status_check(fr_event_list_t *el, UNUSED int fd, UNUSE */ static int _udp_handle_free(udp_handle_t *h) { - rad_assert(h->fd >= 0); + fr_assert(h->fd >= 0); if (h->status_u) fr_event_timer_delete(&h->status_u->ev); @@ -847,8 +847,8 @@ static void conn_close(UNUSED fr_event_list_t *el, void *handle, UNUSED void *uc #ifndef NDEBUG radius_track_state_log(&default_log, L_ERR, __FILE__, __LINE__, h->tt, udp_tracking_entry_log); #endif - fr_cond_assert_fail(__FILE__, __LINE__, "0", "%u tracking entries still allocated at conn close", - h->tt->num_requests); + fr_assert_fail(__FILE__, __LINE__, "0", "%u tracking entries still allocated at conn close", + h->tt->num_requests); } talloc_free(h); @@ -1229,8 +1229,8 @@ static int encode(rlm_radius_udp_t const *inst, REQUEST *request, udp_request_t int message_authenticator = u->require_ma * (RADIUS_MESSAGE_AUTHENTICATOR_LENGTH + 2); int proxy_state = 6; - rad_assert(inst->parent->allowed[u->code]); - rad_assert(!u->packet); + fr_assert(inst->parent->allowed[u->code]); + fr_assert(!u->packet); /* * Try to retransmit, unless there are special @@ -1292,7 +1292,7 @@ static int encode(rlm_radius_udp_t const *inst, REQUEST *request, udp_request_t * We should have at mininum 64-byte packets, so don't * bother doing run-time checks here. */ - rad_assert(u->packet_len >= (size_t) (RADIUS_HEADER_LENGTH + proxy_state + message_authenticator)); + fr_assert(u->packet_len >= (size_t) (RADIUS_HEADER_LENGTH + proxy_state + message_authenticator)); /* * Encode it, leaving room for Proxy-State and @@ -1320,7 +1320,7 @@ static int encode(rlm_radius_udp_t const *inst, REQUEST *request, udp_request_t fr_cursor_t cursor; int count = 0; - rad_assert((size_t) (packet_len + proxy_state) <= u->packet_len); + fr_assert((size_t) (packet_len + proxy_state) <= u->packet_len); /* * Count how many Proxy-State attributes have @@ -1364,7 +1364,7 @@ static int encode(rlm_radius_udp_t const *inst, REQUEST *request, udp_request_t * the buflen manipulation done above. */ if (message_authenticator) { - rad_assert((size_t) (packet_len + message_authenticator) <= u->packet_len); + fr_assert((size_t) (packet_len + message_authenticator) <= u->packet_len); msg = u->packet + packet_len; @@ -1499,7 +1499,7 @@ static bool check_for_zombie(fr_event_list_t *el, fr_trunk_connection_t *tconn, * We're replicating, and don't care about the health of * the home server, and this function should not be called. */ - rad_assert(!h->inst->replicate); + fr_assert(!h->inst->replicate); /* * If there's already a zombie check started, don't do @@ -1608,10 +1608,10 @@ static void request_timeout(fr_event_list_t *el, fr_time_t now, void *uctx) REQUEST *request = treq->request; fr_trunk_connection_t *tconn = treq->tconn; - rad_assert(treq->state == FR_TRUNK_REQUEST_STATE_SENT); /* No other states should be timing out */ - rad_assert(treq->preq); /* Must still have a protocol request */ - rad_assert(u->rr); - rad_assert(tconn); + fr_assert(treq->state == FR_TRUNK_REQUEST_STATE_SENT); /* No other states should be timing out */ + fr_assert(treq->preq); /* Must still have a protocol request */ + fr_assert(u->rr); + fr_assert(tconn); h = talloc_get_type_abort(treq->tconn->conn->h, udp_handle_t); @@ -1700,7 +1700,7 @@ static void request_mux(fr_event_list_t *el, */ if (!treq) break; - rad_assert((treq->state == FR_TRUNK_REQUEST_STATE_PENDING) || + fr_assert((treq->state == FR_TRUNK_REQUEST_STATE_PENDING) || (treq->state == FR_TRUNK_REQUEST_STATE_PARTIAL)); request = treq->request; @@ -1711,8 +1711,8 @@ static void request_mux(fr_event_list_t *el, */ if (!u->retry.start) { (void) fr_retry_init(&u->retry, fr_time(), &h->inst->parent->retry[u->code]); - rad_assert(u->retry.rt > 0); - rad_assert(u->retry.next > 0); + fr_assert(u->retry.rt > 0); + fr_assert(u->retry.next > 0); } /* @@ -1726,14 +1726,14 @@ static void request_mux(fr_event_list_t *el, * the REQUEUE signal was recevied. */ if (!u->packet || !u->can_retransmit) { - rad_assert(!u->rr); + fr_assert(!u->rr); if (unlikely(radius_track_entry_reserve(&u->rr, treq, h->tt, request, u->code, treq) < 0)) { #ifndef NDEBUG radius_track_state_log(&default_log, L_ERR, __FILE__, __LINE__, h->tt, udp_tracking_entry_log); #endif - fr_cond_assert_fail(__FILE__, __LINE__, "0", "Tracking entry allocation failed"); + fr_assert_fail(__FILE__, __LINE__, "0", "Tracking entry allocation failed"); fail: fr_trunk_request_signal_fail(treq); continue; @@ -1857,9 +1857,9 @@ static void request_mux(fr_event_list_t *el, /* * It's UDP so there should never be partial writes */ - rad_assert((size_t)h->mmsgvec[i].msg_len == h->mmsgvec[i].msg_hdr.msg_iov->iov_len); + fr_assert((size_t)h->mmsgvec[i].msg_len == h->mmsgvec[i].msg_hdr.msg_iov->iov_len); - rad_assert(treq->state == FR_TRUNK_REQUEST_STATE_SENT); + fr_assert(treq->state == FR_TRUNK_REQUEST_STATE_SENT); request = treq->request; u = talloc_get_type_abort(treq->preq, udp_request_t); @@ -1932,7 +1932,7 @@ static void request_mux_replicate(UNUSED fr_event_list_t *el, */ if (!treq) break; - rad_assert((treq->state == FR_TRUNK_REQUEST_STATE_PENDING) || + fr_assert((treq->state == FR_TRUNK_REQUEST_STATE_PENDING) || (treq->state == FR_TRUNK_REQUEST_STATE_PARTIAL)); request = treq->request; @@ -2020,7 +2020,7 @@ static void request_mux_replicate(UNUSED fr_event_list_t *el, /* * It's UDP so there should never be partial writes */ - rad_assert((size_t)h->mmsgvec[i].msg_len == h->mmsgvec[i].msg_hdr.msg_iov->iov_len); + fr_assert((size_t)h->mmsgvec[i].msg_len == h->mmsgvec[i].msg_hdr.msg_iov->iov_len); r->rcode = RLM_MODULE_OK; fr_trunk_request_signal_complete(treq); @@ -2169,8 +2169,8 @@ static void status_check_reply(fr_trunk_request_t *treq, fr_time_t now) udp_request_t *u = talloc_get_type_abort(treq->preq, udp_request_t); udp_result_t *r = talloc_get_type_abort(treq->rctx, udp_result_t); - rad_assert(treq->preq == h->status_u); - rad_assert(treq->rctx == h->status_r); + fr_assert(treq->preq == h->status_u); + fr_assert(treq->rctx == h->status_r); r->treq = NULL; @@ -2276,7 +2276,7 @@ static void request_demux(fr_trunk_connection_t *tconn, fr_connection_t *conn, U treq = talloc_get_type_abort(rr->uctx, fr_trunk_request_t); request = treq->request; - rad_assert(request != NULL); + fr_assert(request != NULL); u = talloc_get_type_abort(treq->preq, udp_request_t); r = talloc_get_type_abort(treq->rctx, udp_result_t); @@ -2440,9 +2440,9 @@ static void request_fail(REQUEST *request, void *preq, void *rctx, udp_result_t *r = talloc_get_type_abort(rctx, udp_result_t); udp_request_t *u = talloc_get_type_abort(preq, udp_request_t); - rad_assert(!u->rr && !u->packet && !u->extra && !u->ev); /* Dealt with by request_conn_release */ + fr_assert(!u->rr && !u->packet && !u->extra && !u->ev); /* Dealt with by request_conn_release */ - rad_assert(state != FR_TRUNK_REQUEST_STATE_INIT); + fr_assert(state != FR_TRUNK_REQUEST_STATE_INIT); if (u->status_check) return; @@ -2460,7 +2460,7 @@ static void request_complete(REQUEST *request, void *preq, void *rctx, UNUSED vo udp_result_t *r = talloc_get_type_abort(rctx, udp_result_t); udp_request_t *u = talloc_get_type_abort(preq, udp_request_t); - rad_assert(!u->rr && !u->packet && !u->extra && !u->ev); /* Dealt with by request_conn_release */ + fr_assert(!u->rr && !u->packet && !u->extra && !u->ev); /* Dealt with by request_conn_release */ if (u->status_check) return; @@ -2476,7 +2476,7 @@ static void request_free(UNUSED REQUEST *request, void *preq_to_free, UNUSED voi { udp_request_t *u = talloc_get_type_abort(preq_to_free, udp_request_t); - rad_assert(!u->rr && !u->packet && !u->extra && !u->ev); /* Dealt with by request_conn_release */ + fr_assert(!u->rr && !u->packet && !u->extra && !u->ev); /* Dealt with by request_conn_release */ /* * Don't free status check requests. @@ -2558,7 +2558,7 @@ static int _udp_request_free(udp_request_t *u) { if (u->ev) (void) fr_event_timer_delete(&u->ev); - rad_assert(u->rr == NULL); + fr_assert(u->rr == NULL); return 0; } @@ -2571,8 +2571,8 @@ static rlm_rcode_t mod_enqueue(void **rctx_out, void *instance, void *thread, RE udp_request_t *u; fr_trunk_request_t *treq; - rad_assert(request->packet->code > 0); - rad_assert(request->packet->code < FR_RADIUS_MAX_PACKET_CODE); + fr_assert(request->packet->code > 0); + fr_assert(request->packet->code < FR_RADIUS_MAX_PACKET_CODE); /* * If configured, and we don't have any active @@ -2618,7 +2618,7 @@ static rlm_rcode_t mod_enqueue(void **rctx_out, void *instance, void *thread, RE } if (fr_trunk_request_enqueue(&treq, t->trunk, request, u, r) < 0) { - rad_assert(!u->rr && !u->packet); /* Should not have been fed to the muxer */ + fr_assert(!u->rr && !u->packet); /* Should not have been fed to the muxer */ fr_trunk_request_free(&treq); /* Return to the free list */ talloc_free(r); return RLM_MODULE_FAIL; diff --git a/src/modules/rlm_radius/track.c b/src/modules/rlm_radius/track.c index 2cb4f020c33..d943b1e18db 100644 --- a/src/modules/rlm_radius/track.c +++ b/src/modules/rlm_radius/track.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include "track.h" #include "rlm_radius.h" @@ -118,7 +118,7 @@ int radius_track_entry_reserve( retry: te = fr_dlist_head(&tt->free_list); if (te) { - rad_assert(te->request == NULL); + fr_assert(te->request == NULL); /* * Mark it as used, and remove it from the free list. @@ -230,7 +230,7 @@ int radius_track_entry_release( te->request = NULL; - rad_assert(tt->num_requests > 0); + fr_assert(tt->num_requests > 0); tt->num_requests--; /* @@ -254,7 +254,7 @@ int radius_track_entry_release( /* * Delete it from the tracking subtree. */ - rad_assert(tt->subtree[te->id] != NULL); + fr_assert(tt->subtree[te->id] != NULL); (void) rbtree_deletebydata(tt->subtree[te->id], te); /* @@ -292,7 +292,7 @@ int radius_track_entry_update(radius_track_entry_t *te, uint8_t const *vector) { radius_track_t *tt = te->tt; - rad_assert(tt); + fr_assert(tt); /* * The authentication vector may have changed. @@ -308,7 +308,7 @@ int radius_track_entry_update(radius_track_entry_t *te, uint8_t const *vector) * @todo - gracefully handle fallback if the server screws up. */ if (!tt->use_authenticator) { - rad_assert(te == &tt->id[te->id]); + fr_assert(te == &tt->id[te->id]); return 0; } @@ -392,7 +392,7 @@ radius_track_entry_t *radius_track_entry_find(radius_track_t *tt, uint8_t packet } (void) talloc_get_type_abort(te, radius_track_entry_t); - rad_assert(te->request != NULL); + fr_assert(te->request != NULL); return te; } diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c index 0a9a35d7aea..a470b88e2f4 100644 --- a/src/modules/rlm_radutmp/rlm_radutmp.c +++ b/src/modules/rlm_radutmp/rlm_radutmp.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c index 2b8814c2a76..9bf24a240e8 100644 --- a/src/modules/rlm_redis/rlm_redis.c +++ b/src/modules/rlm_redis/rlm_redis.c @@ -31,7 +31,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c index a427712a94b..b14e45c50b0 100644 --- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c +++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c @@ -44,7 +44,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -614,8 +614,8 @@ static ippool_rcode_t redis_ippool_allocate(rlm_redis_ippool_t const *inst, REQU fr_redis_rcode_t status; ippool_rcode_t ret = IPPOOL_RCODE_SUCCESS; - rad_assert(key_prefix); - rad_assert(device_id); + fr_assert(key_prefix); + fr_assert(device_id); now = fr_time_to_timeval(fr_time()); @@ -639,7 +639,7 @@ static ippool_rcode_t redis_ippool_allocate(rlm_redis_ippool_t const *inst, REQU goto finish; } - rad_assert(reply); + fr_assert(reply); if (reply->type != REDIS_REPLY_ARRAY) { REDEBUG("Expected result to be array got \"%s\"", fr_table_str_by_value(redis_reply_types, reply->type, "")); @@ -1270,7 +1270,7 @@ static rlm_rcode_t mod_action(rlm_redis_ippool_t const *inst, REQUEST *request, return RLM_MODULE_NOOP; default: - rad_assert(0); + fr_assert(0); return RLM_MODULE_FAIL; } } @@ -1367,8 +1367,8 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) rlm_redis_ippool_t *inst = instance; - rad_assert(tmpl_is_attr(inst->allocated_address_attr)); - rad_assert(subcs); + fr_assert(tmpl_is_attr(inst->allocated_address_attr)); + fr_assert(subcs); inst->cluster = fr_redis_cluster_alloc(inst, subcs, &inst->conf, true, NULL, NULL, NULL); if (!inst->cluster) return -1; diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c index 140ccac6237..01d99e4aa17 100644 --- a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c +++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include #include "base.h" #include "cluster.h" @@ -255,7 +255,7 @@ static bool ipaddr_next(fr_ipaddr_t *ipaddr, fr_ipaddr_t const *end, uint8_t pre switch (ipaddr->af) { default: case AF_UNSPEC: - rad_assert(0); + fr_assert(0); return false; case AF_INET6: @@ -1355,7 +1355,7 @@ do { \ len = strlen(argv[1]); MEM(arg = talloc_array(conf, uint8_t, len)); len = fr_value_str_unescape(arg, argv[1], len, '"'); - rad_assert(len); + fr_assert(len); MEM(pool_arg = talloc_realloc(conf, arg, uint8_t, len)); } @@ -1367,7 +1367,7 @@ do { \ len = strlen(argv[2]); MEM(arg = talloc_array(conf, uint8_t, len)); len = fr_value_str_unescape(arg, argv[2], len, '"'); - rad_assert(len); + fr_assert(len); MEM(range_arg = talloc_realloc(conf, arg, uint8_t, len)); } @@ -1541,7 +1541,7 @@ do { \ if (driver_show_lease(&leases, conf->driver, p) < 0) { exit(EXIT_FAILURE); } - rad_assert(leases); + fr_assert(leases); len = talloc_array_length(leases); INFO("Retrieved information for %zu address(es)/prefix(es)", len - 1); diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c index 88b50435542..c78fb540ab3 100644 --- a/src/modules/rlm_rediswho/rlm_rediswho.c +++ b/src/modules/rlm_rediswho/rlm_rediswho.c @@ -31,7 +31,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c index ebd0cefa15a..817b3679649 100644 --- a/src/modules/rlm_rest/io.c +++ b/src/modules/rlm_rest/io.c @@ -22,7 +22,7 @@ * @copyright 2016 Arran Cudbard-Bell (a.cudbardb@freeradius.org) */ #include "rest.h" -#include +#include #include #include diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c index a30d17b93b0..e44d4de62a0 100644 --- a/src/modules/rlm_rest/rest.c +++ b/src/modules/rlm_rest/rest.c @@ -32,7 +32,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include #include @@ -323,8 +323,8 @@ static size_t rest_encode_custom(void *out, size_t size, size_t nmemb, void *use /* * If len > 0 then we must have these set. */ - rad_assert(data->start); - rad_assert(data->p); + fr_assert(data->start); + fr_assert(data->p); to_copy = data->len - (data->p - data->start); len = to_copy > freespace ? freespace : to_copy; @@ -552,7 +552,7 @@ static size_t rest_encode_json(void *out, size_t size, size_t nmemb, void *userd size_t to_copy; const char *encoded; - rad_assert(freespace > 0); + fr_assert(freespace > 0); if (ctx->state == READ_STATE_INIT) { encoded = fr_json_afrom_pair_list(data, request->packet->vps, NULL); @@ -775,7 +775,7 @@ static int rest_decode_post(UNUSED rlm_rest_t const *instance, UNUSED rlm_rest_s ctx = radius_list_ctx(current, dst->tmpl_list); da = dst->tmpl_da; - rad_assert(vps); + fr_assert(vps); RINDENT(); RDEBUG3("Type : %s", fr_table_str_by_value(fr_value_box_type_table, da->type, "")); @@ -802,7 +802,7 @@ static int rest_decode_post(UNUSED rlm_rest_t const *instance, UNUSED rlm_rest_s if (xlat_aeval(request, &expanded, request, value, NULL, NULL) < 0) goto skip; - rad_assert(expanded); + fr_assert(expanded); MEM(vp = fr_pair_afrom_da(ctx, da)); if (!vp) { @@ -1358,7 +1358,7 @@ static size_t rest_response_header(void *in, size_t size, size_t nmemb, void *us */ q = NULL; ctx->code = (int)strtoul(p, &q, 10); - rad_assert(q == (p + 3)); /* We check this above */ + fr_assert(q == (p + 3)); /* We check this above */ p = q; /* @@ -1627,7 +1627,7 @@ size_t rest_get_handle_data(char const **out, fr_curl_io_request_t *randle) { rlm_rest_curl_context_t *ctx = talloc_get_type_abort(randle->uctx, rlm_rest_curl_context_t); - rad_assert(ctx->response.buffer || !ctx->response.used); + fr_assert(ctx->response.buffer || !ctx->response.used); *out = ctx->response.buffer; return ctx->response.used; @@ -1690,7 +1690,7 @@ static int rest_request_config_body(rlm_rest_t const *instance, rlm_rest_section } RDEBUG2("Content-Length will be %zu bytes", len); - rad_assert((len == 0) || (talloc_array_length(uctx->body) >= (size_t)len)); + fr_assert((len == 0) || (talloc_array_length(uctx->body) >= (size_t)len)); SET_OPTION(CURLOPT_POSTFIELDS, uctx->body); SET_OPTION(CURLOPT_POSTFIELDSIZE, len); @@ -1832,8 +1832,8 @@ int rest_request_config(rlm_rest_t const *inst, rlm_rest_thread_t *t, rlm_rest_s char buffer[512]; - rad_assert(candle); - rad_assert((!username && !password) || (username && password)); + fr_assert(candle); + fr_assert((!username && !password) || (username && password)); buffer[(sizeof(buffer) - 1)] = '\0'; @@ -1959,7 +1959,7 @@ int rest_request_config(rlm_rest_t const *inst, rlm_rest_thread_t *t, rlm_rest_s break; default: - rad_assert(0); + fr_assert(0); break; }; @@ -2074,7 +2074,7 @@ do {\ break; default: - rad_assert(0); + fr_assert(0); }; /* @@ -2151,7 +2151,7 @@ do {\ break; default: - rad_assert(0); + fr_assert(0); } @@ -2307,7 +2307,7 @@ int rest_response_decode(rlm_rest_t const *instance, rlm_rest_section_t const *s return -1; default: - rad_assert(0); + fr_assert(0); } return ret; diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c index a7a156c9719..29eb7e767a9 100644 --- a/src/modules/rlm_rest/rlm_rest.c +++ b/src/modules/rlm_rest/rlm_rest.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include #include @@ -1157,7 +1157,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) static int mod_load(void) { /* developer sanity */ - rad_assert((NUM_ELEMENTS(http_body_type_supported)) == REST_HTTP_BODY_NUM_ENTRIES); + fr_assert((NUM_ELEMENTS(http_body_type_supported)) == REST_HTTP_BODY_NUM_ENTRIES); if (fr_curl_init() < 0) return -1; diff --git a/src/modules/rlm_securid/mem.c b/src/modules/rlm_securid/mem.c index 1a3ebc4131c..63059827eff 100644 --- a/src/modules/rlm_securid/mem.c +++ b/src/modules/rlm_securid/mem.c @@ -276,7 +276,7 @@ static void securid_sessionlist_clean_expired(rlm_securid_t *inst, REQUEST *requ if ((timestamp - session->timestamp) > inst->timer_limit) { rbnode_t *node; node = rbtree_find(inst->session_tree, session); - rad_assert(node != NULL); + fr_assert(node != NULL); rbtree_delete(inst->session_tree, node); /* diff --git a/src/modules/rlm_securid/rlm_securid.c b/src/modules/rlm_securid/rlm_securid.c index 5a4081f296e..d3e798391e9 100644 --- a/src/modules/rlm_securid/rlm_securid.c +++ b/src/modules/rlm_securid/rlm_securid.c @@ -82,8 +82,8 @@ static int securid_session_cmp(void const *a, void const *b) SECURID_SESSION const *one = a; SECURID_SESSION const *two = b; - rad_assert(one != NULL); - rad_assert(two != NULL); + fr_assert(one != NULL); + fr_assert(two != NULL); rcode = fr_ipaddr_cmp(&one->src_ipaddr, &two->src_ipaddr); if (rcode != 0) return rcode; diff --git a/src/modules/rlm_securid/rlm_securid.h b/src/modules/rlm_securid/rlm_securid.h index 690fbfd63d6..181f8394624 100644 --- a/src/modules/rlm_securid/rlm_securid.h +++ b/src/modules/rlm_securid/rlm_securid.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include +#include #include "acexport.h" diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c index 3b17be1fcfd..fc110972898 100644 --- a/src/modules/rlm_sigtran/client.c +++ b/src/modules/rlm_sigtran/client.c @@ -27,7 +27,7 @@ #define LOG_PREFIX "rlm_sigtran - " #include -#include +#include #include #include #include @@ -85,7 +85,7 @@ static int sigtran_client_do_ctrl_transaction(sigtran_transaction_t *txn) { int ret; - rad_assert(ctrl_pipe[0] >= 0); + fr_assert(ctrl_pipe[0] >= 0); pthread_mutex_lock(&ctrl_pipe_mutex); ret = sigtran_client_do_transaction(ctrl_pipe[0], txn); @@ -100,7 +100,7 @@ static int sigtran_client_do_ctrl_transaction(sigtran_transaction_t *txn) static void _sigtran_pipe_error(UNUSED fr_event_list_t *el, int fd, UNUSED int flags, int fd_errno, UNUSED void *uctx) { ERROR("worker - ctrl_pipe (%i) read failed : %s", fd, fr_syserror(fd_errno)); - rad_assert(0); + fr_assert(0); } /** Drain any data we received @@ -132,7 +132,7 @@ static void _sigtran_pipe_read(UNUSED fr_event_list_t *el, int fd, UNUSED int fl txn = talloc_get_type_abort(ptr, sigtran_transaction_t); if (txn->ctx.defunct) return; /* Request was stopped */ - rad_assert(txn->ctx.request); + fr_assert(txn->ctx.request); unlang_interpret_resumable(txn->ctx.request); /* Continue processing */ } @@ -156,7 +156,7 @@ int sigtran_client_thread_register(fr_event_list_t *el) return -1; } - rad_assert((req_pipe[0] >= 0) && (req_pipe[1] >= 0)); + fr_assert((req_pipe[0] >= 0) && (req_pipe[1] >= 0)); txn = talloc_zero(NULL, sigtran_transaction_t); txn->request.type = SIGTRAN_REQUEST_THREAD_REGISTER; @@ -288,7 +288,7 @@ static rlm_rcode_t sigtran_client_map_resume(UNUSED void *instance, UNUSED void { sigtran_transaction_t *txn = talloc_get_type_abort(rctx, sigtran_transaction_t); rlm_rcode_t rcode; - rad_assert(request == txn->ctx.request); + fr_assert(request == txn->ctx.request); /* * Process response @@ -307,9 +307,9 @@ static rlm_rcode_t sigtran_client_map_resume(UNUSED void *instance, UNUSED void for (vec = res->vector; vec; vec = vec->next) { switch (vec->type) { case SIGTRAN_VECTOR_TYPE_SIM_TRIPLETS: - rad_assert(vec->sim.rand); - rad_assert(vec->sim.sres); - rad_assert(vec->sim.kc); + fr_assert(vec->sim.rand); + fr_assert(vec->sim.sres); + fr_assert(vec->sim.kc); RDEBUG2("SIM auth vector %i", i); RINDENT(); @@ -333,11 +333,11 @@ static rlm_rcode_t sigtran_client_map_resume(UNUSED void *instance, UNUSED void break; case SIGTRAN_VECTOR_TYPE_UMTS_QUINTUPLETS: - rad_assert(vec->umts.rand); - rad_assert(vec->umts.xres); - rad_assert(vec->umts.ck); - rad_assert(vec->umts.ik); - rad_assert(vec->umts.authn); + fr_assert(vec->umts.rand); + fr_assert(vec->umts.xres); + fr_assert(vec->umts.ck); + fr_assert(vec->umts.ik); + fr_assert(vec->umts.authn); RDEBUG2("UMTS auth vector %i", i); RINDENT(); @@ -384,7 +384,7 @@ static rlm_rcode_t sigtran_client_map_resume(UNUSED void *instance, UNUSED void break; default: - rad_assert(0); + fr_assert(0); /* FALL-THROUGH */ case SIGTRAN_RESPONSE_FAIL: @@ -414,7 +414,7 @@ rlm_rcode_t sigtran_client_map_send_auth_info(rlm_sigtran_t const *inst, REQUEST char *imsi; size_t len; - rad_assert((fd != ctrl_pipe[0]) && (fd != ctrl_pipe[1])); + fr_assert((fd != ctrl_pipe[0]) && (fd != ctrl_pipe[1])); txn = talloc_zero(NULL, sigtran_transaction_t); txn->request.type = SIGTRAN_REQUEST_MAP_SEND_AUTH_INFO; diff --git a/src/modules/rlm_sigtran/event.c b/src/modules/rlm_sigtran/event.c index 7fdcc4bbbe6..3356168fff8 100644 --- a/src/modules/rlm_sigtran/event.c +++ b/src/modules/rlm_sigtran/event.c @@ -61,7 +61,7 @@ #include #include -#include +#include #include #include #include @@ -453,7 +453,7 @@ static int event_process_request(struct osmo_fd *ofd, unsigned int what) #endif default: - rad_assert(0); + fr_assert(0); goto fatal_error; } @@ -470,7 +470,7 @@ static void *sigtran_event_loop(UNUSED void *instance) { TALLOC_CTX *ctx = talloc_init("sigtran_event_ctx"); - rad_assert((ctrl_pipe[0] < 0) && (ctrl_pipe[1] < 0)); /* Ensure only one instance exists */ + fr_assert((ctrl_pipe[0] < 0) && (ctrl_pipe[1] < 0)); /* Ensure only one instance exists */ /* * Patch in libosmo's logging system to ours diff --git a/src/modules/rlm_sigtran/rlm_sigtran.c b/src/modules/rlm_sigtran/rlm_sigtran.c index c6f29afe368..2b627b59054 100644 --- a/src/modules/rlm_sigtran/rlm_sigtran.c +++ b/src/modules/rlm_sigtran/rlm_sigtran.c @@ -44,7 +44,7 @@ RCSID("$Id$") #include #include -#include +#include #include "sigtran.h" #include "attrs.h" diff --git a/src/modules/rlm_sigtran/sccp.c b/src/modules/rlm_sigtran/sccp.c index a1b38b2c061..a083ed7e1db 100644 --- a/src/modules/rlm_sigtran/sccp.c +++ b/src/modules/rlm_sigtran/sccp.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include @@ -132,7 +132,7 @@ int sigtran_tcap_outgoing(UNUSED struct msgb *msg_in, void *ctx, sigtran_transac struct mtp_m3ua_client_link *m3ua_client = talloc_get_type_abort(conn->mtp3_link->data, struct mtp_m3ua_client_link); - rad_assert(req->imsi); + fr_assert(req->imsi); if (!mtp_m3ua_link_is_up(m3ua_client)) { ERROR("Link not yet active, dropping the request"); @@ -257,7 +257,7 @@ static int sigtran_tcap_incoming(struct msgb *msg, UNUSED unsigned int length, U } if (!rbtree_deletebydata(txn_tree, found)) { /* Remove the outstanding transaction */ ERROR("Failed removing transaction"); - rad_assert(0); + fr_assert(0); } txn = talloc_get_type_abort(found, sigtran_transaction_t); diff --git a/src/modules/rlm_sigtran/sigtran.c b/src/modules/rlm_sigtran/sigtran.c index d7d3fe40e2b..c8b1b560a41 100644 --- a/src/modules/rlm_sigtran/sigtran.c +++ b/src/modules/rlm_sigtran/sigtran.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include "sigtran.h" diff --git a/src/modules/rlm_sometimes/rlm_sometimes.c b/src/modules/rlm_sometimes/rlm_sometimes.c index 7cfeae34518..db7333b036c 100644 --- a/src/modules/rlm_sometimes/rlm_sometimes.c +++ b/src/modules/rlm_sometimes/rlm_sometimes.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include #include -#include +#include /* * The instance data for rlm_sometimes is the list of fake values we are diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c index 6abb937f888..04a2ca03ffc 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c @@ -36,7 +36,7 @@ #define LOG_PREFIX "rlm_sql_cassandra - " #include -#include +#include #include diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c index a044c762d2a..d59e6f330e6 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c @@ -32,7 +32,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_sql_db2 - " #include -#include +#include #include @@ -261,8 +261,8 @@ static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED si SQLSMALLINT rl; rlm_sql_db2_conn_t *conn = handle->conn; - rad_assert(conn); - rad_assert(outlen > 0); + fr_assert(conn); + fr_assert(outlen > 0); errbuff[0] = '\0'; SQLGetDiagRec(SQL_HANDLE_STMT, conn->stmt, 1, (SQLCHAR *) state, &err, diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c index 08244e0cf46..d7e82cacc5e 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c @@ -23,7 +23,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_sql_firebird - " #include "sql_fbapi.h" -#include +#include /* Forward declarations */ @@ -271,8 +271,8 @@ static size_t sql_error(UNUSED TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UN { rlm_sql_firebird_conn_t *conn = handle->conn; - rad_assert(conn); - rad_assert(outlen > 0); + fr_assert(conn); + fr_assert(outlen > 0); if (!conn->error) return 0; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c index 7b525b2d4cc..86da2e3a1ba 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c @@ -29,7 +29,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_sql_freetds - " #include -#include +#include #include @@ -393,8 +393,8 @@ static size_t sql_error(UNUSED TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UN { rlm_sql_freetds_conn_t *conn = handle->conn; - rad_assert(conn && conn->db); - rad_assert(outlen > 0); + fr_assert(conn && conn->db); + fr_assert(outlen > 0); if (!conn->error) return 0; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c index 8cbdff37c78..bd76ddf2cc6 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c @@ -29,7 +29,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_sql_mysql - " #include -#include +#include #include @@ -709,8 +709,8 @@ static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen, char const *error; size_t i = 0; - rad_assert(conn && conn->sock); - rad_assert(outlen > 0); + fr_assert(conn && conn->sock); + fr_assert(outlen > 0); error = mysql_error(conn->sock); @@ -751,7 +751,7 @@ static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen, break; default: - rad_assert(0); + fr_assert(0); } } diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c index a2afc420df0..97d38bc42f8 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c @@ -24,7 +24,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_sql_oracle - " #include -#include +#include #include @@ -75,7 +75,7 @@ static int sql_snprint_error(char *out, size_t outlen, rlm_sql_handle_t *handle, sb4 errcode = 0; rlm_sql_oracle_conn_t *conn = handle->conn; - rad_assert(conn); + fr_assert(conn); out[0] = '\0'; @@ -103,7 +103,7 @@ static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED si char errbuff[512]; int ret; - rad_assert(outlen > 0); + fr_assert(outlen > 0); ret = sql_snprint_error(errbuff, sizeof(errbuff), handle, config); if (ret < 0) return 0; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c index a65622eca0d..21979ce6ecd 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c @@ -42,7 +42,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_sql_postgresql - " #include -#include +#include #include @@ -485,7 +485,7 @@ static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], size_t outlen, char const *p, *q; size_t i = 0; - rad_assert(outlen > 0); + fr_assert(outlen > 0); p = PQerrorMessage(conn->db); while ((q = strchr(p, '\n'))) { diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c index da317046cd3..c189559367c 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c @@ -26,7 +26,7 @@ RCSID("$Id$") #define LOG_PREFIX "rlm_sql_sqlite - " #include -#include +#include #include #include @@ -652,7 +652,7 @@ static size_t sql_error(UNUSED TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UN rlm_sql_sqlite_conn_t *conn = handle->conn; char const *error; - rad_assert(outlen > 0); + fr_assert(outlen > 0); error = sqlite3_errmsg(conn->db); if (!error) return 0; diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c index 9a5355b22ce..d764770703b 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c @@ -24,7 +24,7 @@ USES_APPLE_DEPRECATED_API #define LOG_PREFIX "rlm_sql_unixodbc - " #include -#include +#include #include #include "rlm_sql.h" @@ -308,7 +308,7 @@ static size_t sql_error(TALLOC_CTX *ctx, sql_log_entry_t out[], NDEBUG_UNUSED si SQLINTEGER errnum = 0; SQLSMALLINT length = 255; - rad_assert(outlen > 0); + fr_assert(outlen > 0); errbuff[0] = state[0] = '\0'; SQLError(conn->env, conn->dbc, conn->stmt, state, &errnum, diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index 8c693cc8d1a..9b39e2a0c9c 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -36,7 +36,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include @@ -356,7 +356,7 @@ static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, REQUEST int field_index[MAX_SQL_FIELD_INDEX]; bool found_field = false; /* Did we find any matching fields in the result set ? */ - rad_assert(inst->driver->sql_fields); /* Should have been caught during validation... */ + fr_assert(inst->driver->sql_fields); /* Should have been caught during validation... */ if (!*query) { REDEBUG("Query cannot be (null)"); @@ -422,7 +422,7 @@ static rlm_rcode_t mod_map_proc(void *mod_inst, UNUSED void *proc_inst, REQUEST RERROR("Failed retrieving field names: %s", fr_table_str_by_value(sql_rcode_description_table, ret, "")); goto error; } - rad_assert(fields); + fr_assert(fields); field_cnt = talloc_array_length(fields); if (RDEBUG_ENABLED3) for (j = 0; j < field_cnt; j++) RDEBUG3("Got field: %s", fields[j]); @@ -642,7 +642,7 @@ int sql_set_user(rlm_sql_t const *inst, REQUEST *request, char const *username) char const *sqluser; ssize_t len; - rad_assert(request->packet != NULL); + fr_assert(request->packet != NULL); if (username != NULL) { sqluser = username; @@ -805,7 +805,7 @@ static rlm_rcode_t rlm_sql_process_groups(rlm_sql_t const *inst, REQUEST *reques char *expanded = NULL; int rows; - rad_assert(request->packet != NULL); + fr_assert(request->packet != NULL); if (!inst->config->groupmemb_query) { RWARN("Cannot do check groups when group_membership_query is not set"); @@ -833,7 +833,7 @@ static rlm_rcode_t rlm_sql_process_groups(rlm_sql_t const *inst, REQUEST *reques RDEBUG2("User not found in any groups"); goto do_nothing; } - rad_assert(head); + fr_assert(head); RDEBUG2("User found in the group table"); @@ -846,7 +846,7 @@ static rlm_rcode_t rlm_sql_process_groups(rlm_sql_t const *inst, REQUEST *reques entry = head; do { next: - rad_assert(entry != NULL); + fr_assert(entry != NULL); fr_pair_value_strcpy(sql_group, entry->name); if (inst->config->authorize_group_check_query) { @@ -928,7 +928,7 @@ static rlm_rcode_t rlm_sql_process_groups(rlm_sql_t const *inst, REQUEST *reques continue; } - rad_assert(reply_tmp != NULL); /* coverity, among others */ + fr_assert(reply_tmp != NULL); /* coverity, among others */ *do_fall_through = fall_through(reply_tmp); RDEBUG2("Group \"%s\": Merging reply items", entry->name); @@ -1019,7 +1019,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) } inst->driver = (rlm_sql_driver_t const *)inst->driver_inst->module->common; - rad_assert(!inst->driver->inst_size || inst->driver_inst->data); + fr_assert(!inst->driver->inst_size || inst->driver_inst->data); /* * Call the driver's instantiate function (if set) @@ -1194,8 +1194,8 @@ static rlm_rcode_t mod_authorize(void *instance, UNUSED void *thread, REQUEST *r char *expanded = NULL; - rad_assert(request->packet != NULL); - rad_assert(request->reply != NULL); + fr_assert(request->packet != NULL); + fr_assert(request->reply != NULL); if (!inst->config->authorize_check_query && !inst->config->authorize_reply_query && !inst->config->read_groups && !inst->config->read_profiles) { @@ -1443,7 +1443,7 @@ static int acct_redundant(rlm_sql_t const *inst, REQUEST *request, sql_acct_sect char *p = path; char *expanded = NULL; - rad_assert(section); + fr_assert(section); if (section->reference[0] != '.') *p++ = '.'; @@ -1548,7 +1548,7 @@ static int acct_redundant(rlm_sql_t const *inst, REQUEST *request, sql_acct_sect case RLM_SQL_ALT_QUERY: goto next; } - rad_assert(handle); + fr_assert(handle); /* * We need to have updated something for the query to have been diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c index 97571061479..6bce010b9d5 100644 --- a/src/modules/rlm_sql/sql.c +++ b/src/modules/rlm_sql/sql.c @@ -30,7 +30,7 @@ RCSID("$Id$") #define LOG_PREFIX_ARGS inst->name #include -#include +#include #include #include @@ -252,11 +252,11 @@ sql_rcode_t rlm_sql_fetch_row(rlm_sql_row_t *out, rlm_sql_t const *inst, REQUEST ret = (inst->driver->sql_fetch_row)(out, *handle, inst->config); switch (ret) { case RLM_SQL_OK: - rad_assert(*out != NULL); + fr_assert(*out != NULL); return ret; case RLM_SQL_NO_MORE_ROWS: - rad_assert(*out == NULL); + fr_assert(*out == NULL); return ret; default: @@ -339,7 +339,7 @@ sql_rcode_t rlm_sql_query(rlm_sql_t const *inst, REQUEST *request, rlm_sql_handl int i, count; /* Caller should check they have a valid handle */ - rad_assert(*handle); + fr_assert(*handle); /* There's no query to run, return an error */ if (query[0] == '\0') { @@ -440,7 +440,7 @@ sql_rcode_t rlm_sql_select_query(rlm_sql_t const *inst, REQUEST *request, rlm_sq int i, count; /* Caller should check they have a valid handle */ - rad_assert(*handle); + fr_assert(*handle); /* There's no query to run, return an error */ if (query[0] == '\0') { @@ -507,7 +507,7 @@ int sql_getvpdata(TALLOC_CTX *ctx, rlm_sql_t const *inst, REQUEST *request, rlm_ int rows = 0; sql_rcode_t rcode; - rad_assert(request); + fr_assert(request); rcode = rlm_sql_select_query(inst, request, handle, query); if (rcode != RLM_SQL_OK) return -1; /* error handled by rlm_sql_select_query */ diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c index 4e02d763cf1..ef530c76818 100644 --- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c +++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include #include @@ -126,7 +126,7 @@ static int find_next_reset(rlm_sqlcounter_t *inst, time_t timeval) if (len == 0) *sCurrentTime = '\0'; tm->tm_sec = tm->tm_min = 0; - rad_assert(inst->reset != NULL); + fr_assert(inst->reset != NULL); if (isdigit((int) inst->reset[0])){ len = strlen(inst->reset); @@ -197,7 +197,7 @@ static int find_prev_reset(rlm_sqlcounter_t *inst, time_t timeval) if (len == 0) *sCurrentTime = '\0'; tm->tm_sec = tm->tm_min = 0; - rad_assert(inst->reset != NULL); + fr_assert(inst->reset != NULL); if (isdigit((int) inst->reset[0])){ len = strlen(inst->reset); @@ -537,7 +537,7 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf) rlm_sqlcounter_t *inst = instance; time_t now; - rad_assert(inst->query && *inst->query); + fr_assert(inst->query && *inst->query); now = time(NULL); inst->reset_time = 0; @@ -568,8 +568,8 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) /* * Create a new attribute for the counter. */ - rad_assert(inst->paircmp_attr); - rad_assert(inst->limit_attr); + fr_assert(inst->paircmp_attr); + fr_assert(inst->limit_attr); memset(&flags, 0, sizeof(flags)); if (tmpl_define_undefined_attr(fr_dict_unconst(dict_freeradius), inst->paircmp_attr, FR_TYPE_UINT64, &flags) < 0) { diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c index b73ccfd0273..774eb3ce5f3 100644 --- a/src/modules/rlm_sqlippool/rlm_sqlippool.c +++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c @@ -29,7 +29,7 @@ RCSID("$Id$") #define LOG_PREFIX_ARGS inst->sql_instance_name #include -#include +#include #include diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c index 9c1c8c9766a..a3b08c39a42 100644 --- a/src/modules/rlm_stats/rlm_stats.c +++ b/src/modules/rlm_stats/rlm_stats.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c index d56f7399cf3..cebf7a4ddc5 100644 --- a/src/modules/rlm_test/rlm_test.c +++ b/src/modules/rlm_test/rlm_test.c @@ -28,7 +28,7 @@ RCSID("$Id$") #include #include -#include +#include /* * Define a structure for our module configuration. @@ -191,7 +191,7 @@ fr_dict_attr_autoload_t rlm_test_dict_attr[] = { static int rlm_test_cmp(UNUSED void *instance, REQUEST *request, UNUSED VALUE_PAIR *thing, VALUE_PAIR *check, UNUSED VALUE_PAIR *check_pairs, UNUSED VALUE_PAIR **reply_pairs) { - rad_assert(check->vp_type == FR_TYPE_STRING); + fr_assert(check->vp_type == FR_TYPE_STRING); RINFO("Test-Paircmp called with \"%pV\"", &check->data); diff --git a/src/modules/rlm_unbound/io.c b/src/modules/rlm_unbound/io.c index 6810b243c73..d4b10d3a006 100644 --- a/src/modules/rlm_unbound/io.c +++ b/src/modules/rlm_unbound/io.c @@ -93,7 +93,7 @@ static void _unbound_io_event_flags_add(struct ub_event *ub_ev, short flags) DEBUG4("unbound event %p - Adding flags %i (current %i, new %i)", ev, flags, ev->events, new); - rad_assert(!ev->active); /* must not be active */ + fr_assert(!ev->active); /* must not be active */ ev->events = new; } @@ -107,7 +107,7 @@ static void _unbound_io_event_flags_del(struct ub_event *ub_ev, short flags) unbound_io_event_t *ev = talloc_get_type_abort(ub_ev, unbound_io_event_t); short new = ev->events & ~flags; - rad_assert(!ev->active); /* must not be active */ + fr_assert(!ev->active); /* must not be active */ DEBUG4("unbound event %p - Removing flags %i (current %i, new %i)", ev, flags, ev->events, new); @@ -122,7 +122,7 @@ static void _unbound_io_event_fd_set(struct ub_event *ub_ev, int fd) { unbound_io_event_t *ev = talloc_get_type_abort(ub_ev, unbound_io_event_t); - rad_assert(!ev->active); /* must not be active */ + fr_assert(!ev->active); /* must not be active */ if (fd == ev->fd) return; @@ -150,7 +150,7 @@ static void _unbound_io_service_timer_expired(UNUSED fr_event_list_t *el, UNUSED { unbound_io_event_t *ev = talloc_get_type_abort(uctx, unbound_io_event_t); - rad_assert(ev->active); /* must be active */ + fr_assert(ev->active); /* must be active */ DEBUG4("unbound event %p - Timeout", ev); @@ -167,7 +167,7 @@ static void _unbound_io_service_readable(fr_event_list_t *el, int fd, UNUSED int { unbound_io_event_t *ev = talloc_get_type_abort(uctx, unbound_io_event_t); - rad_assert(ev->active); /* must be active */ + fr_assert(ev->active); /* must be active */ DEBUG4("unbound event %p - FD %i now readable", ev, fd); @@ -191,7 +191,7 @@ static void _unbound_io_service_writable(fr_event_list_t *el, int fd, UNUSED int { unbound_io_event_t *ev = talloc_get_type_abort(uctx, unbound_io_event_t); - rad_assert(ev->active); /* must be active */ + fr_assert(ev->active); /* must be active */ DEBUG4("unbound event %p - FD %i now writable", ev, fd); @@ -221,7 +221,7 @@ static void _unbound_io_service_errored(UNUSED fr_event_list_t *el, { unbound_io_event_t *ev = talloc_get_type_abort(uctx, unbound_io_event_t); - rad_assert(ev->active); /* must be active */ + fr_assert(ev->active); /* must be active */ DEBUG4("unbound event %p - FD %i errored: %s", ev, fd, fr_syserror(fd_errno)); @@ -245,13 +245,13 @@ static int _unbound_io_event_activate(struct ub_event *ub_ev, struct timeval *tv { unbound_io_event_t *ev = talloc_get_type_abort(ub_ev, unbound_io_event_t); - rad_assert(!ev->active); /* must not be active */ + fr_assert(!ev->active); /* must not be active */ /* * File descriptor event */ if ((ev->events & UB_EV_READ) && (ev->events & UB_EV_WRITE)) { - rad_assert(ev->fd >= 0); /* File descriptor must valid */ + fr_assert(ev->fd >= 0); /* File descriptor must valid */ DEBUG4("unbound event %p - Registered for read+write events on FD %i", ev, ev->fd); @@ -266,7 +266,7 @@ static int _unbound_io_event_activate(struct ub_event *ub_ev, struct timeval *tv return -1; } } else if (ev->events & UB_EV_READ) { - rad_assert(ev->fd >= 0); /* File descriptor must valid */ + fr_assert(ev->fd >= 0); /* File descriptor must valid */ DEBUG4("unbound event %p - Registered for read+error events on FD %i", ev, ev->fd); @@ -281,7 +281,7 @@ static int _unbound_io_event_activate(struct ub_event *ub_ev, struct timeval *tv return -1; } } else if (ev->events & UB_EV_WRITE) { - rad_assert(ev->fd >= 0); /* File descriptor must valid */ + fr_assert(ev->fd >= 0); /* File descriptor must valid */ DEBUG4("unbound event %p - Registered for write+error events on FD %i", ev, ev->fd); @@ -368,7 +368,7 @@ static int _unbound_io_timer_modify(struct ub_event *ub_ev, UNUSED struct ub_eve int ret = 0; fr_time_delta_t timeout; - rad_assert(ev->events & UB_EV_TIMEOUT); + fr_assert(ev->events & UB_EV_TIMEOUT); if (ev->cb != cb) { DEBUG4("unbound event %p - New callback %p (old callback was %p)", @@ -407,7 +407,7 @@ static int _unbound_io_timer_deactivate(struct ub_event *ub_ev) { unbound_io_event_t *ev = talloc_get_type_abort(ub_ev, unbound_io_event_t); - rad_assert(ev->events & UB_EV_TIMEOUT); + fr_assert(ev->events & UB_EV_TIMEOUT); DEBUG4("unbound event %p - Disarming timeout", ev); diff --git a/src/modules/rlm_winbind/auth_wbclient_pap.c b/src/modules/rlm_winbind/auth_wbclient_pap.c index f616b2983a4..545d80c3269 100644 --- a/src/modules/rlm_winbind/auth_wbclient_pap.c +++ b/src/modules/rlm_winbind/auth_wbclient_pap.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -69,7 +69,7 @@ int do_auth_wbclient_pap(rlm_winbind_t const *inst, REQUEST *request, VALUE_PAIR /* * wb_username must be set for this function to be called */ - rad_assert(inst->wb_username); + fr_assert(inst->wb_username); /* * Get the username and domain from the configuration diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c index 4492a6800a3..18a44828b77 100644 --- a/src/modules/rlm_winbind/rlm_winbind.c +++ b/src/modules/rlm_winbind/rlm_winbind.c @@ -29,7 +29,7 @@ RCSID("$Id$") #include #include -#include +#include #include "rlm_winbind.h" #include "auth_wbclient_pap.h" diff --git a/src/protocols/tacacs/base.c b/src/protocols/tacacs/base.c index 4271f9c791d..ce5be3bf8bf 100644 --- a/src/protocols/tacacs/base.c +++ b/src/protocols/tacacs/base.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "tacacs.h" @@ -163,7 +163,7 @@ bad_seqno: switch (pkt->hdr.type) { default: - rad_assert(0); /* Should have been caught above */ + fr_assert(0); /* Should have been caught above */ return false; case TAC_PLUS_AUTHEN: @@ -326,7 +326,7 @@ int fr_tacacs_packet_recv(RADIUS_PACKET * const packet, char const * const secre size_t packet_len; /* borrow vector to bring in the header for later talloc */ - rad_assert(sizeof(fr_tacacs_packet_hdr_t) <= RADIUS_AUTH_VECTOR_LENGTH); + fr_assert(sizeof(fr_tacacs_packet_hdr_t) <= RADIUS_AUTH_VECTOR_LENGTH); /* * Only read enough data to get the TACACS+ header. @@ -351,7 +351,7 @@ int fr_tacacs_packet_recv(RADIUS_PACKET * const packet, char const * const secre return 0; } - rad_assert(packet->data_len == sizeof(fr_tacacs_packet_hdr_t)); + fr_assert(packet->data_len == sizeof(fr_tacacs_packet_hdr_t)); /* * We now have the full packet header. Let's go @@ -504,7 +504,7 @@ int fr_tacacs_packet_send(RADIUS_PACKET * const packet, RADIUS_PACKET const * co return -1; } - rad_assert(tacacs_packet_verify(packet, false) == true); + fr_assert(tacacs_packet_verify(packet, false) == true); if (tacacs_xor(packet, secret, secret_len) < 0) { fr_strerror_printf("Failed encryption of TACACS reply: %s", fr_syserror(errno)); diff --git a/src/protocols/tacacs/decode.c b/src/protocols/tacacs/decode.c index 7b4457f186b..f9b6857f9b7 100644 --- a/src/protocols/tacacs/decode.c +++ b/src/protocols/tacacs/decode.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "tacacs.h" diff --git a/src/protocols/tacacs/encode.c b/src/protocols/tacacs/encode.c index ad65edf9454..4a6963330c1 100644 --- a/src/protocols/tacacs/encode.c +++ b/src/protocols/tacacs/encode.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "tacacs.h" @@ -140,7 +140,7 @@ fail: goto fail; cook: - rad_assert(length_hdr + length_body < TACACS_MAX_PACKET_SIZE); + fr_assert(length_hdr + length_body < TACACS_MAX_PACKET_SIZE); pkt->hdr.length = htonl(length_hdr - sizeof(fr_tacacs_packet_hdr_t) + length_body); @@ -192,7 +192,7 @@ cook: if (field.data) { switch (pkt->hdr.type) { default: - rad_assert(0); + fr_assert(0); break; case TAC_PLUS_AUTHEN: diff --git a/src/tests/util/atomic_queue_test.c b/src/tests/util/atomic_queue_test.c index 6ae4c95ce3f..4f36e7a82cf 100644 --- a/src/tests/util/atomic_queue_test.c +++ b/src/tests/util/atomic_queue_test.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include #include #include -#include +#include #ifdef HAVE_GETOPT_H # include diff --git a/src/tests/util/channel_test.c b/src/tests/util/channel_test.c index 02859431d86..498e9280aa7 100644 --- a/src/tests/util/channel_test.c +++ b/src/tests/util/channel_test.c @@ -24,7 +24,7 @@ RCSID("$Id$") #include #include -#include +#include #include #ifdef HAVE_GETOPT_H @@ -158,7 +158,7 @@ static void *channel_master(void *arg) for (i = 0; i < num_to_send; i++) { cd = (fr_channel_data_t *) fr_message_alloc(ms, NULL, 100); - rad_assert(cd != NULL); + fr_assert(cd != NULL); num_outstanding++; num_messages++; @@ -182,7 +182,7 @@ static void *channel_master(void *arg) if (rcode < 0) { fprintf(stderr, "Failed sending request: %s\n", fr_syserror(errno)); } - rad_assert(rcode == 0); + fr_assert(rcode == 0); if (reply) { num_replies++; num_outstanding--; @@ -209,7 +209,7 @@ check_close: } MPRINT1("Master waiting on events.\n"); - rad_assert(num_messages <= max_messages); + fr_assert(num_messages <= max_messages); num_events = kevent(kq_master, NULL, 0, events, MAX_KEVENTS, NULL); MPRINT1("Master kevent returned %d\n", num_events); @@ -242,7 +242,7 @@ check_close: data_size = fr_control_message_pop(aq_master, &id, data, sizeof(data)); if (!data_size) break; - rad_assert(id == FR_CONTROL_ID_CHANNEL); + fr_assert(id == FR_CONTROL_ID_CHANNEL); ce = fr_channel_service_message(now, &new_channel, data, data_size); MPRINT1("Master got channel event %d\n", ce); @@ -250,7 +250,7 @@ check_close: switch (ce) { case FR_CHANNEL_DATA_READY_REQUESTOR: MPRINT1("Master got data ready signal\n"); - rad_assert(new_channel == channel); + fr_assert(new_channel == channel); reply = fr_channel_recv_reply(channel); if (!reply) { @@ -269,8 +269,8 @@ check_close: case FR_CHANNEL_CLOSE: MPRINT1("Master received close signal\n"); - rad_assert(new_channel == channel); - rad_assert(signaled_close == true); + fr_assert(new_channel == channel); + fr_assert(signaled_close == true); running = false; break; @@ -284,7 +284,7 @@ check_close: /* * Not written yet! */ - rad_assert(0 == 1); + fr_assert(0 == 1); break; } /* switch over signal returned */ } /* drain the control plane */ @@ -305,7 +305,7 @@ check_close: */ rcode = fr_message_set_messages_used(ms); MPRINT2("Master messages used = %d\n", rcode); - rad_assert(rcode == 0); + fr_assert(rcode == 0); talloc_free(ctx); @@ -369,7 +369,7 @@ static void *channel_worker(void *arg) data_size = fr_control_message_pop(aq_worker, &id, data, sizeof(data)); if (!data_size) break; - rad_assert(id == FR_CONTROL_ID_CHANNEL); + fr_assert(id == FR_CONTROL_ID_CHANNEL); ce = fr_channel_service_message(now, &new_channel, data, data_size); MPRINT1("\tWorker got channel event %d\n", ce); @@ -378,12 +378,12 @@ static void *channel_worker(void *arg) case FR_CHANNEL_OPEN: MPRINT1("\tWorker received a new channel\n"); - rad_assert(new_channel == channel); + fr_assert(new_channel == channel); break; case FR_CHANNEL_CLOSE: MPRINT1("\tWorker requested to close the channel.\n"); - rad_assert(new_channel == channel); + fr_assert(new_channel == channel); running = false; /* @@ -400,7 +400,7 @@ static void *channel_worker(void *arg) case FR_CHANNEL_DATA_READY_RESPONDER: MPRINT1("\tWorker got data ready signal\n"); - rad_assert(new_channel == channel); + fr_assert(new_channel == channel); cd = fr_channel_recv_request(channel); if (!cd) { @@ -413,12 +413,12 @@ static void *channel_worker(void *arg) worker_messages++; - rad_assert(cd->m.data != NULL); + fr_assert(cd->m.data != NULL); memcpy(&message_id, cd->m.data, sizeof(message_id)); MPRINT1("\tWorker got message %d (says %d)\n", worker_messages, message_id); reply = (fr_channel_data_t *) fr_message_alloc(ms, NULL, 100); - rad_assert(reply != NULL); + fr_assert(reply != NULL); reply->m.when = fr_time(); fr_message_done(&cd->m); @@ -439,13 +439,13 @@ static void *channel_worker(void *arg) if (rcode < 0) { fprintf(stderr, "Failed sending reply: %s\n", fr_syserror(errno)); } - rad_assert(rcode == 0); + fr_assert(rcode == 0); } break; case FR_CHANNEL_NOOP: MPRINT1("\tWorker got NOOP\n"); - rad_assert(new_channel == channel); + fr_assert(new_channel == channel); break; default: @@ -454,7 +454,7 @@ static void *channel_worker(void *arg) /* * Not written yet! */ - rad_assert(0 == 1); + fr_assert(0 == 1); break; } /* switch over signals */ @@ -537,22 +537,22 @@ int main(int argc, char *argv[]) #endif kq_master = kqueue(); - rad_assert(kq_master >= 0); + fr_assert(kq_master >= 0); kq_worker = kqueue(); - rad_assert(kq_worker >= 0); + fr_assert(kq_worker >= 0); aq_master = fr_atomic_queue_create(autofree, max_control_plane); - rad_assert(aq_master != NULL); + fr_assert(aq_master != NULL); aq_worker = fr_atomic_queue_create(autofree, max_control_plane); - rad_assert(aq_worker != NULL); + fr_assert(aq_worker != NULL); control_master = fr_control_create(autofree, kq_master, aq_master, 1024); - rad_assert(control_master != NULL); + fr_assert(control_master != NULL); control_worker = fr_control_create(autofree, kq_worker, aq_worker, 1025); - rad_assert(control_worker != NULL); + fr_assert(control_worker != NULL); channel = fr_channel_create(autofree, control_master, control_worker, false); if (!channel) { diff --git a/src/tests/util/control_test.c b/src/tests/util/control_test.c index 0dfa0215a8f..ad63dc02700 100644 --- a/src/tests/util/control_test.c +++ b/src/tests/util/control_test.c @@ -24,7 +24,7 @@ RCSID("$Id$") #include #include -#include +#include #include #include @@ -127,12 +127,12 @@ static void *control_master(UNUSED void *arg) exit(EXIT_FAILURE); } - rad_assert(data_size == sizeof(m)); - rad_assert(id == FR_CONTROL_ID_CHANNEL); + fr_assert(data_size == sizeof(m)); + fr_assert(id == FR_CONTROL_ID_CHANNEL); MPRINT1("Master got message %zu.\n", m.counter); - rad_assert(m.header == CONTROL_MAGIC); + fr_assert(m.header == CONTROL_MAGIC); if (m.counter == (max_messages - 1)) goto do_exit; } @@ -209,10 +209,10 @@ int main(int argc, char *argv[]) #endif kq = kqueue(); - rad_assert(kq >= 0); + fr_assert(kq >= 0); aq = fr_atomic_queue_create(autofree, aq_size); - rad_assert(aq != NULL); + fr_assert(aq != NULL); control = fr_control_create(autofree, kq, aq, 1024); if (!control) { diff --git a/src/tests/util/message_set_test.c b/src/tests/util/message_set_test.c index b8838f9b05c..852c7dfe4e5 100644 --- a/src/tests/util/message_set_test.c +++ b/src/tests/util/message_set_test.c @@ -23,7 +23,7 @@ RCSID("$Id$") #include -#include +#include #include #include @@ -96,7 +96,7 @@ static void alloc_blocks(fr_message_set_t *ms, uint32_t *seed, UNUSED int *star * We can't allocated the entire array, and we can't * over-fill the array. */ - rad_assert((size_t) my_alloc_size < MY_ARRAY_SIZE); + fr_assert((size_t) my_alloc_size < MY_ARRAY_SIZE); MPRINT2("BLOCK ALLOC %d\n", my_alloc_size); @@ -115,10 +115,10 @@ static void alloc_blocks(fr_message_set_t *ms, uint32_t *seed, UNUSED int *star array[index] = hash; m = fr_message_reserve(ms, reserve_size); - rad_assert(m != NULL); + fr_assert(m != NULL); messages[index] = (fr_test_t *) fr_message_alloc(ms, m, hash); - rad_assert(messages[index] == (void *) m); + fr_assert(messages[index] == (void *) m); if (touch_memory) { size_t j; @@ -133,10 +133,10 @@ static void alloc_blocks(fr_message_set_t *ms, uint32_t *seed, UNUSED int *star if (debug_lvl > 1) printf("%08x\t", hash); - rad_assert(m->status == FR_MESSAGE_USED); + fr_assert(m->status == FR_MESSAGE_USED); used += hash; -// rad_assert(fr_ring_buffer_used(rb) == used); +// fr_assert(fr_ring_buffer_used(rb) == used); } *end += my_alloc_size; @@ -146,7 +146,7 @@ static void free_blocks(UNUSED fr_message_set_t *ms, UNUSED uint32_t *seed, int { int i; - rad_assert(my_alloc_size < MY_ARRAY_SIZE); + fr_assert(my_alloc_size < MY_ARRAY_SIZE); MPRINT2("BLOCK FREE %d\n", my_alloc_size); @@ -159,11 +159,11 @@ static void free_blocks(UNUSED fr_message_set_t *ms, UNUSED uint32_t *seed, int m = &messages[index]->m; - rad_assert(m->status == FR_MESSAGE_USED); + fr_assert(m->status == FR_MESSAGE_USED); rcode = fr_message_done(m); #ifndef NDEBUG - rad_assert(rcode == 0); + fr_assert(rcode == 0); #else if (rcode != 0) exit(EXIT_FAILURE); #endif @@ -178,8 +178,8 @@ static void free_blocks(UNUSED fr_message_set_t *ms, UNUSED uint32_t *seed, int if (*start > MY_ARRAY_SIZE) { *start -= MY_ARRAY_SIZE; *end -= MY_ARRAY_SIZE; - rad_assert(*start <= *end); - rad_assert(*start < MY_ARRAY_SIZE); + fr_assert(*start <= *end); + fr_assert(*start < MY_ARRAY_SIZE); } } @@ -369,10 +369,10 @@ int main(int argc, char *argv[]) my_alloc_size = end - start; free_blocks(ms, &seed, &start, &end); - rad_assert(used == 0); + fr_assert(used == 0); for (i = 0; i < MY_ARRAY_SIZE; i++) { - rad_assert(messages[i] == NULL); + fr_assert(messages[i] == NULL); } if (debug_lvl) { @@ -410,7 +410,7 @@ int main(int argc, char *argv[]) * After the garbage collection, all messages marked "done" MUST also be marked "free". */ rcode = fr_message_set_messages_used(ms); - rad_assert(rcode == 0); + fr_assert(rcode == 0); return rcode; } diff --git a/src/tests/util/radius1_test.c b/src/tests/util/radius1_test.c index b4acba1c84a..5898c17514c 100644 --- a/src/tests/util/radius1_test.c +++ b/src/tests/util/radius1_test.c @@ -26,7 +26,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include #include @@ -234,13 +234,13 @@ static void master_process(TALLOC_CTX *ctx) * Create the KQ and associated sockets. */ kq_master = kqueue(); - rad_assert(kq_master >= 0); + fr_assert(kq_master >= 0); aq_master = fr_atomic_queue_create(ctx, max_control_plane); - rad_assert(aq_master != NULL); + fr_assert(aq_master != NULL); control_master = fr_control_create(ctx, kq_master, aq_master, 1024); - rad_assert(control_master != NULL); + fr_assert(control_master != NULL); sockfd = fr_socket_server_udp(&my_ipaddr, &my_port, NULL, true); if (sockfd < 0) { @@ -290,7 +290,7 @@ static void master_process(TALLOC_CTX *ctx) */ MPRINT1("Master creating channel to worker %d.\n", num_workers); workers[i].ch = fr_worker_channel_create(workers[i].worker, ctx, control_master); - rad_assert(workers[i].ch != NULL); + fr_assert(workers[i].ch != NULL); (void) fr_channel_master_ctx_add(workers[i].ch, &workers[i]); @@ -341,13 +341,13 @@ static void master_process(TALLOC_CTX *ctx) break; } - rad_assert(events[i].filter == EVFILT_READ); + fr_assert(events[i].filter == EVFILT_READ); cd = (fr_channel_data_t *) fr_message_reserve(ms, 4096); - rad_assert(cd != NULL); + fr_assert(cd != NULL); packet_ctx = talloc(ctx, fr_radius_packet_ctx_t); - rad_assert(packet_ctx != NULL); + fr_assert(packet_ctx != NULL); packet_ctx->salen = sizeof(packet_ctx->src); cd->priority = 0; @@ -412,7 +412,7 @@ static void master_process(TALLOC_CTX *ctx) which_worker++; if (which_worker >= num_workers) which_worker = 0; - rad_assert(rcode == 0); + fr_assert(rcode == 0); if (reply) send_reply(sockfd, reply); } @@ -430,7 +430,7 @@ static void master_process(TALLOC_CTX *ctx) data_size = fr_control_message_pop(aq_master, &id, data, sizeof(data)); if (!data_size) break; - rad_assert(id == FR_CONTROL_ID_CHANNEL); + fr_assert(id == FR_CONTROL_ID_CHANNEL); ce = fr_channel_service_message(now, &ch, data, data_size); MPRINT1("Master got channel event %d\n", ce); @@ -452,7 +452,7 @@ static void master_process(TALLOC_CTX *ctx) case FR_CHANNEL_CLOSE: sw = fr_channel_master_ctx_get(ch); - rad_assert(sw != NULL); + fr_assert(sw != NULL); MPRINT1("Master received close ack signal for worker %d\n", sw->id); @@ -469,7 +469,7 @@ static void master_process(TALLOC_CTX *ctx) /* * Not written yet! */ - rad_assert(0 == 1); + fr_assert(0 == 1); break; } /* switch over signal returned */ } /* drain the control plane */ @@ -510,7 +510,7 @@ static void master_process(TALLOC_CTX *ctx) */ rcode = fr_message_set_messages_used(ms); MPRINT2("Master messages used = %d\n", rcode); - rad_assert(rcode == 0); + fr_assert(rcode == 0); close(sockfd); } diff --git a/src/tests/util/radius_schedule_test.c b/src/tests/util/radius_schedule_test.c index 0aa077e53e0..5c7fce0305c 100644 --- a/src/tests/util/radius_schedule_test.c +++ b/src/tests/util/radius_schedule_test.c @@ -25,9 +25,8 @@ RCSID("$Id$") #include #include #include -#include -#include #include +#include #include #include #include diff --git a/src/tests/util/ring_buffer_test.c b/src/tests/util/ring_buffer_test.c index 5609aa9ad57..5e8c102457f 100644 --- a/src/tests/util/ring_buffer_test.c +++ b/src/tests/util/ring_buffer_test.c @@ -23,7 +23,6 @@ RCSID("$Id$") #include -#include #include #include #include @@ -98,7 +97,7 @@ static void alloc_blocks(fr_ring_buffer_t *rb, uint32_t *seed, UNUSED int *star if (debug_lvl > 1) printf("%08x\t", hash); used += hash; - rad_assert(fr_ring_buffer_used(rb) == used); + fr_assert(fr_ring_buffer_used(rb) == used); } *end += ALLOC_SIZE; @@ -118,7 +117,7 @@ static void free_blocks(fr_ring_buffer_t *rb, UNUSED uint32_t *seed, int *start if (!fr_cond_assert(rcode == 0)) exit(EXIT_FAILURE); used -= array[index]; - rad_assert(fr_ring_buffer_used(rb) == used); + fr_assert(fr_ring_buffer_used(rb) == used); array[index] = 0; data[index] = NULL; @@ -200,8 +199,8 @@ int main(int argc, char *argv[]) free_blocks(rb, &seed, &start, &end); - rad_assert(used == 0); - rad_assert(fr_ring_buffer_used(rb) == used); + fr_assert(used == 0); + fr_assert(fr_ring_buffer_used(rb) == used); exit(EXIT_SUCCESS); } diff --git a/src/tests/util/schedule_test.c b/src/tests/util/schedule_test.c index 60f3e2449ac..810c7465c6c 100644 --- a/src/tests/util/schedule_test.c +++ b/src/tests/util/schedule_test.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #include #include diff --git a/src/tests/util/worker_test.c b/src/tests/util/worker_test.c index 8c7a02f231e..51b2545e687 100644 --- a/src/tests/util/worker_test.c +++ b/src/tests/util/worker_test.c @@ -25,7 +25,7 @@ RCSID("$Id$") #include #include #include -#include +#include #include #ifdef HAVE_GETOPT_H @@ -245,7 +245,7 @@ static void master_process(void) */ MPRINT1("Master creating channel to worker %d.\n", num_workers); workers[i].ch = fr_worker_channel_create(workers[i].worker, ctx, control_master); - rad_assert(workers[i].ch != NULL); + fr_assert(workers[i].ch != NULL); (void) fr_channel_master_ctx_add(workers[i].ch, &workers[i]); @@ -285,7 +285,7 @@ static void master_process(void) for (i = 0; i < num_to_send; i++) { cd = (fr_channel_data_t *) fr_message_alloc(ms, NULL, 100); - rad_assert(cd != NULL); + fr_assert(cd != NULL); num_outstanding++; num_messages++; @@ -315,7 +315,7 @@ static void master_process(void) which_worker++; if (which_worker >= num_workers) which_worker = 0; - rad_assert(rcode == 0); + fr_assert(rcode == 0); if (reply) { num_replies++; num_outstanding--; @@ -349,7 +349,7 @@ check_close: } MPRINT1("Master waiting on events.\n"); - rad_assert(num_messages <= max_messages); + fr_assert(num_messages <= max_messages); num_events = kevent(kq_master, NULL, 0, events, MAX_KEVENTS, NULL); MPRINT1("Master kevent returned %d\n", num_events); @@ -384,7 +384,7 @@ check_close: data_size = fr_control_message_pop(aq_master, &id, data, sizeof(data)); if (!data_size) break; - rad_assert(id == FR_CONTROL_ID_CHANNEL); + fr_assert(id == FR_CONTROL_ID_CHANNEL); ce = fr_channel_service_message(now, &ch, data, data_size); MPRINT1("Master got channel event %d\n", ce); @@ -410,10 +410,10 @@ check_close: case FR_CHANNEL_CLOSE: sw = fr_channel_master_ctx_get(ch); - rad_assert(sw != NULL); + fr_assert(sw != NULL); MPRINT1("Master received close signal for worker %d\n", sw->id); - rad_assert(signaled_close == true); + fr_assert(signaled_close == true); (void) pthread_kill(sw->pthread_id, SIGTERM); running = false; @@ -428,7 +428,7 @@ check_close: /* * Not written yet! */ - rad_assert(0 == 1); + fr_assert(0 == 1); break; } /* switch over signal returned */ } /* drain the control plane */ @@ -469,7 +469,7 @@ check_close: */ rcode = fr_message_set_messages_used(ms); MPRINT2("Master messages used = %d\n", rcode); - rad_assert(rcode == 0); + fr_assert(rcode == 0); talloc_free(ctx); @@ -541,13 +541,13 @@ int main(int argc, char *argv[]) #endif kq_master = kqueue(); - rad_assert(kq_master >= 0); + fr_assert(kq_master >= 0); aq_master = fr_atomic_queue_create(autofree, max_control_plane); - rad_assert(aq_master != NULL); + fr_assert(aq_master != NULL); control_master = fr_control_create(autofree, kq_master, aq_master, 1024); - rad_assert(control_master != NULL); + fr_assert(control_master != NULL); signal(SIGTERM, sig_ignore);