From 403c794684a5a8afce2b490e5a40214f792794d4 Mon Sep 17 00:00:00 2001 From: Alexei Gradinari Date: Wed, 10 Aug 2016 15:41:38 -0400 Subject: core: Entity ID is not set or invalid The Exchanging Device and Mailbox States could not working if the Entity ID (EID) is not set manually and can't be obtained from ethernet interface. This patch replaces debug message to warning and addes missing description about option 'entityid' to asterisk.conf.sample. With this patch the asterisk also: (1) decline loading the modules which won't work without EID: res_corosync and res_pjsip_publish_asterisk. (2) warn if EID is empty on loading next modules: pbx_dundi, res_xmpp Starting with v197 systemd/udev will automatically assign "predictable" names for all local Ethernet interfaces. This patch also addes some new ethernet prefixes "eno" and "ens". ASTERISK-26164 #close Change-Id: I72d712f1ad5b6f64571bb179c5cb12461e7c58c6 --- res/res_corosync.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'res/res_corosync.c') 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: -- cgit v1.2.3