Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "rtp_engine: Ignore empty filenames in DTLS configuration."

Browse Source
changes/37/1837/1
Joshua Colp 10 years ago committed by Gerrit Code Review
parent d2c8614122 a2431f83ef
commit 0193d97c47
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
main/rtp_engine.c
Unescape View File

@ -2118,14 +2118,14 @@ int ast_rtp_dtls_cfg_parse(struct ast_rtp_dtls_cfg *dtls_cfg, const char *name,
} }
} else if (!strcasecmp(name, "dtlscertfile")) { } else if (!strcasecmp(name, "dtlscertfile")) {
ast_free(dtls_cfg->certfile); ast_free(dtls_cfg->certfile);
if (!ast_file_is_readable(value)) { if (!ast_strlen_zero(value) && !ast_file_is_readable(value)) {
ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value); ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value);
return -1; return -1;
} }
dtls_cfg->certfile = ast_strdup(value); dtls_cfg->certfile = ast_strdup(value);
} else if (!strcasecmp(name, "dtlsprivatekey")) { } else if (!strcasecmp(name, "dtlsprivatekey")) {
ast_free(dtls_cfg->pvtfile); ast_free(dtls_cfg->pvtfile);
if (!ast_file_is_readable(value)) { if (!ast_strlen_zero(value) && !ast_file_is_readable(value)) {
ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value); ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value);
return -1; return -1;
} }
@ -2135,14 +2135,14 @@ int ast_rtp_dtls_cfg_parse(struct ast_rtp_dtls_cfg *dtls_cfg, const char *name,
dtls_cfg->cipher = ast_strdup(value); dtls_cfg->cipher = ast_strdup(value);
} else if (!strcasecmp(name, "dtlscafile")) { } else if (!strcasecmp(name, "dtlscafile")) {
ast_free(dtls_cfg->cafile); ast_free(dtls_cfg->cafile);
if (!ast_file_is_readable(value)) { if (!ast_strlen_zero(value) && !ast_file_is_readable(value)) {
ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value); ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value);
return -1; return -1;
} }
dtls_cfg->cafile = ast_strdup(value); dtls_cfg->cafile = ast_strdup(value);
} else if (!strcasecmp(name, "dtlscapath") || !strcasecmp(name, "dtlscadir")) { } else if (!strcasecmp(name, "dtlscapath") || !strcasecmp(name, "dtlscadir")) {
ast_free(dtls_cfg->capath); ast_free(dtls_cfg->capath);
if (!ast_file_is_readable(value)) { if (!ast_strlen_zero(value) && !ast_file_is_readable(value)) {
ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value); ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value);
return -1; return -1;
} }

Write Preview
Loading…
Cancel
Save