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 /main | |
| parent | 6c4c31456fde265f874bbe9dfe28d7c011065e93 (diff) | |
| parent | 403c794684a5a8afce2b490e5a40214f792794d4 (diff) | |
Merge "core: Entity ID is not set or invalid" into 13
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 6 | ||||
| -rw-r--r-- | main/utils.c | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index d5ffacb19..b8eedfa38 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3752,10 +3752,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")) { diff --git a/main/utils.c b/main/utils.c index bd74ee24d..1a034c101 100644 --- a/main/utils.c +++ b/main/utils.c @@ -2493,7 +2493,7 @@ void ast_set_default_eid(struct ast_eid *eid) return; } for (x = 0; x < MAXIF; x++) { - static const char *prefixes[] = { "eth", "em" }; + static const char *prefixes[] = { "eth", "em", "eno", "ens" }; unsigned int i; for (i = 0; i < ARRAY_LEN(prefixes); i++) { @@ -2544,7 +2544,7 @@ void ast_set_default_eid(struct ast_eid *eid) } #endif #endif - ast_debug(1, "No ethernet interface found for seeding global EID. You will have to set it manually.\n"); + ast_log(LOG_WARNING, "No ethernet interface found for seeding global EID. You will have to set it manually.\n"); } int ast_str_to_eid(struct ast_eid *eid, const char *s) @@ -2569,6 +2569,14 @@ int ast_eid_cmp(const struct ast_eid *eid1, const struct ast_eid *eid2) return memcmp(eid1, eid2, sizeof(*eid1)); } +int ast_eid_is_empty(const struct ast_eid *eid) +{ + struct ast_eid empty_eid; + + memset(&empty_eid, 0, sizeof(empty_eid)); + return memcmp(eid, &empty_eid, sizeof(empty_eid)) ? 0 : 1; +} + int ast_file_is_readable(const char *filename) { #if defined(HAVE_EACCESS) || defined(HAVE_EUIDACCESS) |