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

Refactor and fix edge cases in switch_split_user_domain 

We were incorrectly parsing usernames and domains starting with "sip"
if there was no sip: or sips: scheme in the string.

We were also incorrectly parsing usernames containing a colon even if
a scheme was given.

This also refactors the function for hopefully greater clarity.
This commit is contained in:
Travis Cross 2014-03-02 09:13:05 +00:00
parent b0d7551c80
commit 5aab272bb3
1 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/switch_utils.c
View File

@ -3115,55 +3115,24 @@ SWITCH_DECLARE(int) switch_tod_cmp(const char *exp, int val)
SWITCH_DECLARE(int) switch_split_user_domain(char *in, char **user, char **domain)
{
char *p = NULL, *h = NULL, *u;
char *p = NULL, *h = NULL, *u = NULL;
if (!in) {
return 0;
}
if (!in) return 0;
if (!strncasecmp(in, "sip", 3)) {
in += 3;
if (*in == 's') in++;
if (*in == ':') in++;
}
/* Remove URL scheme */
if (!strncasecmp(in, "sip:", 4)) in += 4;
if (!strncasecmp(in, "sips:", 5)) in += 5;
u = in;
/* First isolate the host part from the user part */
if ((h = strchr(u, '@'))) {
*h++ = '\0';
} else {
u = NULL;
h = in;
}
/* Clean out the user part of its protocol prefix (if any) */
if (u && (p = strchr(u, ':'))) {
*p++ = '\0';
u = p;
}
/* Isolate the host part from the user part */
if ((h = in, p = strchr(h, '@'))) *p = '\0', u = in, h = p+1;
/* Clean out the host part of any suffix */
if (h) {
if ((p = strchr(h, ':'))) {
*p = '\0';
}
if ((p = strchr(h, ';'))) {
*p = '\0';
}
if ((p = strchr(h, ' '))) {
*p = '\0';
}
}
if (user) {
*user = u;
}
if (domain) {
*domain = h;
}
if ((p = strchr(h, ':'))) *p = '\0';
if ((p = strchr(h, ';'))) *p = '\0';
if ((p = strchr(h, ' '))) *p = '\0';
if (user) *user = u;
if (domain) *domain = h;
return 1;
}