kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-5555 improvement --resolve

This commit is contained in:
Brian West 2013-07-12 11:50:03 -05:00
parent 655325ab05
commit a8b4ccf7fb
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/include/switch_utils.h
View File

@ -598,31 +598,39 @@ switch_mutex_unlock(obj->flag_mutex);
#define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst)) #define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst))
SWITCH_DECLARE(char *) switch_url_encode(const char *url, char *buf, size_t len);
SWITCH_DECLARE(char *) switch_url_decode(char *s);
static inline char *switch_sanitize_number(char *number) static inline char *switch_sanitize_number(char *number)
{ {
char *p = number, *q; char *p, *q;
char warp[] = "/:"; char warp[] = "/:";
int i; int i;
char *val;
switch_assert(number); switch_assert(number);
if (!(strchr(p, '/') || strchr(p, ':') || strchr(p, '@') || strchr(p, '%'))) { p = strdup(number);
val = p;
switch_url_decode(val);
if (!(strchr(val, '/') || strchr(val, ':') || strchr(val, '@') || strchr(val, '%'))) {
return number; return number;
} }
while ((q = strrchr(p, '@'))) while ((q = strrchr(val, '@')))
*q = '\0'; *q = '\0';
while ((q = strrchr(p, '%'))) while ((q = strrchr(val, '%')))
*q = '\0'; *q = '\0';
for (i = 0; i < (int) strlen(warp); i++) { for (i = 0; i < (int) strlen(warp); i++) {
while (p && (q = strchr(p, warp[i]))) while (val && (q = strchr(val, warp[i])))
p = q + 1; val = q + 1;
} }
free(p);
return p; return val;
} }
static inline switch_bool_t switch_string_var_check(char *s, switch_bool_t disable) static inline switch_bool_t switch_string_var_check(char *s, switch_bool_t disable)
@ -930,8 +938,6 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, swit
#define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) #define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK)
SWITCH_DECLARE(char *) switch_url_encode(const char *url, char *buf, size_t len);
SWITCH_DECLARE(char *) switch_url_decode(char *s);
SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to, SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
const char *from, const char *from,
const char *headers, const char *headers,