Fri Nov 21 08:12:28 CST 2008 Pekka Pessi <first.last@nokia.com>

  * nua_session.c: call soa_activate() only when nh->nh_soa is valid



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10830 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/sofia-sip/.update

-Tue Dec 16 15:19:47 CST 2008
+Tue Dec 16 15:20:42 CST 2008

libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c

@@ -1315,9 +1315,10 @@ int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags)
       ;
     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 */
 	     /* && !(cr->cr_offer_sent && !cr->cr_answer_recv) */) {
@@ -1748,10 +1749,11 @@ static int nua_prack_client_request(nua_client_request_t *cr,
     }
     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) {
     offer_sent = session_get_description(sip, NULL, NULL);
   }
@@ -2326,9 +2328,10 @@ int nua_invite_server_respond(nua_server_request_t *sr, tagi_t const *tags)
     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) {
     sr->sr_response.msg = NULL, sr->sr_response.sip = NULL;