[Freeswitch-svn] [commit] r9278 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua

[Freeswitch SVN]

Author: mikej
Date: Tue Aug 12 13:07:38 2008
New Revision: 9278

Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c

Log:
Fri Aug  8 08:09:34 EDT 2008  Pekka Pessi <first.last at nokia.com>
  * nua: fix bug #2041747 with Organization header
  
  Using Organization tags crashed the nua stack.



Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Aug 12 13:07:38 2008
@@ -1 +1 @@
-Tue Aug 12 13:07:15 EDT 2008
+Tue Aug 12 13:07:33 EDT 2008

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c	Tue Aug 12 13:07:38 2008
@@ -60,7 +60,8 @@
 {
   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);
 

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c	Tue Aug 12 13:07:38 2008
@@ -1716,7 +1716,8 @@
 			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 @@
     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));