kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 14:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjsip: Add PJSIP_PARSE_URI_FROM dialplan function.

Browse Source 
Various SIP headers permit a URI to be prefaced with a `display-name`
production that can include characters (like commas and parentheses)
that are problematic for Asterisk's dialplan parser and, specifically
in the case of this patch, the PJSIP_PARSE_URI function.

This patch introduces a new function - `PJSIP_PARSE_URI_FROM` - that
behaves identically to `PJSIP_PARSE_URI` except that the first
argument is now a variable name and not a literal URI.

Fixes #756
This commit is contained in:
Sean Bright
2024-06-02 12:51:07 -04:00
parent 7920e75da5
commit 78d63bc11c
3 changed files with 96 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
channels/pjsip/dialplan_functions.c
View File

@@ -724,6 +724,7 @@ static int parse_uri_cb(void *data)
int pjsip_acf_parse_uri_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t buflen)
{
struct parse_uri_args func_args = { 0, };
int reading_uri_from_var;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(uri_str);
@@ -732,8 +733,29 @@ int pjsip_acf_parse_uri_read(struct ast_channel *chan, const char *cmd, char *da
AST_STANDARD_APP_ARGS(args, data);
reading_uri_from_var = !strcasecmp(cmd, "PJSIP_PARSE_URI_FROM");
if (reading_uri_from_var) {
const char *var;
if (ast_strlen_zero(args.uri_str)) {
ast_log(LOG_WARNING, "The name of a variable containing a URI must be specified when using the '%s' dialplan function\n", cmd);
return -1;
}
ast_channel_lock(chan);
if ((var = pbx_builtin_getvar_helper(chan, args.uri_str))) {
args.uri_str = ast_strdupa(var);
}
ast_channel_unlock(chan);
}
if (ast_strlen_zero(args.uri_str)) {
ast_log(LOG_WARNING, "An URI must be specified when using the '%s' dialplan function\n", cmd);
if (reading_uri_from_var) {
ast_log(LOG_WARNING, "The variable provided to the '%s' dialplan function must contain a URI\n", cmd);
} else {
ast_log(LOG_WARNING, "A URI must be specified when using the '%s' dialplan function\n", cmd);
}
return -1;
}