summaryrefslogtreecommitdiff
path: root/main/asterisk.c
diff options
context:
space:
mode:
authorAlexei Gradinari <alex2grad@gmail.com>2016-08-10 15:41:38 -0400
committerAlexei Gradinari <alex2grad@gmail.com>2016-08-15 13:35:59 -0500
commite85adbd947fac6b5385f1b74eba506e53c78f483 (patch)
treece70611a949789c74be8f1ebfb9c8ae1870fb3d6 /main/asterisk.c
parent8b1e919ae46bdab02010a9d25c1c27670b03e87f (diff)
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
Diffstat (limited to 'main/asterisk.c')
-rw-r--r--main/asterisk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 50d8af24a..3c2ca259e 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3661,10 +3661,10 @@ static void ast_readconfig(void)
} else if (!strcasecmp(v->name, "entityid")) {
struct ast_eid tmp_eid;
if (!ast_str_to_eid(&tmp_eid, v->value)) {
- ast_verbose("Successfully set global EID to '%s'\n", v->value);
ast_eid_default = tmp_eid;
- } else
- ast_verbose("Invalid Entity ID '%s' provided\n", v->value);
+ } else {
+ ast_log(LOG_WARNING, "Invalid Entity ID '%s' provided\n", v->value);
+ }
} else if (!strcasecmp(v->name, "lightbackground")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_LIGHT_BACKGROUND);
} else if (!strcasecmp(v->name, "forceblackbackground")) {