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

Fri Aug 8 08:09:34 EDT 2008 Pekka Pessi <first.last@nokia.com> 

* nua: fix bug #2041747 with Organization header
  
  Using Organization tags crashed the nua stack.



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9278 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-08-12 17:07:38 +00:00
parent 426570b105
commit e33290f42f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Tue Aug 12 13:07:15 EDT 2008
Tue Aug 12 13:07:33 EDT 2008

3
libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
View File

@ -60,7 +60,8 @@ static void call_setup(void)
{
s2_case("0.1.1", "Setup for Call Tests", "");
nua = s2_nua_setup(TAG_END());
nua = s2_nua_setup(SIPTAG_ORGANIZATION_STR("Pussy Galore's Flying Circus"),
TAG_END());
soa = soa_create(NULL, s2->root, NULL);

5
libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
View File

@ -1716,7 +1716,8 @@ int nua_server_respond(nua_server_request_t *sr, tagi_t const *tags)
NH_PGET(nh, user_agent)) < 0)
;
else if (!sip->sip_organization && NH_PGET(nh, organization) &&
sip_add_dup(msg, sip, (void *)NH_PGET(nh, organization)) < 0)
sip_add_make(msg, sip, sip_organization_class,
NH_PGET(nh, organization)) < 0)
;
else if (!sip->sip_allow && NH_PGET(nh, allow) &&
sip_add_dup(msg, sip, (void *)NH_PGET(nh, allow)) < 0)
@ -2561,7 +2562,7 @@ int nua_client_request_sendmsg(nua_client_request_t *cr, msg_t *msg, sip_t *sip)
sip_add_make(msg, sip, sip_supported_class, "path");
if (!sip->sip_organization && NH_PGET(nh, organization))
sip_add_dup(msg, sip, (sip_header_t *)NH_PGET(nh, organization));
sip_add_make(msg, sip, sip_organization_class, NH_PGET(nh, organization));
if (!sip->sip_user_agent && NH_PGET(nh, user_agent))
sip_add_make(msg, sip, sip_user_agent_class, NH_PGET(nh, user_agent));