fifo up

src/switch_core_session.c

@@ -569,14 +569,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_receive_message(swit
 
 	switch_assert(session != NULL);
 
-	if (switch_channel_down(session->channel)) {
-		return SWITCH_STATUS_FALSE;
-	}
-
-	if ((status = switch_core_session_read_lock(session)) != SWITCH_STATUS_SUCCESS) {
+	if ((status = switch_core_session_read_lock_hangup(session)) != SWITCH_STATUS_SUCCESS) {
 		return status;
 	}
-
+	
 	if (!message->_file) {
 		message->_file = file;
 	}
@@ -610,7 +606,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_receive_message(swit
 		goto end;
 	}
 
-	if (session->endpoint_interface->io_routines->receive_message) {
+	if (switch_channel_down(session->channel)) {
+	switch_log_printf(SWITCH_CHANNEL_ID_LOG, message->_file, message->_func, message->_line,
+					  switch_core_session_get_uuid(session), SWITCH_LOG_DEBUG, "%s skip receive message [%s] (channel is hungup already)\n",
+					  switch_channel_get_name(session->channel), message_names[message->message_id]);
+	
+	} else if (session->endpoint_interface->io_routines->receive_message) {
 		status = session->endpoint_interface->io_routines->receive_message(session, message);
 	}
 
@@ -626,28 +627,29 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_receive_message(swit
 	message->_func = NULL;
 	message->_line = 0;
 
-
-	switch (message->message_id) {
-	case SWITCH_MESSAGE_REDIRECT_AUDIO:
-	case SWITCH_MESSAGE_INDICATE_ANSWER:
-	case SWITCH_MESSAGE_INDICATE_PROGRESS:
-	case SWITCH_MESSAGE_INDICATE_BRIDGE:
-	case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
-	case SWITCH_MESSAGE_INDICATE_TRANSFER:
-	case SWITCH_MESSAGE_INDICATE_RINGING:
-	case SWITCH_MESSAGE_INDICATE_MEDIA:
-	case SWITCH_MESSAGE_INDICATE_NOMEDIA:
-	case SWITCH_MESSAGE_INDICATE_HOLD:
-	case SWITCH_MESSAGE_INDICATE_UNHOLD:
-	case SWITCH_MESSAGE_INDICATE_REDIRECT:
-	case SWITCH_MESSAGE_INDICATE_RESPOND:
-	case SWITCH_MESSAGE_INDICATE_BROADCAST:
-	case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT:
-	case SWITCH_MESSAGE_INDICATE_DEFLECT:
-		switch_core_session_kill_channel(session, SWITCH_SIG_BREAK);
-		break;
-	default:
-		break;
+	if (switch_channel_up(session->channel)) {
+		switch (message->message_id) {
+		case SWITCH_MESSAGE_REDIRECT_AUDIO:
+		case SWITCH_MESSAGE_INDICATE_ANSWER:
+		case SWITCH_MESSAGE_INDICATE_PROGRESS:
+		case SWITCH_MESSAGE_INDICATE_BRIDGE:
+		case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
+		case SWITCH_MESSAGE_INDICATE_TRANSFER:
+		case SWITCH_MESSAGE_INDICATE_RINGING:
+		case SWITCH_MESSAGE_INDICATE_MEDIA:
+		case SWITCH_MESSAGE_INDICATE_NOMEDIA:
+		case SWITCH_MESSAGE_INDICATE_HOLD:
+		case SWITCH_MESSAGE_INDICATE_UNHOLD:
+		case SWITCH_MESSAGE_INDICATE_REDIRECT:
+		case SWITCH_MESSAGE_INDICATE_RESPOND:
+		case SWITCH_MESSAGE_INDICATE_BROADCAST:
+		case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT:
+		case SWITCH_MESSAGE_INDICATE_DEFLECT:
+			switch_core_session_kill_channel(session, SWITCH_SIG_BREAK);
+			break;
+		default:
+			break;
+		}
 	}
 
   end:

src/switch_ivr_bridge.c

@@ -515,12 +515,6 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 		switch_safe_free(stream.data);
 	}
 
-
-	msg.string_arg = data->b_uuid;
-	msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
-	msg.from = __FILE__;
-	switch_core_session_receive_message(session_a, &msg);
-
 	if (!inner_bridge && switch_channel_up(chan_a)) {
 		if ((app_name = switch_channel_get_variable(chan_a, SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE))) {
 			switch_caller_extension_t *extension = NULL;
@@ -1048,6 +1042,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
 	int inner_bridge = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE);
 	const char *var;
 	switch_call_cause_t cause;
+	switch_core_session_message_t msg = { 0 };
 
 	if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE)) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Call has no media... Redirecting to signal bridge.\n");
@@ -1084,7 +1079,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
 
 	if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA) ||
 		switch_channel_test_flag(peer_channel, CF_RING_READY)) {
-		switch_core_session_message_t msg = { 0 };
 		const char *app, *data;
 
 		switch_channel_set_state(peer_channel, CS_CONSUME_MEDIA);
@@ -1250,6 +1244,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
 		switch_event_fire(&event);
 	}
 
+	msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
+	msg.from = __FILE__;
+	msg.string_arg = switch_core_session_strdup(peer_session, switch_core_session_get_uuid(session));
+	switch_core_session_receive_message(peer_session, &msg);
+
+	msg.string_arg = switch_core_session_strdup(session, switch_core_session_get_uuid(peer_session));
+	switch_core_session_receive_message(session, &msg);
+
 	state = switch_channel_get_state(caller_channel);