Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
91c53552
提交
91c53552
authored
2月 01, 2010
作者:
David Yat Sin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update
git-svn-id:
http://svn.openzap.org/svn/openzap/trunk@1018
a93c3328-9c30-0410-af19-c9cd2b2d52af
上级
000b7e78
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
18 行增加
和
17 行删除
+18
-17
mod_openzap.c
libs/openzap/mod_openzap/mod_openzap.c
+18
-17
没有找到文件。
libs/openzap/mod_openzap/mod_openzap.c
浏览文件 @
91c53552
...
...
@@ -385,7 +385,7 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
channel
=
switch_core_session_get_channel
(
session
);
assert
(
channel
!=
NULL
);
if
(
!
tech_pvt
->
zchan
)
{
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
)
)
{
switch_channel_hangup
(
channel
,
SWITCH_CAUSE_LOSE_RACE
);
return
SWITCH_STATUS_SUCCESS
;
}
...
...
@@ -573,7 +573,7 @@ static switch_status_t channel_send_dtmf(switch_core_session_t *session, const s
tech_pvt
=
switch_core_session_get_private
(
session
);
assert
(
tech_pvt
!=
NULL
);
if
(
!
tech_pvt
->
zchan
)
{
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
)
)
{
switch_channel_hangup
(
switch_core_session_get_channel
(
session
),
SWITCH_CAUSE_LOSE_RACE
);
return
SWITCH_STATUS_FALSE
;
}
...
...
@@ -599,11 +599,11 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
channel
=
switch_core_session_get_channel
(
session
);
assert
(
channel
!=
NULL
);
tech_pvt
=
switch_core_session_get_private
(
session
);
assert
(
tech_pvt
!=
NULL
);
if
(
!
tech_pvt
->
zchan
)
{
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
)
)
{
return
SWITCH_STATUS_FALSE
;
}
...
...
@@ -613,10 +613,6 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
chunk
=
tech_pvt
->
zchan
->
effective_interval
*
2
;
total_to
=
chunk
*
6
;
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
))
{
return
SWITCH_STATUS_FALSE
;
}
top:
if
(
switch_channel_test_flag
(
channel
,
CF_SUSPEND
))
{
...
...
@@ -776,7 +772,7 @@ static switch_status_t channel_receive_message_cas(switch_core_session_t *sessio
tech_pvt
=
(
private_t
*
)
switch_core_session_get_private
(
session
);
assert
(
tech_pvt
!=
NULL
);
if
(
!
tech_pvt
->
zchan
)
{
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
)
)
{
switch_channel_hangup
(
channel
,
SWITCH_CAUSE_LOSE_RACE
);
return
SWITCH_STATUS_FALSE
;
}
...
...
@@ -841,7 +837,7 @@ static switch_status_t channel_receive_message_b(switch_core_session_t *session,
tech_pvt
=
(
private_t
*
)
switch_core_session_get_private
(
session
);
assert
(
tech_pvt
!=
NULL
);
if
(
!
tech_pvt
->
zchan
)
{
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
)
)
{
switch_channel_hangup
(
channel
,
SWITCH_CAUSE_LOSE_RACE
);
return
SWITCH_STATUS_FALSE
;
}
...
...
@@ -915,7 +911,7 @@ static switch_status_t channel_receive_message_fxo(switch_core_session_t *sessio
tech_pvt
=
(
private_t
*
)
switch_core_session_get_private
(
session
);
assert
(
tech_pvt
!=
NULL
);
if
(
!
tech_pvt
->
zchan
)
{
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
)
)
{
switch_channel_hangup
(
channel
,
SWITCH_CAUSE_LOSE_RACE
);
return
SWITCH_STATUS_FALSE
;
}
...
...
@@ -949,7 +945,7 @@ static switch_status_t channel_receive_message_fxs(switch_core_session_t *sessio
tech_pvt
=
(
private_t
*
)
switch_core_session_get_private
(
session
);
assert
(
tech_pvt
!=
NULL
);
if
(
!
tech_pvt
->
zchan
)
{
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
)
)
{
switch_channel_hangup
(
channel
,
SWITCH_CAUSE_LOSE_RACE
);
return
SWITCH_STATUS_FALSE
;
}
...
...
@@ -997,6 +993,11 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
channel
=
switch_core_session_get_channel
(
session
);
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
))
{
switch_channel_hangup
(
channel
,
SWITCH_CAUSE_LOSE_RACE
);
return
SWITCH_STATUS_FALSE
;
}
if
(
!
(
zchan
=
tech_pvt
->
zchan
))
{
switch_channel_hangup
(
channel
,
SWITCH_CAUSE_LOSE_RACE
);
return
SWITCH_STATUS_FALSE
;
...
...
@@ -1414,7 +1415,7 @@ static ZIO_SIGNAL_CB_FUNCTION(on_fxo_signal)
private_t
*
tech_pvt
=
NULL
;
while
((
session
=
zap_channel_get_session
(
sigmsg
->
channel
,
0
)))
{
tech_pvt
=
switch_core_session_get_private
(
session
);
tech_pvt
->
zchan
=
NULL
;
switch_set_flag_locked
(
tech_pvt
,
TFLAG_DEAD
)
;
zap_channel_clear_token
(
sigmsg
->
channel
,
0
);
channel
=
switch_core_session_get_channel
(
session
);
switch_channel_hangup
(
channel
,
sigmsg
->
channel
->
caller_data
.
hangup_cause
);
...
...
@@ -1548,7 +1549,7 @@ static ZIO_SIGNAL_CB_FUNCTION(on_fxs_signal)
while
((
session
=
zap_channel_get_session
(
sigmsg
->
channel
,
0
)))
{
tech_pvt
=
switch_core_session_get_private
(
session
);
tech_pvt
->
zchan
=
NULL
;
switch_set_flag_locked
(
tech_pvt
,
TFLAG_DEAD
)
;
channel
=
switch_core_session_get_channel
(
session
);
switch_channel_hangup
(
channel
,
cause
);
zap_channel_clear_token
(
sigmsg
->
channel
,
switch_core_session_get_uuid
(
session
));
...
...
@@ -1678,7 +1679,7 @@ static ZIO_SIGNAL_CB_FUNCTION(on_r2_signal)
private_t
*
tech_pvt
=
NULL
;
while
((
session
=
zap_channel_get_session
(
sigmsg
->
channel
,
0
)))
{
tech_pvt
=
switch_core_session_get_private
(
session
);
tech_pvt
->
zchan
=
NULL
;
switch_set_flag_locked
(
tech_pvt
,
TFLAG_DEAD
)
;
channel
=
switch_core_session_get_channel
(
session
);
switch_channel_hangup
(
channel
,
sigmsg
->
channel
->
caller_data
.
hangup_cause
);
zap_channel_clear_token
(
sigmsg
->
channel
,
switch_core_session_get_uuid
(
session
));
...
...
@@ -1791,7 +1792,7 @@ static ZIO_SIGNAL_CB_FUNCTION(on_clear_channel_signal)
private_t
*
tech_pvt
=
NULL
;
while
((
session
=
zap_channel_get_session
(
sigmsg
->
channel
,
0
)))
{
tech_pvt
=
switch_core_session_get_private
(
session
);
tech_pvt
->
zchan
=
NULL
;
switch_set_flag_locked
(
tech_pvt
,
TFLAG_DEAD
)
;
channel
=
switch_core_session_get_channel
(
session
);
switch_channel_hangup
(
channel
,
sigmsg
->
channel
->
caller_data
.
hangup_cause
);
zap_channel_clear_token
(
sigmsg
->
channel
,
switch_core_session_get_uuid
(
session
));
...
...
@@ -2940,7 +2941,7 @@ SWITCH_STANDARD_APP(disable_ec_function)
tech_pvt
=
switch_core_session_get_private
(
session
);
if
(
!
tech_pvt
->
zchan
)
{
if
(
switch_test_flag
(
tech_pvt
,
TFLAG_DEAD
)
)
{
switch_channel_hangup
(
switch_core_session_get_channel
(
session
),
SWITCH_CAUSE_LOSE_RACE
);
return
;
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论