diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-08-16 06:43:54 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-16 06:43:54 -0500 |
| commit | 050b90769a2a2d0293f7c31d1c53f6f4a73c448c (patch) | |
| tree | 18a923f7f05ee5c44461696167d306b13c77da95 /res | |
| parent | 6c4c31456fde265f874bbe9dfe28d7c011065e93 (diff) | |
| parent | 403c794684a5a8afce2b490e5a40214f792794d4 (diff) | |
Merge "core: Entity ID is not set or invalid" into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_corosync.c | 6 | ||||
| -rw-r--r-- | res/res_pjsip_publish_asterisk.c | 5 | ||||
| -rw-r--r-- | res/res_xmpp.c | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/res/res_corosync.c b/res/res_corosync.c index 9ffffaaca..6bbbc34b9 100644 --- a/res/res_corosync.c +++ b/res/res_corosync.c @@ -1103,6 +1103,11 @@ static int load_module(void) cs_error_t cs_err; struct cpg_name name; + if (ast_eid_is_empty(&ast_eid_default)) { + ast_log(LOG_ERROR, "Entity ID is not set.\n"); + return AST_MODULE_LOAD_DECLINE; + } + nodes = ao2_container_alloc(23, corosync_node_hash_fn, corosync_node_cmp_fn); if (!nodes) { goto failed; @@ -1162,6 +1167,7 @@ static int load_module(void) ast_cli_register_multiple(corosync_cli, ARRAY_LEN(corosync_cli)); + return AST_MODULE_LOAD_SUCCESS; failed: diff --git a/res/res_pjsip_publish_asterisk.c b/res/res_pjsip_publish_asterisk.c index 002d976d4..b32408aa3 100644 --- a/res/res_pjsip_publish_asterisk.c +++ b/res/res_pjsip_publish_asterisk.c @@ -858,6 +858,11 @@ static int load_module(void) { CHECK_PJSIP_PUBSUB_MODULE_LOADED(); + if (ast_eid_is_empty(&ast_eid_default)) { + ast_log(LOG_ERROR, "Entity ID is not set.\n"); + return AST_MODULE_LOAD_DECLINE; + } + ast_sorcery_apply_config(ast_sip_get_sorcery(), "asterisk-publication"); ast_sorcery_apply_default(ast_sip_get_sorcery(), "asterisk-publication", "config", "pjsip.conf,criteria=type=asterisk-publication"); diff --git a/res/res_xmpp.c b/res/res_xmpp.c index ed35cd169..d7f2b5478 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -4652,6 +4652,10 @@ static int load_module(void) ast_mutex_init(&messagelock); ast_cond_init(&message_received_condition, NULL); + if (ast_eid_is_empty(&ast_eid_default)) { + ast_log(LOG_WARNING, "Entity ID is not set. The distributing device state or MWI will not work.\n"); + } + return AST_MODULE_LOAD_SUCCESS; } |