kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 01:49:05 +00:00
Code Issues Projects Releases Wiki Activity

FS-9809: [mod_sofia] url encode caller id number before sticking it in the from header in case we have non url safe chars in the cid number in the caller profile

Browse Source
This commit is contained in:
Mike Jerris
2017-01-06 16:16:16 -06:00
parent c0423c5877
commit ad183fdea4
3 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/switch_utils.c
View File

@@ -3228,6 +3228,58 @@ SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms)
return nsds;
}
SWITCH_DECLARE(char *) switch_core_session_url_encode(switch_core_session_t *session, const char *url)
{
return switch_core_url_encode_opt(switch_core_session_get_pool(session), url, SWITCH_FALSE);
}
SWITCH_DECLARE(char *) switch_core_session_url_encode_opt(switch_core_session_t *session, const char *url, switch_bool_t double_encode)
{
return switch_core_url_encode_opt(switch_core_session_get_pool(session), url, double_encode);
}
SWITCH_DECLARE(char *) switch_core_url_encode(switch_memory_pool_t *pool, const char *url)
{
return switch_core_url_encode_opt(pool, url, SWITCH_FALSE);
}
SWITCH_DECLARE(char *) switch_core_url_encode_opt(switch_memory_pool_t *pool, const char *url, switch_bool_t double_encode)
{
const char hex[] = "0123456789ABCDEF";
switch_size_t len = 0;
switch_size_t slen = 0;
const char *p, *e = end_of_p(url);
if (!url) return NULL;
if (!pool) return NULL;
for (p = url; *p; p++) {
int ok = 0;
len++;
slen++;
if (!double_encode && *p == '%' && e-p > 1) {
if (strchr(hex, *(p+1)) && strchr(hex, *(p+2))) {
ok = 1;
}
}
if (!ok && (*p < ' ' || *p > '~' || strchr(SWITCH_URL_UNSAFE, *p))) {
len += 2;
}
}
slen++;
len++; /* NULL Terminatior */
if (slen == len) {
return switch_core_strdup(pool, url);
} else {
return switch_url_encode_opt(url, switch_core_alloc(pool, sizeof(char) * len), len, double_encode);
}
}
SWITCH_DECLARE(char *) switch_url_encode_opt(const char *url, char *buf, size_t len, switch_bool_t double_encode)
{
const char *p, *e = end_of_p(url);