Merging changes from Development branch

team-telnyx · Feb 12, 2024 · 61fe418 · 61fe418
2 parents e596516 + dc460de
commit 61fe418
Showing 1 changed file with 56 additions and 24 deletions.
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1515,40 +1515,72 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 	// for the prack before sending the final response.
 	if (switch_channel_var_true(channel, "apply_100rel_sync")) {
 		const char* message_str = "N/A";
+		uint32_t channel_flag = CF_FLAG_MAX;
 		switch (msg->message_id) {
-		case SWITCH_MESSAGE_INDICATE_RINGING:
-			message_str = "RINGING";
+		case SWITCH_MESSAGE_INDICATE_RINGING: 
+			{
+				message_str = "RINGING";
+				if (!sofia_test_flag(tech_pvt, TFLAG_BYE) && !switch_channel_test_flag(channel, CF_RING_READY) &&
+					!switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
+					channel_flag = CF_RING_READY;
+				}
+
+			}
+			break;
 		case SWITCH_MESSAGE_INDICATE_PROGRESS:
-			message_str = "PROGRESS";
+			{
+				message_str = "PROGRESS";
+				if (!sofia_test_flag(tech_pvt, TFLAG_BYE) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
+					channel_flag = CF_EARLY_MEDIA;
+				}
+			}
 		case SWITCH_MESSAGE_INDICATE_ANSWER:
-			message_str = "ANSWER";
 			{
-				// PRACK timeout is also based on timer t1x64
-				// to prevent deadlock, will need to time the
-				// lock based on the value of t1x64
-				uint32_t t1x64 = tech_pvt->profile->timer_t1x64 ? tech_pvt->profile->timer_t1x64 : 32000;
-				switch_mutex_lock(tech_pvt->prack_mutex);
-				if (sofia_test_flag(tech_pvt, TFLAG_PRACK_LOCK)) {
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO,
-							"%s Waiting for incoming PRACK! (Blocking %s message)\n", switch_channel_get_name(channel), message_str);
-					if (switch_thread_cond_timedwait(tech_pvt->prack_cond, tech_pvt->prack_mutex, t1x64 * 1000) == SWITCH_STATUS_TIMEOUT) {
-						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
-							"%s Timeout on waiting for PRACK! (Unblock %s message)\n", switch_channel_get_name(channel), message_str);
-					} else {
-						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO,
-							"%s Received PRACK! (Unblock %s message)\n", switch_channel_get_name(channel), message_str);
-					}
-				} else {
-					if (msg->message_id != SWITCH_MESSAGE_INDICATE_ANSWER) {
-						sofia_set_flag(tech_pvt, TFLAG_PRACK_LOCK);
-					}
+				message_str = "ANSWER";
+				if (!sofia_test_flag(tech_pvt, TFLAG_BYE) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
+					channel_flag = CF_ANSWERED;
 				}
-				switch_mutex_unlock(tech_pvt->prack_mutex);
 			}
 			break;
 		default:
 			break;
 		}
+
+		if (channel_flag != CF_FLAG_MAX) {
+			switch (msg->message_id) {
+			case SWITCH_MESSAGE_INDICATE_RINGING:
+			case SWITCH_MESSAGE_INDICATE_PROGRESS:
+			case SWITCH_MESSAGE_INDICATE_ANSWER:
+				{
+					// PRACK timeout is also based on timer t1x64
+					// to prevent deadlock, will need to time the
+					// lock based on the value of t1x64
+					uint32_t t1x64 = tech_pvt->profile->timer_t1x64 ? tech_pvt->profile->timer_t1x64 : 32000;
+					switch_mutex_lock(tech_pvt->prack_mutex);
+					if (sofia_test_flag(tech_pvt, TFLAG_PRACK_LOCK)) {
+						switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO,
+								"%s Waiting for incoming PRACK! (Blocking %s message)\n", switch_channel_get_name(channel), message_str);
+						if (switch_thread_cond_timedwait(tech_pvt->prack_cond, tech_pvt->prack_mutex, t1x64 * 1000) == SWITCH_STATUS_TIMEOUT) {
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
+								"%s Timeout on waiting for PRACK! (Unblock %s message)\n", switch_channel_get_name(channel), message_str);
+						} else {
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO,
+								"%s Received PRACK! (Unblock %s message)\n", switch_channel_get_name(channel), message_str);
+						}
+					} else {
+						if (msg->message_id != SWITCH_MESSAGE_INDICATE_ANSWER) {
+							switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO,
+								"%s Expecting incoming PRACK! (Trigger by %s message)\n", switch_channel_get_name(channel), message_str);
+							sofia_set_flag(tech_pvt, TFLAG_PRACK_LOCK);
+						}
+					}
+					switch_mutex_unlock(tech_pvt->prack_mutex);
+				}
+				break;
+			default:
+				break;
+			}
+		}
 	}