From f8e0f9be228f0b38cbd5831ba7263dc89e8d34a9 Mon Sep 17 00:00:00 2001
From: Ben Ford <bford@digium.com>
Date: Wed, 1 Nov 2017 11:12:45 -0500
Subject: [PATCH] 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
---
res/res_pjsip/pjsip_configuration.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index 6db5b38985..269e03e3d9 100644
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -1140,11 +1140,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);
--
GitLab