提交 93102780 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-5772 improve odds a little more but the phone is broken here

Conflicts:
	src/include/switch_types.h
上级 f5ba0bb7
...@@ -1303,6 +1303,8 @@ typedef enum { ...@@ -1303,6 +1303,8 @@ typedef enum {
CF_MEDIA_TRANS, CF_MEDIA_TRANS,
CF_HOLD_ON_BRIDGE, CF_HOLD_ON_BRIDGE,
CF_NOVIDEO, CF_NOVIDEO,
CF_VIDEO_ECHO,
CF_SLA_INTERCEPT,
/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */ /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
/* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */ /* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */
CF_FLAG_MAX CF_FLAG_MAX
......
...@@ -8704,9 +8704,8 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia ...@@ -8704,9 +8704,8 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE); sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
switch_channel_presence(b_channel, "unknown", "idle", NULL); switch_channel_presence(b_channel, "unknown", "idle", NULL);
} }
switch_channel_set_flag(tech_pvt->channel, CF_SLA_INTERCEPT);
tech_pvt->caller_profile->destination_number = switch_core_sprintf(tech_pvt->caller_profile->pool, tech_pvt->caller_profile->destination_number = switch_core_sprintf(tech_pvt->caller_profile->pool,
"%sanswer,intercept:%s", codec_str, bridge_uuid); "%sanswer,intercept:%s", codec_str, bridge_uuid);
} else { } else {
......
...@@ -740,7 +740,11 @@ SWITCH_DECLARE(void) switch_channel_perform_presence(switch_channel_t *channel, ...@@ -740,7 +740,11 @@ SWITCH_DECLARE(void) switch_channel_perform_presence(switch_channel_t *channel,
if (channel->direction == SWITCH_CALL_DIRECTION_OUTBOUND) { if (channel->direction == SWITCH_CALL_DIRECTION_OUTBOUND) {
call_info_state = "progressing"; call_info_state = "progressing";
} else { } else {
call_info_state = "alerting"; if (switch_channel_test_flag(channel, CF_SLA_INTERCEPT)) {
call_info_state = "idle";
} else {
call_info_state = "alerting";
}
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论