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

FS-4331 please test and post a new log if necessary

上级 305aa77a
...@@ -1224,6 +1224,7 @@ typedef enum { ...@@ -1224,6 +1224,7 @@ typedef enum {
CF_CHANNEL_SWAP, CF_CHANNEL_SWAP,
CF_PICKUP, CF_PICKUP,
CF_CONFIRM_BLIND_TRANSFER, CF_CONFIRM_BLIND_TRANSFER,
CF_NO_PRESENCE,
/* 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
......
...@@ -3521,6 +3521,7 @@ static switch_call_cause_t pickup_outgoing_channel(switch_core_session_t *sessio ...@@ -3521,6 +3521,7 @@ static switch_call_cause_t pickup_outgoing_channel(switch_core_session_t *sessio
pickup_add_session(nsession, pickup); pickup_add_session(nsession, pickup);
switch_channel_set_flag(nchannel, CF_PICKUP); switch_channel_set_flag(nchannel, CF_PICKUP);
switch_channel_set_flag(nchannel, CF_NO_PRESENCE);
goto done; goto done;
......
...@@ -606,6 +606,10 @@ SWITCH_DECLARE(void) switch_channel_perform_presence(switch_channel_t *channel, ...@@ -606,6 +606,10 @@ SWITCH_DECLARE(void) switch_channel_perform_presence(switch_channel_t *channel,
const char *call_info = NULL; const char *call_info = NULL;
char *call_info_state = "active"; char *call_info_state = "active";
if (switch_channel_test_flag(channel, CF_NO_PRESENCE)) {
return;
}
if (!status) { if (!status) {
type = SWITCH_EVENT_PRESENCE_OUT; type = SWITCH_EVENT_PRESENCE_OUT;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论