diff --git a/res/res_stasis_http_bridges.c b/res/res_stasis_http_bridges.c
index 878c1ce0ae7c83a1cf3baaa827df63c5b1534c46..f46b7ac1c91682b7663aa31b671a35acd0c680cf 100644
--- a/res/res_stasis_http_bridges.c
+++ b/res/res_stasis_http_bridges.c
@@ -76,7 +76,7 @@ static void stasis_http_get_bridges_cb(
default:
if (200 <= code && code <= 299) {
is_valid = ari_validate_list(response->message,
- ari_validate_bridge);
+ ari_validate_bridge_fn());
} else {
ast_log(LOG_ERROR, "Invalid error response %d for /bridges\n", code);
is_valid = 0;
diff --git a/res/res_stasis_http_channels.c b/res/res_stasis_http_channels.c
index 5343714b1af5dbf597dd256ff310a642891cf009..108f356c106c3532dedd8425c72266e7d3bffdaf 100644
--- a/res/res_stasis_http_channels.c
+++ b/res/res_stasis_http_channels.c
@@ -76,7 +76,7 @@ static void stasis_http_get_channels_cb(
default:
if (200 <= code && code <= 299) {
is_valid = ari_validate_list(response->message,
- ari_validate_channel);
+ ari_validate_channel_fn());
} else {
ast_log(LOG_ERROR, "Invalid error response %d for /channels\n", code);
is_valid = 0;
diff --git a/res/res_stasis_http_endpoints.c b/res/res_stasis_http_endpoints.c
index 332333030abf9d11bbb980d339a16239917f5f01..f85de3b7dc7de4bbd1a371ccc380fd3deedd1b74 100644
--- a/res/res_stasis_http_endpoints.c
+++ b/res/res_stasis_http_endpoints.c
@@ -76,7 +76,7 @@ static void stasis_http_get_endpoints_cb(
default:
if (200 <= code && code <= 299) {
is_valid = ari_validate_list(response->message,
- ari_validate_endpoint);
+ ari_validate_endpoint_fn());
} else {
ast_log(LOG_ERROR, "Invalid error response %d for /endpoints\n", code);
is_valid = 0;
@@ -126,7 +126,7 @@ static void stasis_http_get_endpoints_by_tech_cb(
default:
if (200 <= code && code <= 299) {
is_valid = ari_validate_list(response->message,
- ari_validate_endpoint);
+ ari_validate_endpoint_fn());
} else {
ast_log(LOG_ERROR, "Invalid error response %d for /endpoints/{tech}\n", code);
is_valid = 0;
diff --git a/res/res_stasis_http_events.c b/res/res_stasis_http_events.c
index 4217263129ff591056744366db03c629208a79b8..7172e2769edba49f5740cc0ef10337ece26fb4ba 100644
--- a/res/res_stasis_http_events.c
+++ b/res/res_stasis_http_events.c
@@ -64,7 +64,7 @@ static void stasis_http_event_websocket_ws_cb(struct ast_websocket *ws_session,
}
#if defined(AST_DEVMODE)
session = ari_websocket_session_create(ws_session,
- ari_validate_event);
+ ari_validate_event_fn());
#else
session = ari_websocket_session_create(ws_session, NULL);
#endif
diff --git a/res/res_stasis_http_recordings.c b/res/res_stasis_http_recordings.c
index 5b8043251333efe8c790413321ec7b997c4edc17..e09ccbdb3d74908ca351310e266cb29855579112 100644
--- a/res/res_stasis_http_recordings.c
+++ b/res/res_stasis_http_recordings.c
@@ -76,7 +76,7 @@ static void stasis_http_get_stored_recordings_cb(
default:
if (200 <= code && code <= 299) {
is_valid = ari_validate_list(response->message,
- ari_validate_stored_recording);
+ ari_validate_stored_recording_fn());
} else {
ast_log(LOG_ERROR, "Invalid error response %d for /recordings/stored\n", code);
is_valid = 0;
@@ -218,7 +218,7 @@ static void stasis_http_get_live_recordings_cb(
default:
if (200 <= code && code <= 299) {
is_valid = ari_validate_list(response->message,
- ari_validate_live_recording);
+ ari_validate_live_recording_fn());
} else {
ast_log(LOG_ERROR, "Invalid error response %d for /recordings/live\n", code);
is_valid = 0;
diff --git a/res/res_stasis_http_sounds.c b/res/res_stasis_http_sounds.c
index da0206223bb8fa07a1a63491cddfeebe7bb2f298..84fdeeebfd214fbd344a12026a4cce63099ce61b 100644
--- a/res/res_stasis_http_sounds.c
+++ b/res/res_stasis_http_sounds.c
@@ -87,7 +87,7 @@ static void stasis_http_get_sounds_cb(
default:
if (200 <= code && code <= 299) {
is_valid = ari_validate_list(response->message,
- ari_validate_sound);
+ ari_validate_sound_fn());
} else {
ast_log(LOG_ERROR, "Invalid error response %d for /sounds\n", code);
is_valid = 0;
diff --git a/res/stasis_http/ari_model_validators.c b/res/stasis_http/ari_model_validators.c
index b41c15473a007872a3171260d50b085bb3a6b009..c721727903a432cf680006cc5d20f8b28e9d86f9 100644
--- a/res/stasis_http/ari_model_validators.c
+++ b/res/stasis_http/ari_model_validators.c
@@ -52,6 +52,11 @@ int ari_validate_asterisk_info(struct ast_json *json)
return res;
}
+ari_validator ari_validate_asterisk_info_fn(void)
+{
+ return ari_validate_asterisk_info;
+}
+
int ari_validate_endpoint(struct ast_json *json)
{
int res = 1;
@@ -127,6 +132,11 @@ int ari_validate_endpoint(struct ast_json *json)
return res;
}
+ari_validator ari_validate_endpoint_fn(void)
+{
+ return ari_validate_endpoint;
+}
+
int ari_validate_caller_id(struct ast_json *json)
{
int res = 1;
@@ -176,6 +186,11 @@ int ari_validate_caller_id(struct ast_json *json)
return res;
}
+ari_validator ari_validate_caller_id_fn(void)
+{
+ return ari_validate_caller_id;
+}
+
int ari_validate_channel(struct ast_json *json)
{
int res = 1;
@@ -321,6 +336,11 @@ int ari_validate_channel(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_fn(void)
+{
+ return ari_validate_channel;
+}
+
int ari_validate_dialed(struct ast_json *json)
{
int res = 1;
@@ -338,6 +358,11 @@ int ari_validate_dialed(struct ast_json *json)
return res;
}
+ari_validator ari_validate_dialed_fn(void)
+{
+ return ari_validate_dialed;
+}
+
int ari_validate_dialplan_cep(struct ast_json *json)
{
int res = 1;
@@ -403,6 +428,11 @@ int ari_validate_dialplan_cep(struct ast_json *json)
return res;
}
+ari_validator ari_validate_dialplan_cep_fn(void)
+{
+ return ari_validate_dialplan_cep;
+}
+
int ari_validate_bridge(struct ast_json *json)
{
int res = 1;
@@ -501,6 +531,11 @@ int ari_validate_bridge(struct ast_json *json)
return res;
}
+ari_validator ari_validate_bridge_fn(void)
+{
+ return ari_validate_bridge;
+}
+
int ari_validate_live_recording(struct ast_json *json)
{
int res = 1;
@@ -534,6 +569,11 @@ int ari_validate_live_recording(struct ast_json *json)
return res;
}
+ari_validator ari_validate_live_recording_fn(void)
+{
+ return ari_validate_live_recording;
+}
+
int ari_validate_stored_recording(struct ast_json *json)
{
int res = 1;
@@ -602,6 +642,11 @@ int ari_validate_stored_recording(struct ast_json *json)
return res;
}
+ari_validator ari_validate_stored_recording_fn(void)
+{
+ return ari_validate_stored_recording;
+}
+
int ari_validate_format_lang_pair(struct ast_json *json)
{
int res = 1;
@@ -651,6 +696,11 @@ int ari_validate_format_lang_pair(struct ast_json *json)
return res;
}
+ari_validator ari_validate_format_lang_pair_fn(void)
+{
+ return ari_validate_format_lang_pair;
+}
+
int ari_validate_sound(struct ast_json *json)
{
int res = 1;
@@ -710,6 +760,11 @@ int ari_validate_sound(struct ast_json *json)
return res;
}
+ari_validator ari_validate_sound_fn(void)
+{
+ return ari_validate_sound;
+}
+
int ari_validate_playback(struct ast_json *json)
{
int res = 1;
@@ -800,6 +855,11 @@ int ari_validate_playback(struct ast_json *json)
return res;
}
+ari_validator ari_validate_playback_fn(void)
+{
+ return ari_validate_playback;
+}
+
int ari_validate_application_replaced(struct ast_json *json)
{
int res = 1;
@@ -858,6 +918,11 @@ int ari_validate_application_replaced(struct ast_json *json)
return res;
}
+ari_validator ari_validate_application_replaced_fn(void)
+{
+ return ari_validate_application_replaced;
+}
+
int ari_validate_bridge_created(struct ast_json *json)
{
int res = 1;
@@ -932,6 +997,11 @@ int ari_validate_bridge_created(struct ast_json *json)
return res;
}
+ari_validator ari_validate_bridge_created_fn(void)
+{
+ return ari_validate_bridge_created;
+}
+
int ari_validate_bridge_destroyed(struct ast_json *json)
{
int res = 1;
@@ -1006,6 +1076,11 @@ int ari_validate_bridge_destroyed(struct ast_json *json)
return res;
}
+ari_validator ari_validate_bridge_destroyed_fn(void)
+{
+ return ari_validate_bridge_destroyed;
+}
+
int ari_validate_bridge_merged(struct ast_json *json)
{
int res = 1;
@@ -1096,6 +1171,11 @@ int ari_validate_bridge_merged(struct ast_json *json)
return res;
}
+ari_validator ari_validate_bridge_merged_fn(void)
+{
+ return ari_validate_bridge_merged;
+}
+
int ari_validate_channel_caller_id(struct ast_json *json)
{
int res = 1;
@@ -1202,6 +1282,11 @@ int ari_validate_channel_caller_id(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_caller_id_fn(void)
+{
+ return ari_validate_channel_caller_id;
+}
+
int ari_validate_channel_created(struct ast_json *json)
{
int res = 1;
@@ -1276,6 +1361,11 @@ int ari_validate_channel_created(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_created_fn(void)
+{
+ return ari_validate_channel_created;
+}
+
int ari_validate_channel_destroyed(struct ast_json *json)
{
int res = 1;
@@ -1382,6 +1472,11 @@ int ari_validate_channel_destroyed(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_destroyed_fn(void)
+{
+ return ari_validate_channel_destroyed;
+}
+
int ari_validate_channel_dialplan(struct ast_json *json)
{
int res = 1;
@@ -1488,6 +1583,11 @@ int ari_validate_channel_dialplan(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_dialplan_fn(void)
+{
+ return ari_validate_channel_dialplan;
+}
+
int ari_validate_channel_dtmf_received(struct ast_json *json)
{
int res = 1;
@@ -1594,6 +1694,11 @@ int ari_validate_channel_dtmf_received(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_dtmf_received_fn(void)
+{
+ return ari_validate_channel_dtmf_received;
+}
+
int ari_validate_channel_entered_bridge(struct ast_json *json)
{
int res = 1;
@@ -1677,6 +1782,11 @@ int ari_validate_channel_entered_bridge(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_entered_bridge_fn(void)
+{
+ return ari_validate_channel_entered_bridge;
+}
+
int ari_validate_channel_hangup_request(struct ast_json *json)
{
int res = 1;
@@ -1769,6 +1879,11 @@ int ari_validate_channel_hangup_request(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_hangup_request_fn(void)
+{
+ return ari_validate_channel_hangup_request;
+}
+
int ari_validate_channel_left_bridge(struct ast_json *json)
{
int res = 1;
@@ -1859,6 +1974,11 @@ int ari_validate_channel_left_bridge(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_left_bridge_fn(void)
+{
+ return ari_validate_channel_left_bridge;
+}
+
int ari_validate_channel_state_change(struct ast_json *json)
{
int res = 1;
@@ -1933,6 +2053,11 @@ int ari_validate_channel_state_change(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_state_change_fn(void)
+{
+ return ari_validate_channel_state_change;
+}
+
int ari_validate_channel_userevent(struct ast_json *json)
{
int res = 1;
@@ -2023,6 +2148,11 @@ int ari_validate_channel_userevent(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_userevent_fn(void)
+{
+ return ari_validate_channel_userevent;
+}
+
int ari_validate_channel_varset(struct ast_json *json)
{
int res = 1;
@@ -2122,6 +2252,11 @@ int ari_validate_channel_varset(struct ast_json *json)
return res;
}
+ari_validator ari_validate_channel_varset_fn(void)
+{
+ return ari_validate_channel_varset;
+}
+
int ari_validate_event(struct ast_json *json)
{
int res = 1;
@@ -2253,6 +2388,11 @@ int ari_validate_event(struct ast_json *json)
return res;
}
+ari_validator ari_validate_event_fn(void)
+{
+ return ari_validate_event;
+}
+
int ari_validate_playback_finished(struct ast_json *json)
{
int res = 1;
@@ -2327,6 +2467,11 @@ int ari_validate_playback_finished(struct ast_json *json)
return res;
}
+ari_validator ari_validate_playback_finished_fn(void)
+{
+ return ari_validate_playback_finished;
+}
+
int ari_validate_playback_started(struct ast_json *json)
{
int res = 1;
@@ -2401,6 +2546,11 @@ int ari_validate_playback_started(struct ast_json *json)
return res;
}
+ari_validator ari_validate_playback_started_fn(void)
+{
+ return ari_validate_playback_started;
+}
+
int ari_validate_stasis_end(struct ast_json *json)
{
int res = 1;
@@ -2475,6 +2625,11 @@ int ari_validate_stasis_end(struct ast_json *json)
return res;
}
+ari_validator ari_validate_stasis_end_fn(void)
+{
+ return ari_validate_stasis_end;
+}
+
int ari_validate_stasis_start(struct ast_json *json)
{
int res = 1;
@@ -2565,3 +2720,8 @@ int ari_validate_stasis_start(struct ast_json *json)
return res;
}
+
+ari_validator ari_validate_stasis_start_fn(void)
+{
+ return ari_validate_stasis_start;
+}
diff --git a/res/stasis_http/ari_model_validators.h b/res/stasis_http/ari_model_validators.h
index c4d0f27c28aef2073cd4359cad4aa5ea7f9275e1..5375796d453d9efa9b99b5804954c101f71a8ca1 100644
--- a/res/stasis_http/ari_model_validators.h
+++ b/res/stasis_http/ari_model_validators.h
@@ -17,6 +17,17 @@
/*! \file
*
* \brief Generated file - Build validators for ARI model objects.
+ *
+ * In addition to the normal validation functions one would normally expect,
+ * each validator has a ari_validate_{id}_fn() companion function that returns
+ * the validator's function pointer.
+ *
+ * The reason for this seamingly useless indirection is the way function
+ * pointers interfere with module loading. Asterisk attempts to dlopen() each
+ * module using \c RTLD_LAZY in order to read some metadata from the module.
+ * Unfortunately, if you take the address of a function, the function has to be
+ * resolvable at load time, even if \c RTLD_LAZY is specified. By moving the
+ * function-address-taking into this module, we can once again be lazy.
*/
/*
@@ -127,6 +138,11 @@ int ari_validate_list(struct ast_json *json, int (*fn)(struct ast_json *));
/*! @} */
+/*!
+ * \brief Function type for validator functions. Allows for
+ */
+typedef int (*ari_validator)(struct ast_json *json);
+
/*!
* \brief Validator for AsteriskInfo.
*
@@ -138,6 +154,13 @@ int ari_validate_list(struct ast_json *json, int (*fn)(struct ast_json *));
*/
int ari_validate_asterisk_info(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_asterisk_info().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_asterisk_info_fn(void);
+
/*!
* \brief Validator for Endpoint.
*
@@ -151,6 +174,13 @@ int ari_validate_asterisk_info(struct ast_json *json);
*/
int ari_validate_endpoint(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_endpoint().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_endpoint_fn(void);
+
/*!
* \brief Validator for CallerID.
*
@@ -162,6 +192,13 @@ int ari_validate_endpoint(struct ast_json *json);
*/
int ari_validate_caller_id(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_caller_id().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_caller_id_fn(void);
+
/*!
* \brief Validator for Channel.
*
@@ -173,6 +210,13 @@ int ari_validate_caller_id(struct ast_json *json);
*/
int ari_validate_channel(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_fn(void);
+
/*!
* \brief Validator for Dialed.
*
@@ -184,6 +228,13 @@ int ari_validate_channel(struct ast_json *json);
*/
int ari_validate_dialed(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_dialed().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_dialed_fn(void);
+
/*!
* \brief Validator for DialplanCEP.
*
@@ -195,6 +246,13 @@ int ari_validate_dialed(struct ast_json *json);
*/
int ari_validate_dialplan_cep(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_dialplan_cep().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_dialplan_cep_fn(void);
+
/*!
* \brief Validator for Bridge.
*
@@ -208,6 +266,13 @@ int ari_validate_dialplan_cep(struct ast_json *json);
*/
int ari_validate_bridge(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_bridge().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_bridge_fn(void);
+
/*!
* \brief Validator for LiveRecording.
*
@@ -219,6 +284,13 @@ int ari_validate_bridge(struct ast_json *json);
*/
int ari_validate_live_recording(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_live_recording().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_live_recording_fn(void);
+
/*!
* \brief Validator for StoredRecording.
*
@@ -230,6 +302,13 @@ int ari_validate_live_recording(struct ast_json *json);
*/
int ari_validate_stored_recording(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_stored_recording().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_stored_recording_fn(void);
+
/*!
* \brief Validator for FormatLangPair.
*
@@ -241,6 +320,13 @@ int ari_validate_stored_recording(struct ast_json *json);
*/
int ari_validate_format_lang_pair(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_format_lang_pair().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_format_lang_pair_fn(void);
+
/*!
* \brief Validator for Sound.
*
@@ -252,6 +338,13 @@ int ari_validate_format_lang_pair(struct ast_json *json);
*/
int ari_validate_sound(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_sound().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_sound_fn(void);
+
/*!
* \brief Validator for Playback.
*
@@ -263,6 +356,13 @@ int ari_validate_sound(struct ast_json *json);
*/
int ari_validate_playback(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_playback().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_playback_fn(void);
+
/*!
* \brief Validator for ApplicationReplaced.
*
@@ -276,6 +376,13 @@ int ari_validate_playback(struct ast_json *json);
*/
int ari_validate_application_replaced(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_application_replaced().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_application_replaced_fn(void);
+
/*!
* \brief Validator for BridgeCreated.
*
@@ -287,6 +394,13 @@ int ari_validate_application_replaced(struct ast_json *json);
*/
int ari_validate_bridge_created(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_bridge_created().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_bridge_created_fn(void);
+
/*!
* \brief Validator for BridgeDestroyed.
*
@@ -298,6 +412,13 @@ int ari_validate_bridge_created(struct ast_json *json);
*/
int ari_validate_bridge_destroyed(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_bridge_destroyed().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_bridge_destroyed_fn(void);
+
/*!
* \brief Validator for BridgeMerged.
*
@@ -309,6 +430,13 @@ int ari_validate_bridge_destroyed(struct ast_json *json);
*/
int ari_validate_bridge_merged(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_bridge_merged().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_bridge_merged_fn(void);
+
/*!
* \brief Validator for ChannelCallerId.
*
@@ -320,6 +448,13 @@ int ari_validate_bridge_merged(struct ast_json *json);
*/
int ari_validate_channel_caller_id(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_caller_id().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_caller_id_fn(void);
+
/*!
* \brief Validator for ChannelCreated.
*
@@ -331,6 +466,13 @@ int ari_validate_channel_caller_id(struct ast_json *json);
*/
int ari_validate_channel_created(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_created().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_created_fn(void);
+
/*!
* \brief Validator for ChannelDestroyed.
*
@@ -342,6 +484,13 @@ int ari_validate_channel_created(struct ast_json *json);
*/
int ari_validate_channel_destroyed(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_destroyed().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_destroyed_fn(void);
+
/*!
* \brief Validator for ChannelDialplan.
*
@@ -353,6 +502,13 @@ int ari_validate_channel_destroyed(struct ast_json *json);
*/
int ari_validate_channel_dialplan(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_dialplan().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_dialplan_fn(void);
+
/*!
* \brief Validator for ChannelDtmfReceived.
*
@@ -366,6 +522,13 @@ int ari_validate_channel_dialplan(struct ast_json *json);
*/
int ari_validate_channel_dtmf_received(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_dtmf_received().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_dtmf_received_fn(void);
+
/*!
* \brief Validator for ChannelEnteredBridge.
*
@@ -377,6 +540,13 @@ int ari_validate_channel_dtmf_received(struct ast_json *json);
*/
int ari_validate_channel_entered_bridge(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_entered_bridge().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_entered_bridge_fn(void);
+
/*!
* \brief Validator for ChannelHangupRequest.
*
@@ -388,6 +558,13 @@ int ari_validate_channel_entered_bridge(struct ast_json *json);
*/
int ari_validate_channel_hangup_request(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_hangup_request().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_hangup_request_fn(void);
+
/*!
* \brief Validator for ChannelLeftBridge.
*
@@ -399,6 +576,13 @@ int ari_validate_channel_hangup_request(struct ast_json *json);
*/
int ari_validate_channel_left_bridge(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_left_bridge().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_left_bridge_fn(void);
+
/*!
* \brief Validator for ChannelStateChange.
*
@@ -410,6 +594,13 @@ int ari_validate_channel_left_bridge(struct ast_json *json);
*/
int ari_validate_channel_state_change(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_state_change().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_state_change_fn(void);
+
/*!
* \brief Validator for ChannelUserevent.
*
@@ -421,6 +612,13 @@ int ari_validate_channel_state_change(struct ast_json *json);
*/
int ari_validate_channel_userevent(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_userevent().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_userevent_fn(void);
+
/*!
* \brief Validator for ChannelVarset.
*
@@ -432,6 +630,13 @@ int ari_validate_channel_userevent(struct ast_json *json);
*/
int ari_validate_channel_varset(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_channel_varset().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_channel_varset_fn(void);
+
/*!
* \brief Validator for Event.
*
@@ -443,6 +648,13 @@ int ari_validate_channel_varset(struct ast_json *json);
*/
int ari_validate_event(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_event().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_event_fn(void);
+
/*!
* \brief Validator for PlaybackFinished.
*
@@ -454,6 +666,13 @@ int ari_validate_event(struct ast_json *json);
*/
int ari_validate_playback_finished(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_playback_finished().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_playback_finished_fn(void);
+
/*!
* \brief Validator for PlaybackStarted.
*
@@ -465,6 +684,13 @@ int ari_validate_playback_finished(struct ast_json *json);
*/
int ari_validate_playback_started(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_playback_started().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_playback_started_fn(void);
+
/*!
* \brief Validator for StasisEnd.
*
@@ -476,6 +702,13 @@ int ari_validate_playback_started(struct ast_json *json);
*/
int ari_validate_stasis_end(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_stasis_end().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_stasis_end_fn(void);
+
/*!
* \brief Validator for StasisStart.
*
@@ -487,6 +720,13 @@ int ari_validate_stasis_end(struct ast_json *json);
*/
int ari_validate_stasis_start(struct ast_json *json);
+/*!
+ * \brief Function pointer to ari_validate_stasis_start().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_stasis_start_fn(void);
+
/*
* JSON models
*
diff --git a/rest-api-templates/ari_model_validators.c.mustache b/rest-api-templates/ari_model_validators.c.mustache
index 0e87f8e248df188d53edff0fc5e8af256946611a..04a6d1111c32988dec0753967b6cb909a02017aa 100644
--- a/rest-api-templates/ari_model_validators.c.mustache
+++ b/rest-api-templates/ari_model_validators.c.mustache
@@ -112,6 +112,11 @@ int ari_validate_{{c_id}}(struct ast_json *json)
{{/properties}}
return res;
}
+
+ari_validator ari_validate_{{c_id}}_fn(void)
+{
+ return ari_validate_{{c_id}};
+}
{{/models}}
{{/api_declaration}}
{{/apis}}
diff --git a/rest-api-templates/ari_model_validators.h.mustache b/rest-api-templates/ari_model_validators.h.mustache
index 65efbbd85a3f3548c898d4316b95a5f09e954a08..b5b90acddc2a2fd19c531128f9d1b11d20fccf64 100644
--- a/rest-api-templates/ari_model_validators.h.mustache
+++ b/rest-api-templates/ari_model_validators.h.mustache
@@ -17,6 +17,17 @@
/*! \file
*
* \brief Generated file - Build validators for ARI model objects.
+ *
+ * In addition to the normal validation functions one would normally expect,
+ * each validator has a ari_validate_{id}_fn() companion function that returns
+ * the validator's function pointer.
+ *
+ * The reason for this seamingly useless indirection is the way function
+ * pointers interfere with module loading. Asterisk attempts to dlopen() each
+ * module using \c RTLD_LAZY in order to read some metadata from the module.
+ * Unfortunately, if you take the address of a function, the function has to be
+ * resolvable at load time, even if \c RTLD_LAZY is specified. By moving the
+ * function-address-taking into this module, we can once again be lazy.
*/
/*
@@ -124,6 +135,11 @@ int ari_validate_date(struct ast_json *json);
int ari_validate_list(struct ast_json *json, int (*fn)(struct ast_json *));
/*! @} */
+
+/*!
+ * \brief Function type for validator functions. Allows for
+ */
+typedef int (*ari_validator)(struct ast_json *json);
{{#apis}}
{{#api_declaration}}
{{#models}}
@@ -138,6 +154,13 @@ int ari_validate_list(struct ast_json *json, int (*fn)(struct ast_json *));
* \returns False (zero) if invalid.
*/
int ari_validate_{{c_id}}(struct ast_json *json);
+
+/*!
+ * \brief Function pointer to ari_validate_{{c_id}}().
+ *
+ * See \ref ari_model_validators.h for more details.
+ */
+ari_validator ari_validate_{{c_id}}_fn(void);
{{/models}}
{{/api_declaration}}
{{/apis}}
diff --git a/rest-api-templates/res_stasis_http_resource.c.mustache b/rest-api-templates/res_stasis_http_resource.c.mustache
index 0f0535bcf0d3d6edf92e8da7ebeffbf950a647ad..d358732589805804bc4a78ac977c1a871f4fa813 100644
--- a/rest-api-templates/res_stasis_http_resource.c.mustache
+++ b/rest-api-templates/res_stasis_http_resource.c.mustache
@@ -89,7 +89,7 @@ static void stasis_http_{{c_nickname}}_cb(
{{#response_class}}
{{#is_list}}
is_valid = ari_validate_list(response->message,
- ari_validate_{{c_singular_name}});
+ ari_validate_{{c_singular_name}}_fn());
{{/is_list}}
{{^is_list}}
is_valid = ari_validate_{{c_name}}(
@@ -125,7 +125,7 @@ static void stasis_http_{{c_nickname}}_ws_cb(struct ast_websocket *ws_session,
{{> param_parsing}}
#if defined(AST_DEVMODE)
session = ari_websocket_session_create(ws_session,
- ari_validate_{{response_class.c_name}});
+ ari_validate_{{response_class.c_name}}_fn());
#else
session = ari_websocket_session_create(ws_session, NULL);
#endif