From: Arran Cudbard-Bell Date: Sat, 30 Oct 2021 18:32:29 +0000 (-0400) Subject: Fix other fr_dict_t and fr_dict_attr_t ODR violations X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0004f43708a8dfab0ba7f9bc1e6182ddeb0722d;p=thirdparty%2Ffreeradius-server.git Fix other fr_dict_t and fr_dict_attr_t ODR violations --- diff --git a/src/include/build.h b/src/include/build.h index 385063c611e..01a3a1fe4de 100644 --- a/src/include/build.h +++ b/src/include/build.h @@ -216,6 +216,7 @@ do { \ * */ #define NEVER_RETURNS _Noreturn +#define HIDDEN CC_HINT(visibility("hidden")) #define UNUSED CC_HINT(unused) /** clang 10 doesn't recognised the FALL-THROUGH comment anymore diff --git a/src/lib/curl/attrs.h b/src/lib/curl/attrs.h index 179cafc1a02..5fb8bccde2d 100644 --- a/src/lib/curl/attrs.h +++ b/src/lib/curl/attrs.h @@ -21,4 +21,4 @@ */ RCSIDH(attrs_h, "$Id$") -extern fr_dict_attr_t const *attr_tls_certificate; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate; diff --git a/src/lib/eap/attrs.h b/src/lib/eap/attrs.h index 1eafcf6088e..712668f5817 100644 --- a/src/lib/eap/attrs.h +++ b/src/lib/eap/attrs.h @@ -26,22 +26,22 @@ RCSIDH(lib_eap_attrs_h, "$Id$") #include -extern fr_dict_t const *dict_freeradius; -extern fr_dict_t const *dict_radius; +extern HIDDEN fr_dict_t const *dict_freeradius; +extern HIDDEN fr_dict_t const *dict_radius; -extern fr_dict_attr_t const *attr_chbind_response_code; -extern fr_dict_attr_t const *attr_eap_identity; -extern fr_dict_attr_t const *attr_eap_session_id; -extern fr_dict_attr_t const *attr_eap_type; -extern fr_dict_attr_t const *attr_virtual_server; +extern HIDDEN fr_dict_attr_t const *attr_chbind_response_code; +extern HIDDEN fr_dict_attr_t const *attr_eap_identity; +extern HIDDEN fr_dict_attr_t const *attr_eap_session_id; +extern HIDDEN fr_dict_attr_t const *attr_eap_type; +extern HIDDEN fr_dict_attr_t const *attr_virtual_server; -extern fr_dict_attr_t const *attr_message_authenticator; -extern fr_dict_attr_t const *attr_eap_channel_binding_message; -extern fr_dict_attr_t const *attr_eap_message; -extern fr_dict_attr_t const *attr_eap_msk; -extern fr_dict_attr_t const *attr_eap_emsk; -extern fr_dict_attr_t const *attr_freeradius_proxied_to; -extern fr_dict_attr_t const *attr_ms_mppe_send_key; -extern fr_dict_attr_t const *attr_ms_mppe_recv_key; -extern fr_dict_attr_t const *attr_user_name; -extern fr_dict_attr_t const *attr_state; +extern HIDDEN fr_dict_attr_t const *attr_message_authenticator; +extern HIDDEN fr_dict_attr_t const *attr_eap_channel_binding_message; +extern HIDDEN fr_dict_attr_t const *attr_eap_message; +extern HIDDEN fr_dict_attr_t const *attr_eap_msk; +extern HIDDEN fr_dict_attr_t const *attr_eap_emsk; +extern HIDDEN fr_dict_attr_t const *attr_freeradius_proxied_to; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_send_key; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_recv_key; +extern HIDDEN fr_dict_attr_t const *attr_user_name; +extern HIDDEN fr_dict_attr_t const *attr_state; diff --git a/src/lib/eap_aka_sim/attrs.h b/src/lib/eap_aka_sim/attrs.h index 1cb3dcfeac3..1d68622e3bd 100644 --- a/src/lib/eap_aka_sim/attrs.h +++ b/src/lib/eap_aka_sim/attrs.h @@ -26,68 +26,68 @@ #include #include -extern fr_dict_t const *dict_freeradius; -extern fr_dict_t const *dict_radius; -extern fr_dict_t const *dict_eap_aka_sim; +extern HIDDEN fr_dict_t const *dict_freeradius; +extern HIDDEN fr_dict_t const *dict_radius; +extern HIDDEN fr_dict_t const *dict_eap_aka_sim; -extern fr_dict_attr_t const *attr_eap_aka_sim_ak; -extern fr_dict_attr_t const *attr_eap_aka_sim_any_id_req; -extern fr_dict_attr_t const *attr_eap_aka_sim_autn; -extern fr_dict_attr_t const *attr_eap_aka_sim_auts; -extern fr_dict_attr_t const *attr_eap_aka_sim_bidding; -extern fr_dict_attr_t const *attr_eap_aka_sim_checkcode; -extern fr_dict_attr_t const *attr_eap_aka_sim_ck; -extern fr_dict_attr_t const *attr_eap_aka_sim_client_error_code; -extern fr_dict_attr_t const *attr_eap_aka_sim_counter; -extern fr_dict_attr_t const *attr_eap_aka_sim_counter_too_small; -extern fr_dict_attr_t const *attr_eap_aka_sim_encr_data; -extern fr_dict_attr_t const *attr_eap_aka_sim_fullauth_id_req; -extern fr_dict_attr_t const *attr_eap_aka_sim_hmac_extra_request; -extern fr_dict_attr_t const *attr_eap_aka_sim_hmac_extra_response; -extern fr_dict_attr_t const *attr_eap_aka_sim_identity; -extern fr_dict_attr_t const *attr_eap_aka_sim_identity_type; -extern fr_dict_attr_t const *attr_eap_aka_sim_ik; -extern fr_dict_attr_t const *attr_eap_aka_sim_iv; -extern fr_dict_attr_t const *attr_eap_aka_sim_k_aut; -extern fr_dict_attr_t const *attr_eap_aka_sim_k_encr; -extern fr_dict_attr_t const *attr_eap_aka_sim_k_re; -extern fr_dict_attr_t const *attr_eap_aka_sim_kc; -extern fr_dict_attr_t const *attr_eap_aka_sim_kdf; -extern fr_dict_attr_t const *attr_eap_aka_sim_kdf_identity; -extern fr_dict_attr_t const *attr_eap_aka_sim_kdf_input; -extern fr_dict_attr_t const *attr_eap_aka_sim_mac; -extern fr_dict_attr_t const *attr_eap_aka_sim_method_hint; -extern fr_dict_attr_t const *attr_eap_aka_sim_mk; -extern fr_dict_attr_t const *attr_eap_aka_sim_next_pseudonym; -extern fr_dict_attr_t const *attr_eap_aka_sim_next_reauth_id; -extern fr_dict_attr_t const *attr_eap_aka_sim_nonce_mt; -extern fr_dict_attr_t const *attr_eap_aka_sim_nonce_s; -extern fr_dict_attr_t const *attr_eap_aka_sim_notification; -extern fr_dict_attr_t const *attr_eap_aka_sim_padding; -extern fr_dict_attr_t const *attr_eap_aka_sim_permanent_id_req; -extern fr_dict_attr_t const *attr_eap_aka_sim_permanent_identity; -extern fr_dict_attr_t const *attr_eap_aka_sim_rand; -extern fr_dict_attr_t const *attr_eap_aka_sim_res; -extern fr_dict_attr_t const *attr_eap_aka_sim_result_ind; -extern fr_dict_attr_t const *attr_eap_aka_sim_selected_version; -extern fr_dict_attr_t const *attr_eap_aka_sim_sres; -extern fr_dict_attr_t const *attr_eap_aka_sim_subtype; -extern fr_dict_attr_t const *attr_eap_aka_sim_version_list; -extern fr_dict_attr_t const *attr_eap_aka_sim_xres; -extern fr_dict_attr_t const *attr_session_data; -extern fr_dict_attr_t const *attr_session_id; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_ak; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_any_id_req; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_autn; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_auts; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_bidding; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_checkcode; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_ck; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_client_error_code; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_counter; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_counter_too_small; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_encr_data; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_fullauth_id_req; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_hmac_extra_request; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_hmac_extra_response; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_identity; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_identity_type; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_ik; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_iv; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_k_aut; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_k_encr; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_k_re; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_kc; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_kdf; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_kdf_identity; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_kdf_input; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_mac; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_method_hint; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_mk; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_next_pseudonym; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_next_reauth_id; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_nonce_mt; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_nonce_s; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_notification; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_padding; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_permanent_id_req; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_permanent_identity; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_rand; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_res; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_result_ind; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_selected_version; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_sres; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_subtype; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_version_list; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_xres; +extern HIDDEN fr_dict_attr_t const *attr_session_data; +extern HIDDEN fr_dict_attr_t const *attr_session_id; -extern fr_dict_attr_t const *attr_ms_mppe_recv_key; -extern fr_dict_attr_t const *attr_ms_mppe_send_key; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_recv_key; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_send_key; -extern fr_dict_attr_t const *attr_eap_identity; -extern fr_dict_attr_t const *attr_eap_type; -extern fr_dict_attr_t const *attr_sim_algo_version; -extern fr_dict_attr_t const *attr_sim_amf; -extern fr_dict_attr_t const *attr_sim_ki; -extern fr_dict_attr_t const *attr_sim_op; -extern fr_dict_attr_t const *attr_sim_opc; -extern fr_dict_attr_t const *attr_sim_sqn; +extern HIDDEN fr_dict_attr_t const *attr_eap_identity; +extern HIDDEN fr_dict_attr_t const *attr_eap_type; +extern HIDDEN fr_dict_attr_t const *attr_sim_algo_version; +extern HIDDEN fr_dict_attr_t const *attr_sim_amf; +extern HIDDEN fr_dict_attr_t const *attr_sim_ki; +extern HIDDEN fr_dict_attr_t const *attr_sim_op; +extern HIDDEN fr_dict_attr_t const *attr_sim_opc; +extern HIDDEN fr_dict_attr_t const *attr_sim_sqn; extern fr_value_box_t const *enum_eap_type_sim; extern fr_value_box_t const *enum_eap_type_aka; diff --git a/src/lib/server/request.h b/src/lib/server/request.h index 952fac03f58..fbc63f686df 100644 --- a/src/lib/server/request.h +++ b/src/lib/server/request.h @@ -80,11 +80,11 @@ typedef enum request_state_t { typedef void (*fr_request_process_t)(request_t *, fr_state_signal_t); //!< Function handler for requests. typedef rlm_rcode_t (*RAD_REQUEST_FUNP)(request_t *); -extern fr_dict_attr_t const *request_attr_root; -extern fr_dict_attr_t const *request_attr_request; -extern fr_dict_attr_t const *request_attr_reply; -extern fr_dict_attr_t const *request_attr_control; -extern fr_dict_attr_t const *request_attr_state; +extern HIDDEN fr_dict_attr_t const *request_attr_root; +extern HIDDEN fr_dict_attr_t const *request_attr_request; +extern HIDDEN fr_dict_attr_t const *request_attr_reply; +extern HIDDEN fr_dict_attr_t const *request_attr_control; +extern HIDDEN fr_dict_attr_t const *request_attr_state; /** Convenience macro for accessing the request list * diff --git a/src/lib/sim/attrs.h b/src/lib/sim/attrs.h index 5424d08094a..7f712762e1b 100644 --- a/src/lib/sim/attrs.h +++ b/src/lib/sim/attrs.h @@ -56,43 +56,43 @@ DICT_SANITY_CHECK(MAC); DICT_SANITY_CHECK(SUBTYPE); #define FR_SIM_SUBTYPE (FR_EAP_SIM_SUBTYPE & FR_EAP_AKA_SUBTYPE) -extern fr_dict_t *dict_freeradius; -extern fr_dict_t *dict_radius; -extern fr_dict_t *dict_eap_sim; -extern fr_dict_t *dict_eap_aka; +extern HIDDEN fr_dict_t *dict_freeradius; +extern HIDDEN fr_dict_t *dict_radius; +extern HIDDEN fr_dict_t *dict_eap_sim; +extern HIDDEN fr_dict_t *dict_eap_aka; -extern fr_dict_attr_t const *attr_eap_aka_ak; -extern fr_dict_attr_t const *attr_eap_aka_autn; -extern fr_dict_attr_t const *attr_eap_aka_auts; -extern fr_dict_attr_t const *attr_eap_aka_checkcode; -extern fr_dict_attr_t const *attr_eap_aka_ck; -extern fr_dict_attr_t const *attr_eap_aka_counter; -extern fr_dict_attr_t const *attr_eap_aka_identity; -extern fr_dict_attr_t const *attr_eap_aka_ik; -extern fr_dict_attr_t const *attr_eap_aka_iv; -extern fr_dict_attr_t const *attr_eap_aka_mac; -extern fr_dict_attr_t const *attr_eap_aka_mk; -extern fr_dict_attr_t const *attr_eap_aka_padding; -extern fr_dict_attr_t const *attr_eap_aka_rand; -extern fr_dict_attr_t const *attr_eap_aka_res; -extern fr_dict_attr_t const *attr_eap_aka_subtype; -extern fr_dict_attr_t const *attr_eap_aka_xres; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_ak; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_autn; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_auts; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_checkcode; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_ck; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_counter; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_identity; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_ik; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_iv; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_mac; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_mk; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_padding; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_rand; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_res; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_subtype; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_xres; -extern fr_dict_attr_t const *attr_eap_sim_identity; -extern fr_dict_attr_t const *attr_eap_sim_iv; -extern fr_dict_attr_t const *attr_eap_sim_kc; -extern fr_dict_attr_t const *attr_eap_sim_mac; -extern fr_dict_attr_t const *attr_eap_sim_padding; -extern fr_dict_attr_t const *attr_eap_sim_rand; -extern fr_dict_attr_t const *attr_eap_sim_sres; -extern fr_dict_attr_t const *attr_eap_sim_subtype; +extern HIDDEN fr_dict_attr_t const *attr_eap_sim_identity; +extern HIDDEN fr_dict_attr_t const *attr_eap_sim_iv; +extern HIDDEN fr_dict_attr_t const *attr_eap_sim_kc; +extern HIDDEN fr_dict_attr_t const *attr_eap_sim_mac; +extern HIDDEN fr_dict_attr_t const *attr_eap_sim_padding; +extern HIDDEN fr_dict_attr_t const *attr_eap_sim_rand; +extern HIDDEN fr_dict_attr_t const *attr_eap_sim_sres; +extern HIDDEN fr_dict_attr_t const *attr_eap_sim_subtype; -extern fr_dict_attr_t const *attr_eap_type; -extern fr_dict_attr_t const *attr_sim_algo_version; -extern fr_dict_attr_t const *attr_sim_amf; -extern fr_dict_attr_t const *attr_sim_identity_type; -extern fr_dict_attr_t const *attr_sim_ki; -extern fr_dict_attr_t const *attr_sim_method_hint; -extern fr_dict_attr_t const *attr_sim_op; -extern fr_dict_attr_t const *attr_sim_opc; -extern fr_dict_attr_t const *attr_sim_sqn; +extern HIDDEN fr_dict_attr_t const *attr_eap_type; +extern HIDDEN fr_dict_attr_t const *attr_sim_algo_version; +extern HIDDEN fr_dict_attr_t const *attr_sim_amf; +extern HIDDEN fr_dict_attr_t const *attr_sim_identity_type; +extern HIDDEN fr_dict_attr_t const *attr_sim_ki; +extern HIDDEN fr_dict_attr_t const *attr_sim_method_hint; +extern HIDDEN fr_dict_attr_t const *attr_sim_op; +extern HIDDEN fr_dict_attr_t const *attr_sim_opc; +extern HIDDEN fr_dict_attr_t const *attr_sim_sqn; diff --git a/src/lib/tls/attrs.h b/src/lib/tls/attrs.h index 866ee6270dc..eee88575ba8 100644 --- a/src/lib/tls/attrs.h +++ b/src/lib/tls/attrs.h @@ -26,48 +26,48 @@ RCSIDH(tls_attrs_h, "$Id$") #include -extern fr_dict_t const *dict_freeradius; -extern fr_dict_t const *dict_radius; -extern fr_dict_t const *dict_tls; +extern HIDDEN fr_dict_t const *dict_freeradius; +extern HIDDEN fr_dict_t const *dict_radius; +extern HIDDEN fr_dict_t const *dict_tls; -extern fr_dict_attr_t const *attr_allow_session_resumption; -extern fr_dict_attr_t const *attr_session_resumed; +extern HIDDEN fr_dict_attr_t const *attr_allow_session_resumption; +extern HIDDEN fr_dict_attr_t const *attr_session_resumed; -extern fr_dict_attr_t const *attr_tls_certificate; -extern fr_dict_attr_t const *attr_tls_certificate_serial; -extern fr_dict_attr_t const *attr_tls_certificate_signature; -extern fr_dict_attr_t const *attr_tls_certificate_signature_algorithm; -extern fr_dict_attr_t const *attr_tls_certificate_issuer; -extern fr_dict_attr_t const *attr_tls_certificate_not_before; -extern fr_dict_attr_t const *attr_tls_certificate_not_after; -extern fr_dict_attr_t const *attr_tls_certificate_subject; -extern fr_dict_attr_t const *attr_tls_certificate_common_name; -extern fr_dict_attr_t const *attr_tls_certificate_subject_alt_name_dns; -extern fr_dict_attr_t const *attr_tls_certificate_subject_alt_name_email; -extern fr_dict_attr_t const *attr_tls_certificate_subject_alt_name_upn; -extern fr_dict_attr_t const *attr_tls_certificate_x509v3_extended_key_usage; -extern fr_dict_attr_t const *attr_tls_certificate_x509v3_subject_key_identifier; -extern fr_dict_attr_t const *attr_tls_certificate_x509v3_authority_key_identifier; -extern fr_dict_attr_t const *attr_tls_certificate_x509v3_basic_constraints; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_serial; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_signature; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_signature_algorithm; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_issuer; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_not_before; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_not_after; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_subject; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_common_name; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_subject_alt_name_dns; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_subject_alt_name_email; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_subject_alt_name_upn; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_x509v3_extended_key_usage; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_x509v3_subject_key_identifier; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_x509v3_authority_key_identifier; +extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_x509v3_basic_constraints; -extern fr_dict_attr_t const *attr_tls_client_error_code; -extern fr_dict_attr_t const *attr_tls_ocsp_cert_valid; -extern fr_dict_attr_t const *attr_tls_ocsp_next_update; -extern fr_dict_attr_t const *attr_tls_ocsp_response; -extern fr_dict_attr_t const *attr_tls_psk_identity; +extern HIDDEN fr_dict_attr_t const *attr_tls_client_error_code; +extern HIDDEN fr_dict_attr_t const *attr_tls_ocsp_cert_valid; +extern HIDDEN fr_dict_attr_t const *attr_tls_ocsp_next_update; +extern HIDDEN fr_dict_attr_t const *attr_tls_ocsp_response; +extern HIDDEN fr_dict_attr_t const *attr_tls_psk_identity; -extern fr_dict_attr_t const *attr_tls_session_cert_file; -extern fr_dict_attr_t const *attr_tls_session_require_client_cert; -extern fr_dict_attr_t const *attr_tls_session_cipher_suite; -extern fr_dict_attr_t const *attr_tls_session_version; +extern HIDDEN fr_dict_attr_t const *attr_tls_session_cert_file; +extern HIDDEN fr_dict_attr_t const *attr_tls_session_require_client_cert; +extern HIDDEN fr_dict_attr_t const *attr_tls_session_cipher_suite; +extern HIDDEN fr_dict_attr_t const *attr_tls_session_version; -extern fr_dict_attr_t const *attr_tls_packet_type; -extern fr_dict_attr_t const *attr_tls_session_data; -extern fr_dict_attr_t const *attr_tls_session_id; -extern fr_dict_attr_t const *attr_tls_session_resumed; -extern fr_dict_attr_t const *attr_tls_session_ttl; +extern HIDDEN fr_dict_attr_t const *attr_tls_packet_type; +extern HIDDEN fr_dict_attr_t const *attr_tls_session_data; +extern HIDDEN fr_dict_attr_t const *attr_tls_session_id; +extern HIDDEN fr_dict_attr_t const *attr_tls_session_resumed; +extern HIDDEN fr_dict_attr_t const *attr_tls_session_ttl; -extern fr_dict_attr_t const *attr_framed_mtu; +extern HIDDEN fr_dict_attr_t const *attr_framed_mtu; extern fr_value_box_t const *enum_tls_packet_type_load_session; extern fr_value_box_t const *enum_tls_packet_type_store_session; diff --git a/src/modules/rlm_couchbase/couchbase.h b/src/modules/rlm_couchbase/couchbase.h index bc8dcdd3283..0aabb447e0c 100644 --- a/src/modules/rlm_couchbase/couchbase.h +++ b/src/modules/rlm_couchbase/couchbase.h @@ -70,9 +70,9 @@ struct couchbase_opts_s { couchbase_opts_t *next; //!< Linked list. }; -extern fr_dict_attr_t const *attr_acct_status_type; -extern fr_dict_attr_t const *attr_acct_session_time; -extern fr_dict_attr_t const *attr_event_timestamp; +extern HIDDEN fr_dict_attr_t const *attr_acct_status_type; +extern HIDDEN fr_dict_attr_t const *attr_acct_session_time; +extern HIDDEN fr_dict_attr_t const *attr_event_timestamp; /* couchbase statistics callback */ void couchbase_stat_callback(lcb_t instance, const void *cookie, lcb_error_t error, diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.h b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.h index ea5a3032cec..f649b539d10 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.h +++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.h @@ -205,48 +205,48 @@ typedef struct { char const *virtual_server; } eap_fast_tunnel_t; -extern fr_dict_attr_t const *attr_eap_tls_require_client_cert; -extern fr_dict_attr_t const *attr_eap_type; -extern fr_dict_attr_t const *attr_ms_chap_challenge; -extern fr_dict_attr_t const *attr_ms_chap_peer_challenge; -extern fr_dict_attr_t const *attr_proxy_to_realm; - -extern fr_dict_attr_t const *attr_eap_message; -extern fr_dict_attr_t const *attr_eap_msk; -extern fr_dict_attr_t const *attr_eap_emsk; -extern fr_dict_attr_t const *attr_freeradius_proxied_to; -extern fr_dict_attr_t const *attr_ms_mppe_send_key; -extern fr_dict_attr_t const *attr_ms_mppe_recv_key; -extern fr_dict_attr_t const *attr_user_name; -extern fr_dict_attr_t const *attr_user_password; - -extern fr_dict_attr_t const *attr_eap_fast_crypto_binding; -extern fr_dict_attr_t const *attr_eap_fast_eap_payload; -extern fr_dict_attr_t const *attr_eap_fast_error; -extern fr_dict_attr_t const *attr_eap_fast_intermediate_result; -extern fr_dict_attr_t const *attr_eap_fast_nak; -extern fr_dict_attr_t const *attr_eap_fast_pac_a_id; -extern fr_dict_attr_t const *attr_eap_fast_pac_a_id_info; -extern fr_dict_attr_t const *attr_eap_fast_pac_acknowledge; -extern fr_dict_attr_t const *attr_eap_fast_pac_i_id; -extern fr_dict_attr_t const *attr_eap_fast_pac_info_a_id; -extern fr_dict_attr_t const *attr_eap_fast_pac_info_a_id_info; -extern fr_dict_attr_t const *attr_eap_fast_pac_info_i_id; -extern fr_dict_attr_t const *attr_eap_fast_pac_info_pac_lifetime; -extern fr_dict_attr_t const *attr_eap_fast_pac_info_pac_type; -extern fr_dict_attr_t const *attr_eap_fast_pac_info_tlv; -extern fr_dict_attr_t const *attr_eap_fast_pac_key; -extern fr_dict_attr_t const *attr_eap_fast_pac_lifetime; -extern fr_dict_attr_t const *attr_eap_fast_pac_opaque_i_id; -extern fr_dict_attr_t const *attr_eap_fast_pac_opaque_pac_key; -extern fr_dict_attr_t const *attr_eap_fast_pac_opaque_pac_lifetime; -extern fr_dict_attr_t const *attr_eap_fast_pac_opaque_pac_type; -extern fr_dict_attr_t const *attr_eap_fast_pac_opaque_tlv; -extern fr_dict_attr_t const *attr_eap_fast_pac_tlv; -extern fr_dict_attr_t const *attr_eap_fast_pac_type; -extern fr_dict_attr_t const *attr_eap_fast_result; -extern fr_dict_attr_t const *attr_eap_fast_vendor_specific; -extern fr_dict_t const *dict_eap_fast; +extern HIDDEN fr_dict_attr_t const *attr_eap_tls_require_client_cert; +extern HIDDEN fr_dict_attr_t const *attr_eap_type; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_challenge; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_peer_challenge; +extern HIDDEN fr_dict_attr_t const *attr_proxy_to_realm; + +extern HIDDEN fr_dict_attr_t const *attr_eap_message; +extern HIDDEN fr_dict_attr_t const *attr_eap_msk; +extern HIDDEN fr_dict_attr_t const *attr_eap_emsk; +extern HIDDEN fr_dict_attr_t const *attr_freeradius_proxied_to; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_send_key; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_recv_key; +extern HIDDEN fr_dict_attr_t const *attr_user_name; +extern HIDDEN fr_dict_attr_t const *attr_user_password; + +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_crypto_binding; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_eap_payload; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_error; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_intermediate_result; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_nak; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_a_id; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_a_id_info; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_acknowledge; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_i_id; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_info_a_id; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_info_a_id_info; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_info_i_id; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_info_pac_lifetime; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_info_pac_type; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_info_tlv; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_key; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_lifetime; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_opaque_i_id; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_opaque_pac_key; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_opaque_pac_lifetime; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_opaque_pac_type; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_opaque_tlv; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_tlv; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_pac_type; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_result; +extern HIDDEN fr_dict_attr_t const *attr_eap_fast_vendor_specific; +extern HIDDEN fr_dict_t const *dict_eap_fast; /* * Process the FAST portion of an EAP-FAST request. diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h index 4c1583c3931..7e39698199e 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h +++ b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h @@ -56,14 +56,14 @@ typedef struct { peap_resumption session_resumption_state; } peap_tunnel_t; -extern fr_dict_attr_t const *attr_auth_type; -extern fr_dict_attr_t const *attr_eap_tls_require_client_cert; -extern fr_dict_attr_t const *attr_proxy_to_realm; -extern fr_dict_attr_t const *attr_soh_supported; +extern HIDDEN fr_dict_attr_t const *attr_auth_type; +extern HIDDEN fr_dict_attr_t const *attr_eap_tls_require_client_cert; +extern HIDDEN fr_dict_attr_t const *attr_proxy_to_realm; +extern HIDDEN fr_dict_attr_t const *attr_soh_supported; -extern fr_dict_attr_t const *attr_eap_message; -extern fr_dict_attr_t const *attr_freeradius_proxied_to; -extern fr_dict_attr_t const *attr_user_name; +extern HIDDEN fr_dict_attr_t const *attr_eap_message; +extern HIDDEN fr_dict_attr_t const *attr_freeradius_proxied_to; +extern HIDDEN fr_dict_attr_t const *attr_user_name; #define EAP_TLV_SUCCESS (1) diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h b/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h index fff42c84bc2..34cc7534c79 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/eap_ttls.h @@ -29,18 +29,18 @@ RCSIDH(eap_ttls_h, "$Id$") #include #include -extern fr_dict_attr_t const *attr_eap_tls_require_client_cert; -extern fr_dict_attr_t const *attr_proxy_to_realm; -extern fr_dict_attr_t const *attr_chap_challenge; -extern fr_dict_attr_t const *attr_ms_chap2_success; -extern fr_dict_attr_t const *attr_eap_message; -extern fr_dict_attr_t const *attr_freeradius_proxied_to; -extern fr_dict_attr_t const *attr_ms_chap_challenge; -extern fr_dict_attr_t const *attr_reply_message; -extern fr_dict_attr_t const *attr_eap_channel_binding_message; -extern fr_dict_attr_t const *attr_user_name; -extern fr_dict_attr_t const *attr_user_password; -extern fr_dict_attr_t const *attr_vendor_specific; +extern HIDDEN fr_dict_attr_t const *attr_eap_tls_require_client_cert; +extern HIDDEN fr_dict_attr_t const *attr_proxy_to_realm; +extern HIDDEN fr_dict_attr_t const *attr_chap_challenge; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap2_success; +extern HIDDEN fr_dict_attr_t const *attr_eap_message; +extern HIDDEN fr_dict_attr_t const *attr_freeradius_proxied_to; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_challenge; +extern HIDDEN fr_dict_attr_t const *attr_reply_message; +extern HIDDEN fr_dict_attr_t const *attr_eap_channel_binding_message; +extern HIDDEN fr_dict_attr_t const *attr_user_name; +extern HIDDEN fr_dict_attr_t const *attr_user_password; +extern HIDDEN fr_dict_attr_t const *attr_vendor_specific; typedef struct { fr_pair_t *username; diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h index 95446f1eb82..ea6f83fd59f 100644 --- a/src/modules/rlm_ldap/rlm_ldap.h +++ b/src/modules/rlm_ldap/rlm_ldap.h @@ -152,14 +152,14 @@ struct ldap_inst_s { uint32_t ldap_debug; //!< Debug flag for the SDK. }; -extern fr_dict_attr_t const *attr_cleartext_password; -extern fr_dict_attr_t const *attr_crypt_password; -extern fr_dict_attr_t const *attr_ldap_userdn; -extern fr_dict_attr_t const *attr_nt_password; -extern fr_dict_attr_t const *attr_password_with_header; - -extern fr_dict_attr_t const *attr_user_password; -extern fr_dict_attr_t const *attr_user_name; +extern HIDDEN fr_dict_attr_t const *attr_cleartext_password; +extern HIDDEN fr_dict_attr_t const *attr_crypt_password; +extern HIDDEN fr_dict_attr_t const *attr_ldap_userdn; +extern HIDDEN fr_dict_attr_t const *attr_nt_password; +extern HIDDEN fr_dict_attr_t const *attr_password_with_header; + +extern HIDDEN fr_dict_attr_t const *attr_user_password; +extern HIDDEN fr_dict_attr_t const *attr_user_name; /* * user.c - User lookup functions diff --git a/src/modules/rlm_mschap/rlm_mschap.h b/src/modules/rlm_mschap/rlm_mschap.h index 4a36ffff824..473a7da9158 100644 --- a/src/modules/rlm_mschap/rlm_mschap.h +++ b/src/modules/rlm_mschap/rlm_mschap.h @@ -19,35 +19,35 @@ typedef enum { #endif } MSCHAP_AUTH_METHOD; -extern fr_dict_attr_t const *attr_auth_type; -extern fr_dict_attr_t const *attr_cleartext_password; -extern fr_dict_attr_t const *attr_eap_identity; -extern fr_dict_attr_t const *attr_nt_password; -extern fr_dict_attr_t const *attr_lm_password; -extern fr_dict_attr_t const *attr_ms_chap_use_ntlm_auth; +extern HIDDEN fr_dict_attr_t const *attr_auth_type; +extern HIDDEN fr_dict_attr_t const *attr_cleartext_password; +extern HIDDEN fr_dict_attr_t const *attr_eap_identity; +extern HIDDEN fr_dict_attr_t const *attr_nt_password; +extern HIDDEN fr_dict_attr_t const *attr_lm_password; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_use_ntlm_auth; -extern fr_dict_attr_t const *attr_ms_chap_user_name; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_user_name; -extern fr_dict_attr_t const *attr_ms_chap_peer_challenge; -extern fr_dict_attr_t const *attr_ms_chap_new_nt_password; -extern fr_dict_attr_t const *attr_ms_chap_new_cleartext_password; -extern fr_dict_attr_t const *attr_smb_account_ctrl; -extern fr_dict_attr_t const *attr_smb_account_ctrl_text; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_peer_challenge; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_new_nt_password; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_new_cleartext_password; +extern HIDDEN fr_dict_attr_t const *attr_smb_account_ctrl; +extern HIDDEN fr_dict_attr_t const *attr_smb_account_ctrl_text; -extern fr_dict_attr_t const *attr_user_name; -extern fr_dict_attr_t const *attr_ms_chap_error; +extern HIDDEN fr_dict_attr_t const *attr_user_name; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_error; -extern fr_dict_attr_t const *attr_ms_chap_challenge; -extern fr_dict_attr_t const *attr_ms_chap_response; -extern fr_dict_attr_t const *attr_ms_chap2_response; -extern fr_dict_attr_t const *attr_ms_chap2_success; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_challenge; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_response; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap2_response; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap2_success; -extern fr_dict_attr_t const *attr_ms_chap_mppe_keys; -extern fr_dict_attr_t const *attr_ms_mppe_encryption_policy; -extern fr_dict_attr_t const *attr_ms_mppe_recv_key; -extern fr_dict_attr_t const *attr_ms_mppe_send_key; -extern fr_dict_attr_t const *attr_ms_mppe_encryption_types; -extern fr_dict_attr_t const *attr_ms_chap2_cpw; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap_mppe_keys; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_encryption_policy; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_recv_key; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_send_key; +extern HIDDEN fr_dict_attr_t const *attr_ms_mppe_encryption_types; +extern HIDDEN fr_dict_attr_t const *attr_ms_chap2_cpw; typedef struct { char const *name; diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h index 2a8e41d02f2..e2e4a84a6e4 100644 --- a/src/modules/rlm_rest/rest.h +++ b/src/modules/rlm_rest/rest.h @@ -269,11 +269,11 @@ typedef struct { fr_curl_io_request_t *handle; //!< curl easy handle servicing our request. } rlm_rest_xlat_rctx_t; -extern fr_dict_t const *dict_freeradius; +extern HIDDEN fr_dict_t const *dict_freeradius; -extern fr_dict_attr_t const *attr_rest_http_body; -extern fr_dict_attr_t const *attr_rest_http_header; -extern fr_dict_attr_t const *attr_rest_http_status_code; +extern HIDDEN fr_dict_attr_t const *attr_rest_http_body; +extern HIDDEN fr_dict_attr_t const *attr_rest_http_header; +extern HIDDEN fr_dict_attr_t const *attr_rest_http_status_code; /* * Function prototype for rest_read_wrapper. Matches CURL's diff --git a/src/modules/rlm_securid/rlm_securid.h b/src/modules/rlm_securid/rlm_securid.h index e488fec5289..820d697282f 100644 --- a/src/modules/rlm_securid/rlm_securid.h +++ b/src/modules/rlm_securid/rlm_securid.h @@ -77,10 +77,10 @@ typedef struct { uint32_t max_trips_per_session; } rlm_securid_t; -extern fr_dict_attr_t const *attr_prompt; -extern fr_dict_attr_t const *attr_reply_message; -extern fr_dict_attr_t const *attr_state; -extern fr_dict_attr_t const *attr_user_password; +extern HIDDEN fr_dict_attr_t const *attr_prompt; +extern HIDDEN fr_dict_attr_t const *attr_reply_message; +extern HIDDEN fr_dict_attr_t const *attr_state; +extern HIDDEN fr_dict_attr_t const *attr_user_password; /* Memory Management */ SECURID_SESSION* securid_session_alloc(void); diff --git a/src/modules/rlm_sigtran/attrs.h b/src/modules/rlm_sigtran/attrs.h index bed4776cccc..961796c12b3 100644 --- a/src/modules/rlm_sigtran/attrs.h +++ b/src/modules/rlm_sigtran/attrs.h @@ -26,14 +26,14 @@ RCSIDH(rlm_sigtran_attrs_h, "$Id$") #include -extern fr_dict_t const *dict_eap_aka_sim; +extern HIDDEN fr_dict_t const *dict_eap_aka_sim; -extern fr_dict_attr_t const *attr_eap_aka_sim_autn; -extern fr_dict_attr_t const *attr_eap_aka_sim_ck; -extern fr_dict_attr_t const *attr_eap_aka_sim_ik; -extern fr_dict_attr_t const *attr_eap_aka_sim_rand; -extern fr_dict_attr_t const *attr_eap_aka_sim_xres; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_autn; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_ck; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_ik; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_rand; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_xres; -extern fr_dict_attr_t const *attr_eap_aka_sim_kc; -extern fr_dict_attr_t const *attr_eap_aka_sim_sres; -extern fr_dict_attr_t const *attr_eap_aka_sim_rand; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_kc; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_sres; +extern HIDDEN fr_dict_attr_t const *attr_eap_aka_sim_rand; diff --git a/src/modules/rlm_yubikey/rlm_yubikey.h b/src/modules/rlm_yubikey/rlm_yubikey.h index 3091e937652..f01b26de707 100644 --- a/src/modules/rlm_yubikey/rlm_yubikey.h +++ b/src/modules/rlm_yubikey/rlm_yubikey.h @@ -69,12 +69,12 @@ int rlm_yubikey_ykclient_detach(rlm_yubikey_t *inst); unlang_action_t rlm_yubikey_validate(rlm_rcode_t *p_result, rlm_yubikey_t const *inst, request_t *request, char const *passcode); -extern fr_dict_attr_t const *attr_auth_type; -extern fr_dict_attr_t const *attr_user_password; -extern fr_dict_attr_t const *attr_yubikey_key; -extern fr_dict_attr_t const *attr_yubikey_public_id; -extern fr_dict_attr_t const *attr_yubikey_private_id; -extern fr_dict_attr_t const *attr_yubikey_counter; -extern fr_dict_attr_t const *attr_yubikey_timestamp; -extern fr_dict_attr_t const *attr_yubikey_random; -extern fr_dict_attr_t const *attr_yubikey_otp; +extern HIDDEN fr_dict_attr_t const *attr_auth_type; +extern HIDDEN fr_dict_attr_t const *attr_user_password; +extern HIDDEN fr_dict_attr_t const *attr_yubikey_key; +extern HIDDEN fr_dict_attr_t const *attr_yubikey_public_id; +extern HIDDEN fr_dict_attr_t const *attr_yubikey_private_id; +extern HIDDEN fr_dict_attr_t const *attr_yubikey_counter; +extern HIDDEN fr_dict_attr_t const *attr_yubikey_timestamp; +extern HIDDEN fr_dict_attr_t const *attr_yubikey_random; +extern HIDDEN fr_dict_attr_t const *attr_yubikey_otp; diff --git a/src/protocols/arp/attrs.h b/src/protocols/arp/attrs.h index a27ffeeae33..b5db3c5c7e6 100644 --- a/src/protocols/arp/attrs.h +++ b/src/protocols/arp/attrs.h @@ -27,6 +27,6 @@ RCSIDH(radius_attrs_h, "$Id$") #include #include -extern fr_dict_t const *dict_arp; +extern HIDDEN fr_dict_t const *dict_arp; -extern fr_dict_attr_t const *attr_arp_packet; +extern HIDDEN fr_dict_attr_t const *attr_arp_packet; diff --git a/src/protocols/dhcpv4/attrs.h b/src/protocols/dhcpv4/attrs.h index e376ceadd2d..cc34dd3b423 100644 --- a/src/protocols/dhcpv4/attrs.h +++ b/src/protocols/dhcpv4/attrs.h @@ -27,28 +27,28 @@ RCSIDH(dhcpv4_attrs_h, "$Id$") #include -extern fr_dict_t const *dict_dhcpv4; +extern HIDDEN fr_dict_t const *dict_dhcpv4; -extern fr_dict_attr_t const *attr_dhcp_boot_filename; -extern fr_dict_attr_t const *attr_dhcp_client_hardware_address; -extern fr_dict_attr_t const *attr_dhcp_client_ip_address; -extern fr_dict_attr_t const *attr_dhcp_flags; -extern fr_dict_attr_t const *attr_dhcp_gateway_ip_address; -extern fr_dict_attr_t const *attr_dhcp_hardware_address_length; -extern fr_dict_attr_t const *attr_dhcp_hardware_type; -extern fr_dict_attr_t const *attr_dhcp_hop_count; -extern fr_dict_attr_t const *attr_dhcp_number_of_seconds; -extern fr_dict_attr_t const *attr_dhcp_opcode; -extern fr_dict_attr_t const *attr_dhcp_server_host_name; -extern fr_dict_attr_t const *attr_dhcp_server_ip_address; -extern fr_dict_attr_t const *attr_dhcp_transaction_id; -extern fr_dict_attr_t const *attr_dhcp_your_ip_address; -extern fr_dict_attr_t const *attr_dhcp_dhcp_maximum_msg_size; -extern fr_dict_attr_t const *attr_dhcp_interface_mtu_size; -extern fr_dict_attr_t const *attr_dhcp_message_type; -extern fr_dict_attr_t const *attr_dhcp_parameter_request_list; -extern fr_dict_attr_t const *attr_dhcp_overload; -extern fr_dict_attr_t const *attr_dhcp_vendor_class_identifier; -extern fr_dict_attr_t const *attr_dhcp_relay_link_selection; -extern fr_dict_attr_t const *attr_dhcp_subnet_selection_option; -extern fr_dict_attr_t const *attr_dhcp_network_subnet; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_boot_filename; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_client_hardware_address; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_client_ip_address; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_flags; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_gateway_ip_address; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_hardware_address_length; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_hardware_type; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_hop_count; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_number_of_seconds; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_opcode; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_server_host_name; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_server_ip_address; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_transaction_id; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_your_ip_address; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_dhcp_maximum_msg_size; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_interface_mtu_size; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_message_type; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_parameter_request_list; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_overload; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_vendor_class_identifier; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_relay_link_selection; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_subnet_selection_option; +extern HIDDEN fr_dict_attr_t const *attr_dhcp_network_subnet; diff --git a/src/protocols/dhcpv4/dhcpv4.h b/src/protocols/dhcpv4/dhcpv4.h index 7bedbe4caba..42bbf58da3b 100644 --- a/src/protocols/dhcpv4/dhcpv4.h +++ b/src/protocols/dhcpv4/dhcpv4.h @@ -116,12 +116,12 @@ typedef struct { # define ETH_ADDR_LEN 6 #endif -extern fr_dict_attr_t const **dhcp_header_attrs[]; -extern size_t dhcp_header_attrs_len; -extern char const *dhcp_message_types[]; -extern int dhcp_header_sizes[]; -extern uint8_t eth_bcast[ETH_ADDR_LEN]; -extern fr_dict_attr_t const *dhcp_option_82; +extern fr_dict_attr_t const **dhcp_header_attrs[]; +extern size_t dhcp_header_attrs_len; +extern char const *dhcp_message_types[]; +extern int dhcp_header_sizes[]; +extern uint8_t eth_bcast[ETH_ADDR_LEN]; +extern HIDDEN fr_dict_attr_t const *dhcp_option_82; #ifdef HAVE_LINUX_IF_PACKET_H # define ETH_HDR_SIZE 14 diff --git a/src/protocols/dhcpv6/attrs.h b/src/protocols/dhcpv6/attrs.h index 7e2cb63d9d8..ee01e0b6378 100644 --- a/src/protocols/dhcpv6/attrs.h +++ b/src/protocols/dhcpv6/attrs.h @@ -27,15 +27,15 @@ RCSIDH(dhcpv6_attrs_h, "$Id$") #include -extern fr_dict_t const *dict_dhcpv6; +extern HIDDEN fr_dict_t const *dict_dhcpv6; -extern fr_dict_attr_t const *attr_packet_type; -extern fr_dict_attr_t const *attr_transaction_id; -extern fr_dict_attr_t const *attr_option_request; -extern fr_dict_attr_t const *attr_hop_count; -extern fr_dict_attr_t const *attr_relay_link_address; -extern fr_dict_attr_t const *attr_relay_peer_address; -extern fr_dict_attr_t const *attr_relay_message; +extern HIDDEN fr_dict_attr_t const *attr_packet_type; +extern HIDDEN fr_dict_attr_t const *attr_transaction_id; +extern HIDDEN fr_dict_attr_t const *attr_option_request; +extern HIDDEN fr_dict_attr_t const *attr_hop_count; +extern HIDDEN fr_dict_attr_t const *attr_relay_link_address; +extern HIDDEN fr_dict_attr_t const *attr_relay_peer_address; +extern HIDDEN fr_dict_attr_t const *attr_relay_message; /* * A private function that is used only in base.c and encode.c diff --git a/src/protocols/dns/attrs.h b/src/protocols/dns/attrs.h index ff951ebcd52..dc473da84f9 100644 --- a/src/protocols/dns/attrs.h +++ b/src/protocols/dns/attrs.h @@ -27,11 +27,11 @@ RCSIDH(dns_attrs_h, "$Id$") #include -extern fr_dict_t const *dict_dns; +extern HIDDEN fr_dict_t const *dict_dns; -extern fr_dict_attr_t const *attr_packet_type; -extern fr_dict_attr_t const *attr_dns_packet; -extern fr_dict_attr_t const *attr_dns_question; -extern fr_dict_attr_t const *attr_dns_rr; -extern fr_dict_attr_t const *attr_dns_ns; -extern fr_dict_attr_t const *attr_dns_ar; +extern HIDDEN fr_dict_attr_t const *attr_packet_type; +extern HIDDEN fr_dict_attr_t const *attr_dns_packet; +extern HIDDEN fr_dict_attr_t const *attr_dns_question; +extern HIDDEN fr_dict_attr_t const *attr_dns_rr; +extern HIDDEN fr_dict_attr_t const *attr_dns_ns; +extern HIDDEN fr_dict_attr_t const *attr_dns_ar; diff --git a/src/protocols/radius/attrs.h b/src/protocols/radius/attrs.h index 868f14b0049..0369762f21f 100644 --- a/src/protocols/radius/attrs.h +++ b/src/protocols/radius/attrs.h @@ -28,16 +28,16 @@ RCSIDH(radius_attrs_h, "$Id$") #include #include -extern CC_HINT(visibility("hidden")) fr_dict_t const *dict_freeradius; -extern CC_HINT(visibility("hidden")) fr_dict_t const *dict_radius; +extern HIDDEN fr_dict_t const *dict_freeradius; +extern HIDDEN fr_dict_t const *dict_radius; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_packet_type; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_packet_authentication_vector; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_raw_attribute; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_chap_challenge; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_chargeable_user_identity; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_eap_message; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_message_authenticator; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_state; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_vendor_specific; -extern CC_HINT(visibility("hidden")) fr_dict_attr_t const *attr_nas_filter_rule; +extern HIDDEN fr_dict_attr_t const *attr_packet_type; +extern HIDDEN fr_dict_attr_t const *attr_packet_authentication_vector; +extern HIDDEN fr_dict_attr_t const *attr_raw_attribute; +extern HIDDEN fr_dict_attr_t const *attr_chap_challenge; +extern HIDDEN fr_dict_attr_t const *attr_chargeable_user_identity; +extern HIDDEN fr_dict_attr_t const *attr_eap_message; +extern HIDDEN fr_dict_attr_t const *attr_message_authenticator; +extern HIDDEN fr_dict_attr_t const *attr_state; +extern HIDDEN fr_dict_attr_t const *attr_vendor_specific; +extern HIDDEN fr_dict_attr_t const *attr_nas_filter_rule; diff --git a/src/protocols/tacacs/attrs.h b/src/protocols/tacacs/attrs.h index 8311a18160e..4ebaa190023 100644 --- a/src/protocols/tacacs/attrs.h +++ b/src/protocols/tacacs/attrs.h @@ -25,32 +25,32 @@ */ RCSIDH(tacacs_attrs_h, "$Id$") -extern fr_dict_t const *dict_tacacs; +extern HIDDEN fr_dict_t const *dict_tacacs; -extern fr_dict_attr_t const *attr_tacacs_accounting_flags; -extern fr_dict_attr_t const *attr_tacacs_accounting_status; -extern fr_dict_attr_t const *attr_tacacs_action; -extern fr_dict_attr_t const *attr_tacacs_authentication_flags; -extern fr_dict_attr_t const *attr_tacacs_authentication_continue_flags; -extern fr_dict_attr_t const *attr_tacacs_authentication_method; -extern fr_dict_attr_t const *attr_tacacs_authentication_service; -extern fr_dict_attr_t const *attr_tacacs_authentication_status; -extern fr_dict_attr_t const *attr_tacacs_authentication_type; -extern fr_dict_attr_t const *attr_tacacs_authorization_status; -extern fr_dict_attr_t const *attr_tacacs_argument_list; -extern fr_dict_attr_t const *attr_tacacs_client_port; -extern fr_dict_attr_t const *attr_tacacs_data; -extern fr_dict_attr_t const *attr_tacacs_flags; -extern fr_dict_attr_t const *attr_tacacs_length; -extern fr_dict_attr_t const *attr_tacacs_packet; -extern fr_dict_attr_t const *attr_tacacs_packet_body_type; -extern fr_dict_attr_t const *attr_tacacs_packet_type; -extern fr_dict_attr_t const *attr_tacacs_privilege_level; -extern fr_dict_attr_t const *attr_tacacs_remote_address; -extern fr_dict_attr_t const *attr_tacacs_sequence_number; -extern fr_dict_attr_t const *attr_tacacs_server_message; -extern fr_dict_attr_t const *attr_tacacs_session_id; -extern fr_dict_attr_t const *attr_tacacs_user_message; -extern fr_dict_attr_t const *attr_tacacs_user_name; -extern fr_dict_attr_t const *attr_tacacs_version_major; -extern fr_dict_attr_t const *attr_tacacs_version_minor; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_accounting_flags; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_accounting_status; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_action; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_authentication_flags; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_authentication_continue_flags; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_authentication_method; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_authentication_service; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_authentication_status; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_authentication_type; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_authorization_status; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_argument_list; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_client_port; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_data; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_flags; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_length; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_packet; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_packet_body_type; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_packet_type; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_privilege_level; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_remote_address; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_sequence_number; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_server_message; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_session_id; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_user_message; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_user_name; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_version_major; +extern HIDDEN fr_dict_attr_t const *attr_tacacs_version_minor; diff --git a/src/protocols/tftp/attrs.h b/src/protocols/tftp/attrs.h index eda830f5fd3..6a2295f7c01 100644 --- a/src/protocols/tftp/attrs.h +++ b/src/protocols/tftp/attrs.h @@ -28,15 +28,15 @@ RCSIDH(tftp_attrs_h, "$Id$") #include -extern fr_dict_t const *dict_tftp; +extern HIDDEN fr_dict_t const *dict_tftp; -extern fr_dict_attr_t const *attr_tftp_block; -extern fr_dict_attr_t const *attr_tftp_block_size; -extern fr_dict_attr_t const *attr_tftp_data; -extern fr_dict_attr_t const *attr_tftp_error_code; -extern fr_dict_attr_t const *attr_tftp_error_message; -extern fr_dict_attr_t const *attr_tftp_filename; -extern fr_dict_attr_t const *attr_tftp_opcode; -extern fr_dict_attr_t const *attr_tftp_mode; +extern HIDDEN fr_dict_attr_t const *attr_tftp_block; +extern HIDDEN fr_dict_attr_t const *attr_tftp_block_size; +extern HIDDEN fr_dict_attr_t const *attr_tftp_data; +extern HIDDEN fr_dict_attr_t const *attr_tftp_error_code; +extern HIDDEN fr_dict_attr_t const *attr_tftp_error_message; +extern HIDDEN fr_dict_attr_t const *attr_tftp_filename; +extern HIDDEN fr_dict_attr_t const *attr_tftp_opcode; +extern HIDDEN fr_dict_attr_t const *attr_tftp_mode; -extern fr_dict_attr_t const *attr_packet_type; +extern HIDDEN fr_dict_attr_t const *attr_packet_type; diff --git a/src/protocols/vmps/attrs.h b/src/protocols/vmps/attrs.h index 930152657f0..4cb402c3be3 100644 --- a/src/protocols/vmps/attrs.h +++ b/src/protocols/vmps/attrs.h @@ -26,8 +26,8 @@ RCSIDH(vmps_attrs_h, "$Id$") #include -extern fr_dict_t const *dict_vmps; +extern HIDDEN fr_dict_t const *dict_vmps; -extern fr_dict_attr_t const *attr_error_code; -extern fr_dict_attr_t const *attr_packet_type; -extern fr_dict_attr_t const *attr_sequence_number; +extern HIDDEN fr_dict_attr_t const *attr_error_code; +extern HIDDEN fr_dict_attr_t const *attr_packet_type; +extern HIDDEN fr_dict_attr_t const *attr_sequence_number;