FS-6954 #resolve #comment please test

src/mod/endpoints/mod_sofia/sofia.c

@@ -6538,9 +6538,17 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 		if (!tech_pvt || !tech_pvt->nh) {
 			goto done;
 		}
-	
-		if ((status > 100 || switch_channel_test_flag(channel, CF_ANSWERED)) && status < 300 && !r_sdp && tech_pvt->mparams.last_sdp_str) {
-			r_sdp = tech_pvt->mparams.last_sdp_str;
+
+		if (!r_sdp && (status > 100 || switch_channel_test_flag(channel, CF_ANSWERED)) && status < 300) {
+			if (ss_state == nua_callstate_ready) {
+				if (tech_pvt->mparams.last_sdp_response) {
+					r_sdp = tech_pvt->mparams.last_sdp_response;
+				}
+			} else {
+				if (tech_pvt->mparams.last_sdp_str) {
+					r_sdp = tech_pvt->mparams.last_sdp_str;
+				}
+			}
 		}
 		tech_pvt->mparams.last_sdp_str = NULL;
 	

src/mod/endpoints/mod_sofia/sofia_glue.c

@@ -1235,6 +1235,10 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
 
 	tech_pvt->sent_invites++;
 
+	if (switch_channel_get_private(tech_pvt->channel, "t38_options")) {
+		sofia_clear_flag(tech_pvt, TFLAG_ENABLE_SOA);
+	}
+
 	if (sofia_use_soa(tech_pvt)) {
 		nua_invite(tech_pvt->nh,
 				   NUTAG_AUTOANSWER(0),