summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Ford <bford@digium.com>2017-11-01 11:12:45 -0500
committerBenjamin Keith Ford <bford@digium.com>2017-11-02 11:49:42 -0500
commit9c7c441a0fa70b4a5cbec4588f8a658c717849e5 (patch)
tree7ce457c3998370f05462021358774580cf4be28f
parent4f0547475376bed4ce45cda888ede3c32d4315ca (diff)
res_pjsip: Add to list of valid characters for from_user.
Fixes a regression where some characters were unable to be used in the from_user field of an endpoint. Additionally, the backtick was removed from the list of valid characters, since it is not valid, and it was replaced with a single quote, which is a valid character. ASTERISK-27387 Change-Id: Id80c10a644508365c87b3182e99ea49da11b0281
-rw-r--r--res/res_pjsip/pjsip_configuration.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index a39102305..c24156570 100644
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -1134,11 +1134,11 @@ static int from_user_handler(const struct aco_option *opt,
{
struct ast_sip_endpoint *endpoint = obj;
/* Valid non-alphanumeric characters for URI */
- char *valid_uri_marks = "-_.!~*`()";
+ char *valid_uri_marks = "-._~%!$&'()*+,;=:";
const char *val;
for (val = var->value; *val; val++) {
- if (!strchr(valid_uri_marks, *val) && !isdigit(*val) && !isalpha(*val)) {
+ if (!isalpha(*val) && !isdigit(*val) && !strchr(valid_uri_marks, *val)) {
ast_log(LOG_ERROR, "Error configuring endpoint '%s' - '%s' field "
"contains invalid character '%c'\n",
ast_sorcery_object_get_id(endpoint), var->name, *val);