Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
4d77481e
提交
4d77481e
authored
5月 26, 2011
作者:
David Yat Sin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
freetdm: ISDN - Fix for segfault when we receive STA CFM while call is being cleared
上级
ffa0a071
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
15 行增加
和
4 行删除
+15
-4
ftmod_sangoma_isdn_stack_hndl.c
.../ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
+6
-0
ftmod_sangoma_isdn_stack_rcv.c
...c/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
+7
-2
ftmod_sangoma_isdn_support.c
...src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
+2
-2
没有找到文件。
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
浏览文件 @
4d77481e
...
@@ -881,6 +881,12 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
...
@@ -881,6 +881,12 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
uint8_t
call_state
=
0
;
uint8_t
call_state
=
0
;
ISDN_FUNC_TRACE_ENTER
(
__FUNCTION__
);
ISDN_FUNC_TRACE_ENTER
(
__FUNCTION__
);
if
(
!
suInstId
&&
!
spInstId
)
{
/* We already cleared this call */
ftdm_log_chan
(
ftdmchan
,
FTDM_LOG_DEBUG
,
"Dropping STATUS CONFIRM (suId:%u suInstId:%u spInstId:%u)
\n
"
,
suId
,
suInstId
,
spInstId
);
return
;
}
if
(
staEvnt
->
callSte
.
eh
.
pres
&&
staEvnt
->
callSte
.
callGlblSte
.
pres
)
{
if
(
staEvnt
->
callSte
.
eh
.
pres
&&
staEvnt
->
callSte
.
callGlblSte
.
pres
)
{
call_state
=
staEvnt
->
callSte
.
callGlblSte
.
val
;
call_state
=
staEvnt
->
callSte
.
callGlblSte
.
val
;
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
浏览文件 @
4d77481e
...
@@ -502,12 +502,16 @@ void sngisdn_rcv_sta_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
...
@@ -502,12 +502,16 @@ void sngisdn_rcv_sta_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
sngisdn_event_data_t
*
sngisdn_event
=
NULL
;
sngisdn_event_data_t
*
sngisdn_event
=
NULL
;
ISDN_FUNC_TRACE_ENTER
(
__FUNCTION__
);
ISDN_FUNC_TRACE_ENTER
(
__FUNCTION__
);
/* We sometimes receive a STA CFM after receiving a RELEASE/RELEASE COMPLETE, so we need to lock
here in case we are calling clear_call_data at the same time this function is called */
ftdm_mutex_lock
(
g_sngisdn_data
.
ccs
[
suId
].
mutex
);
if
(
!
(
spInstId
&&
get_ftdmchan_by_spInstId
(
suId
,
spInstId
,
&
sngisdn_info
)
==
FTDM_SUCCESS
)
&&
if
(
!
(
spInstId
&&
get_ftdmchan_by_spInstId
(
suId
,
spInstId
,
&
sngisdn_info
)
==
FTDM_SUCCESS
)
&&
!
(
suInstId
&&
get_ftdmchan_by_suInstId
(
suId
,
suInstId
,
&
sngisdn_info
)
==
FTDM_SUCCESS
))
{
!
(
suInstId
&&
get_ftdmchan_by_suInstId
(
suId
,
suInstId
,
&
sngisdn_info
)
==
FTDM_SUCCESS
))
{
ftdm_log
(
FTDM_LOG_CRIT
,
"Could not find matching call suId:%u suInstId:%u spInstId:%u
\n
"
,
suId
,
suInstId
,
spInstId
);
ftdm_log
(
FTDM_LOG_CRIT
,
"Could not find matching call suId:%u suInstId:%u spInstId:%u
\n
"
,
suId
,
suInstId
,
spInstId
);
ftdm_
assert
(
0
,
"Inconsistent call states
\n
"
);
ftdm_
mutex_unlock
(
g_sngisdn_data
.
ccs
[
suId
].
mutex
);
return
;
return
;
}
}
...
@@ -526,6 +530,7 @@ void sngisdn_rcv_sta_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
...
@@ -526,6 +530,7 @@ void sngisdn_rcv_sta_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, St
memcpy
(
&
sngisdn_event
->
event
.
staEvnt
,
staEvnt
,
sizeof
(
*
staEvnt
));
memcpy
(
&
sngisdn_event
->
event
.
staEvnt
,
staEvnt
,
sizeof
(
*
staEvnt
));
ftdm_queue_enqueue
(((
sngisdn_span_data_t
*
)
sngisdn_info
->
ftdmchan
->
span
->
signal_data
)
->
event_queue
,
sngisdn_event
);
ftdm_queue_enqueue
(((
sngisdn_span_data_t
*
)
sngisdn_info
->
ftdmchan
->
span
->
signal_data
)
->
event_queue
,
sngisdn_event
);
ftdm_mutex_unlock
(
g_sngisdn_data
.
ccs
[
suId
].
mutex
);
ISDN_FUNC_TRACE_EXIT
(
__FUNCTION__
);
ISDN_FUNC_TRACE_EXIT
(
__FUNCTION__
);
}
}
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
浏览文件 @
4d77481e
...
@@ -100,12 +100,12 @@ void clear_call_data(sngisdn_chan_data_t *sngisdn_info)
...
@@ -100,12 +100,12 @@ void clear_call_data(sngisdn_chan_data_t *sngisdn_info)
ftdm_mutex_lock
(
g_sngisdn_data
.
ccs
[
cc_id
].
mutex
);
ftdm_mutex_lock
(
g_sngisdn_data
.
ccs
[
cc_id
].
mutex
);
g_sngisdn_data
.
ccs
[
cc_id
].
active_spInstIds
[
sngisdn_info
->
spInstId
]
=
NULL
;
g_sngisdn_data
.
ccs
[
cc_id
].
active_spInstIds
[
sngisdn_info
->
spInstId
]
=
NULL
;
g_sngisdn_data
.
ccs
[
cc_id
].
active_suInstIds
[
sngisdn_info
->
suInstId
]
=
NULL
;
g_sngisdn_data
.
ccs
[
cc_id
].
active_suInstIds
[
sngisdn_info
->
suInstId
]
=
NULL
;
ftdm_mutex_unlock
(
g_sngisdn_data
.
ccs
[
cc_id
].
mutex
);
sngisdn_info
->
suInstId
=
0
;
sngisdn_info
->
suInstId
=
0
;
sngisdn_info
->
spInstId
=
0
;
sngisdn_info
->
spInstId
=
0
;
sngisdn_info
->
globalFlg
=
0
;
sngisdn_info
->
globalFlg
=
0
;
sngisdn_info
->
flags
=
0
;
sngisdn_info
->
flags
=
0
;
ftdm_mutex_unlock
(
g_sngisdn_data
.
ccs
[
cc_id
].
mutex
);
return
;
return
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论