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

[FreeSWITCH SVN]

Author: mikej
Date: Tue Dec 16 16:21:04 2008
New Revision: 10830

Log:
Fri Nov 21 08:12:28 CST 2008  Pekka Pessi <first.last at nokia.com>
  * nua_session.c: call soa_activate() only when nh->nh_soa is valid



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

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Tue Dec 16 16:21:04 2008
@@ -1 +1 @@
-Tue Dec 16 15:19:47 CST 2008
+Tue Dec 16 15:20:42 CST 2008

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	Tue Dec 16 16:21:04 2008
@@ -1315,8 +1315,9 @@
       ;
     else if (nh->nh_soa && soa_is_complete(nh->nh_soa)) {
       /* signal SOA that O/A round(s) is (are) complete */
-      if (soa_activate(nh->nh_soa, NULL) >= 0)
+      if (soa_activate(nh->nh_soa, NULL) >= 0) {
 	ss->ss_sdp_version = soa_get_user_version(nh->nh_soa);
+      }
     }
     else if (nh->nh_soa == NULL
 	     /* NUA does not necessarily know dirty details */
@@ -1748,8 +1749,9 @@
     }
     else {
       answer_sent = 1;
-      if (soa_activate(nh->nh_soa, NULL) >= 0)
+      if (soa_activate(nh->nh_soa, NULL) >= 0) {
 	ss->ss_sdp_version = soa_get_user_version(nh->nh_soa);
+      }
     }
   }
   else if (nh->nh_soa == NULL) {
@@ -2326,8 +2328,9 @@
     else if (answer)
       sr->sr_answer_sent = 1 + reliable, ss->ss_oa_sent = Answer;
 
-    if (answer && reliable)
+    if (answer && reliable && nh->nh_soa) {
       ss->ss_sdp_version = soa_get_user_version(nh->nh_soa);
+    }
   }
 
   if (reliable && sr->sr_status < 200) {