Merge pull request #878 in FS/freeswitch from bugfix/FS-9214-fix-3pcc-behavior to master

* commit 'b9d31dc9':
  FS-9214: fix 3pcc behavior Fix callflow issues with  3pcc=true and 3pcc=proxy and interactions with sip_wait_for_aleg_ack removes passthrough of 183 on 3pcc=proxy (that was previously not functioning)

src/mod/endpoints/mod_sofia/mod_sofia.h

@@ -344,6 +344,7 @@ typedef enum {
 	TFLAG_REINVITED,
 	TFLAG_PASS_ACK,
 	TFLAG_KEEPALIVE,
+	TFLAG_SKIP_EARLY,
 	/* No new flags below this line */
 	TFLAG_MAX
 } TFLAGS;

src/mod/endpoints/mod_sofia/sofia.c

@@ -1279,30 +1279,41 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
 	switch_safe_free(dup);
 }
 
-static void tech_send_ack(nua_handle_t *nh, private_object_t *tech_pvt)
+static void tech_send_ack(nua_handle_t *nh, private_object_t *tech_pvt, const char *r_sdp)
 {
 	const char *invite_full_from = switch_channel_get_variable(tech_pvt->channel, "sip_invite_full_from");
 	const char *invite_full_to = switch_channel_get_variable(tech_pvt->channel, "sip_invite_full_to");
-
+	int soa = sofia_use_soa(tech_pvt);
 
 	if (sofia_test_pflag(tech_pvt->profile, PFLAG_TRACK_CALLS)) {
 		const char *invite_full_via = switch_channel_get_variable(tech_pvt->channel, "sip_invite_full_via");
 		const char *invite_route_uri = switch_channel_get_variable(tech_pvt->channel, "sip_invite_route_uri");
 
+
 		nua_ack(nh,
 				TAG_IF(invite_full_from, SIPTAG_FROM_STR(invite_full_from)),
 				TAG_IF(invite_full_to, SIPTAG_TO_STR(invite_full_to)),
 				TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
 				TAG_IF((zstr(tech_pvt->user_via) && !zstr(invite_full_via)), SIPTAG_VIA_STR(invite_full_via)),
 				TAG_IF(!zstr(invite_route_uri), SIPTAG_ROUTE_STR(invite_route_uri)),
+				TAG_IF(r_sdp && soa, SOATAG_USER_SDP_STR(r_sdp)),
+				TAG_IF(r_sdp && soa, SOATAG_REUSE_REJECTED(1)),
+				TAG_IF(r_sdp && soa, SOATAG_AUDIO_AUX("cn telephone-event")),
+				TAG_IF(r_sdp && !soa, SIPTAG_CONTENT_TYPE_STR("application/sdp")),
+				TAG_IF(r_sdp && !soa, SIPTAG_PAYLOAD_STR(r_sdp)),
+				TAG_IF(r_sdp && !soa, NUTAG_MEDIA_ENABLE(0)),
 				TAG_END());
-
-
 	} else {
 		nua_ack(nh,
 				TAG_IF(invite_full_from, SIPTAG_FROM_STR(invite_full_from)),
 				TAG_IF(invite_full_to, SIPTAG_TO_STR(invite_full_to)),
 				TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
+				TAG_IF(r_sdp && soa, SOATAG_USER_SDP_STR(r_sdp)),
+				TAG_IF(r_sdp && soa, SOATAG_REUSE_REJECTED(1)),
+				TAG_IF(r_sdp && soa, SOATAG_AUDIO_AUX("cn telephone-event")),
+				TAG_IF(r_sdp && !soa, SIPTAG_CONTENT_TYPE_STR("application/sdp")),
+				TAG_IF(r_sdp && !soa, SIPTAG_PAYLOAD_STR(r_sdp)),
+				TAG_IF(r_sdp && !soa, NUTAG_MEDIA_ENABLE(0)),
 				TAG_END());
 	}
 
@@ -1554,6 +1565,25 @@ static void our_sofia_event_callback(nua_event_t event,
 	case nua_i_ack:
 		{
 			if (channel && sip) {
+				const char *r_sdp = NULL;
+
+				if (sofia_test_flag(tech_pvt, TFLAG_PASS_ACK) && sip->sip_payload && sip->sip_payload->pl_data) {
+					r_sdp = sip->sip_payload->pl_data;
+
+					if (tech_pvt->mparams.last_sdp_str) {
+						tech_pvt->mparams.prev_sdp_str = tech_pvt->mparams.last_sdp_str;
+					}
+					tech_pvt->mparams.last_sdp_str = NULL;
+
+
+					if (!zstr(tech_pvt->mparams.prev_sdp_str) && strcmp(tech_pvt->mparams.prev_sdp_str, sip->sip_payload->pl_data)) {
+						switch_channel_set_variable(channel, "sip_reinvite_sdp", sip->sip_payload->pl_data);
+						tech_pvt->mparams.last_sdp_str = switch_core_session_strdup(session, sip->sip_payload->pl_data);
+					} else {
+						tech_pvt->mparams.last_sdp_str = tech_pvt->mparams.prev_sdp_str;
+					}
+				}
+
 				if (sip->sip_to && sip->sip_to->a_tag) {
 					switch_channel_set_variable(channel, "sip_to_tag", sip->sip_to->a_tag);
 				}
@@ -1581,11 +1611,10 @@ static void our_sofia_event_callback(nua_event_t event,
 
 					sofia_clear_flag(tech_pvt, TFLAG_PASS_ACK);
 
-
 					if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
 						if (switch_core_session_compare(session, other_session)) {
 							private_object_t *other_tech_pvt = switch_core_session_get_private(other_session);
-							tech_send_ack(other_tech_pvt->nh, other_tech_pvt);
+							tech_send_ack(other_tech_pvt->nh, other_tech_pvt, r_sdp);
 						}
 						switch_core_session_rwunlock(other_session);
 					}
@@ -6072,6 +6101,21 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 
 		switch_channel_clear_flag(channel, CF_REQ_MEDIA);
 
+		if (status < 200) {
+			if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
+				private_object_t *other_tech_pvt = switch_core_session_get_private(other_session);
+
+				if (sofia_test_flag(other_tech_pvt, TFLAG_3PCC)) {
+					sofia_set_flag_locked(tech_pvt, TFLAG_SKIP_EARLY);
+				}
+				switch_core_session_rwunlock(other_session);
+			}
+
+			if (sofia_test_flag(tech_pvt, TFLAG_SKIP_EARLY)) {
+				return;
+			}
+		}
+
 		if (status >= 900) {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s status %d received.\n",
 							  switch_channel_get_name(channel), status);
@@ -6436,6 +6480,7 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 							 (switch_channel_test_flag(tech_pvt->channel, CF_T38_PASSTHRU) && (has_t38 || status > 299)))) {
 
 			if (sofia_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) {
+				const char *wait_for_ack = switch_channel_get_variable(channel, "sip_wait_for_aleg_ack");
 				sofia_clear_flag_locked(tech_pvt, TFLAG_SENT_UPDATE);
 
 				if ((uuid = switch_channel_get_partner_uuid(channel)) && (other_session = switch_core_session_locate(uuid))) {
@@ -6451,7 +6496,22 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 						switch_core_media_proxy_remote_addr(session, NULL);
 					}
 
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Passing %d %s to other leg\n", status, phrase);
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Passing %d %s to other leg\n%s\n", status, phrase, switch_str_nil(r_sdp));
+
+					if (switch_true(wait_for_ack)) {
+						switch_core_session_t *other_session;
+
+						if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
+							if (switch_core_session_compare(session, other_session)) {
+								private_object_t *other_tech_pvt = switch_core_session_get_private(other_session);
+
+								if (!sofia_test_flag(tech_pvt, TFLAG_3PCC) && !sofia_test_flag(other_tech_pvt, TFLAG_3PCC)) {
+									sofia_set_flag(other_tech_pvt, TFLAG_PASS_ACK);
+								}
+							}
+							switch_core_session_rwunlock(other_session);
+						}
+					}
 
 					if (status == 491 && (switch_channel_test_flag(tech_pvt->channel, CF_T38_PASSTHRU) ||
 										  switch_channel_test_flag(channel, CF_PROXY_MODE))) {
@@ -6981,6 +7041,11 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 		break;
 	case nua_callstate_proceeding:
 
+		if (sofia_test_flag(tech_pvt, TFLAG_SKIP_EARLY)) {
+			sofia_clear_flag_locked(tech_pvt, TFLAG_SKIP_EARLY);
+			goto done;
+		}
+
 		switch (status) {
 		case 180:
 			switch_channel_mark_ring_ready(channel);
@@ -7084,8 +7149,11 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
 						if (switch_core_session_compare(session, other_session)) {
 							private_object_t *other_tech_pvt = switch_core_session_get_private(other_session);
-							sofia_set_flag(other_tech_pvt, TFLAG_PASS_ACK);
-						send_ack = 0;
+
+							if (!sofia_test_flag(tech_pvt, TFLAG_3PCC) && !sofia_test_flag(other_tech_pvt, TFLAG_3PCC)) {
+								sofia_set_flag(other_tech_pvt, TFLAG_PASS_ACK);
+								send_ack = 0;
+							}
 						}
 						switch_core_session_rwunlock(other_session);
 					}
@@ -7157,7 +7225,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 					switch_channel_set_flag(channel, CF_MEDIA_SET);
 
 					switch_core_media_activate_rtp(session);
-					
+
 					nua_ack(tech_pvt->nh,
 							TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
 							SIPTAG_CONTACT_STR(tech_pvt->reply_contact),
@@ -7198,7 +7266,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 			}
 
 			if (send_ack) {
-				tech_send_ack(nh, tech_pvt);
+				tech_send_ack(nh, tech_pvt, NULL);
 			} else {
 				ss_state = nua_callstate_ready;
 				goto state_process;
@@ -7421,10 +7489,6 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 			switch_channel_mark_pre_answered(channel);
 			sofia_set_flag(tech_pvt, TFLAG_SDP);
 
-			if (sofia_test_flag(tech_pvt, TFLAG_3PCC) && sofia_test_pflag(profile, PFLAG_3PCC_PROXY)) {
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "3PCC-PROXY, Got my PRACK\n");
-				sofia_set_flag(tech_pvt, TFLAG_3PCC_HAS_ACK);
-			}
 
 			match = sofia_media_negotiate_sdp(session, r_sdp, SDP_TYPE_RESPONSE);
 			if (match) {