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

FS-11987: [sofia-sip] Extract URI from info param of SIP Identity Header 

- allow for a spaces between "info=" and opening '<'
- extract URI from inside "<>" but allow empty - let the higher level app decide what to do about it
- replace strndup (does not exist on Windows) with memcpy
This commit is contained in:
Andrey Volk 2019-08-09 13:39:44 +04:00
parent c57d7704d1
commit 6fe1a87e3e
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Thu Aug 8 15:09:57 CDT 2019
Tue Aug 13 10:50:57 CDT 2019

28
libs/sofia-sip/libsofia-sip-ua/sip/sip_basic.c
View File

@ -2849,7 +2849,8 @@ SIP_HEADER_CLASS(identity, "Identity", "", id_common, single, identity);
issize_t sip_identity_d(su_home_t *home, sip_header_t *h, char *s, isize_t slen)
{
sip_identity_t *id = (sip_identity_t *)h;
char const *p = NULL, *pp = NULL, *ppp = NULL, *ib = NULL, *ie = NULL;
char const *p = NULL, *pp = NULL, *ppp = NULL, *ie = NULL;
char *result = NULL;
size_t len = 0;
id->id_value = strdup(s);
@ -2857,27 +2858,22 @@ issize_t sip_identity_d(su_home_t *home, sip_header_t *h, char *s, isize_t slen)
p = strstr(s, "info=");
if (p) {
ib = p + 5;
ie = strchr(p, ';');
pp = strchr(p, '<');
ppp = strchr(p, '>');
if (!ie) return 0;
// allow for a spaces between "info=" and opening '<'
// extract URI from inside "<>" but allow empty - let the higher level app decide what to do about it
if (ie && pp && ppp && (pp < ppp) && (ppp < ie)) {
if (pp && pp < ie) {
// info= with opening '<'
// must contain closing '>' before ';'
ppp = strchr(pp, '>');
if (!ppp || ppp > ie) {
return 0;
} else {
ib = pp + 1;
ie = ppp - 1;
len = ppp - pp;
if ((result = malloc(len))) {
memcpy(result, pp + 1, len - 1);
result[len - 1] = '\0';
id->id_info = result;
}
}
len = ie - ib + 1;
id->id_info = strndup(ib, len);
}
return 0;