[Asterisk-code-review] res ari: Add "module loaded" check to ari stubs (asterisk[master])
George Joseph
asteriskteam at digium.com
Tue Jun 13 11:40:49 CDT 2017
George Joseph has uploaded this change for review. ( https://gerrit.asterisk.org/5811
Change subject: res_ari: Add "module loaded" check to ari stubs
......................................................................
res_ari: Add "module loaded" check to ari stubs
The recent change to make the use of LOAD_DECLINE more consistent
caused res_ari to unload itself before declining if the ari.conf
file wasn't found. The ari stubs though still tried to use the
configuration resulting in segfaults.
This patch creates a new CHECK_ARI_MODULE_LOADED macro which tests
to see if res_ari is actually loaded and causes the stubs to also
decline if it isn't. The macro was then added to the mustache
template's "load_module" function.
ASTERISK-27026 #close
Reported-by: Ronald Raikes
Change-Id: I263d56efa628ee3c411bdcd16d49af6260c6c91d
---
M include/asterisk/ari.h
M res/res_ari_applications.c
M res/res_ari_asterisk.c
M res/res_ari_bridges.c
M res/res_ari_channels.c
M res/res_ari_device_states.c
M res/res_ari_endpoints.c
M res/res_ari_events.c
M res/res_ari_mailboxes.c
M res/res_ari_playbacks.c
M res/res_ari_recordings.c
M res/res_ari_sounds.c
M rest-api-templates/res_ari_resource.c.mustache
13 files changed, 46 insertions(+), 0 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/11/5811/1
diff --git a/include/asterisk/ari.h b/include/asterisk/ari.h
index 865b4b0..f83d596 100644
--- a/include/asterisk/ari.h
+++ b/include/asterisk/ari.h
@@ -268,4 +268,14 @@
*/
void ast_ari_response_alloc_failed(struct ast_ari_response *response);
+/*! \brief Determines whether the res_ari module is loaded */
+#define CHECK_ARI_MODULE_LOADED() \
+ do { \
+ if (!ast_module_check("res_ari.so") \
+ || !ast_ari_oom_json()) { \
+ return AST_MODULE_LOAD_DECLINE; \
+ } \
+ } while(0)
+
+
#endif /* _ASTERISK_ARI_H */
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 21d9f56..eb709af 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -500,6 +500,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&applications);
if (res) {
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index 89517cc..d4c9ccd 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -1221,6 +1221,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&asterisk);
if (res) {
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index 5402c2b..71166b4 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1547,6 +1547,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&bridges);
if (res) {
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index 9d218e2..f7eb2dc 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2851,6 +2851,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&channels);
if (res) {
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index d6de5df..9a38da9 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -331,6 +331,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&deviceStates);
if (res) {
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index d96de08..20d3406 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -455,6 +455,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&endpoints);
if (res) {
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 3f5b89a..634d891 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -452,6 +452,9 @@
protocol->session_attempted = ast_ari_events_event_websocket_ws_attempted_cb;
protocol->session_established = ast_ari_events_event_websocket_ws_established_cb;
res |= ast_websocket_server_add_protocol2(events.ws_server, protocol);
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&events);
if (res) {
diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 12c33cd..52d57ff 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -337,6 +337,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&mailboxes);
if (res) {
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index e2c432d..f7a1080 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -289,6 +289,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&playbacks);
if (res) {
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index 57d80f2..97904c3 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -873,6 +873,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&recordings);
if (res) {
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index fded7fb..5fb3aa2 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -219,6 +219,9 @@
static int load_module(void)
{
int res = 0;
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&sounds);
if (res) {
diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache
index 3ccafcd..ff01bce 100644
--- a/rest-api-templates/res_ari_resource.c.mustache
+++ b/rest-api-templates/res_ari_resource.c.mustache
@@ -303,6 +303,9 @@
{{/is_websocket}}
{{/operations}}
{{/apis}}
+
+ CHECK_ARI_MODULE_LOADED();
+
stasis_app_ref();
res |= ast_ari_add_handler(&{{root_full_name}});
if (res) {
--
To view, visit https://gerrit.asterisk.org/5811
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I263d56efa628ee3c411bdcd16d49af6260c6c91d
Gerrit-Change-Number: 5811
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20170613/b1b504b7/attachment.html>
More information about the asterisk-code-review
mailing list