Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
3cb1fd26
提交
3cb1fd26
authored
10月 17, 2012
作者:
Moises Silva
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Try to fix pritap segfault
上级
0a920949
显示空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
27 行增加
和
5 行删除
+27
-5
ftmod_pritap.c
libs/freetdm/src/ftmod/ftmod_pritap/ftmod_pritap.c
+27
-5
没有找到文件。
libs/freetdm/src/ftmod/ftmod_pritap/ftmod_pritap.c
浏览文件 @
3cb1fd26
...
@@ -297,13 +297,19 @@ static ftdm_status_t state_advance(ftdm_channel_t *ftdmchan)
...
@@ -297,13 +297,19 @@ static ftdm_status_t state_advance(ftdm_channel_t *ftdmchan)
switch
(
ftdmchan
->
state
)
{
switch
(
ftdmchan
->
state
)
{
case
FTDM_CHANNEL_STATE_DOWN
:
case
FTDM_CHANNEL_STATE_DOWN
:
{
{
ftdm_channel_t
*
fchan
=
ftdmchan
;
ftdmchan
->
call_data
=
NULL
;
ftdmchan
->
call_data
=
NULL
;
ftdmchan
->
pflags
=
0
;
ftdmchan
->
pflags
=
0
;
ftdm_channel_close
(
&
f
tdm
chan
);
ftdm_channel_close
(
&
fchan
);
if
(
peerchan
)
{
peerchan
->
call_data
=
NULL
;
peerchan
->
call_data
=
NULL
;
peerchan
->
pflags
=
0
;
peerchan
->
pflags
=
0
;
ftdm_channel_close
(
&
peerchan
);
ftdm_channel_close
(
&
peerchan
);
}
else
{
ftdm_log_chan_msg
(
ftdmchan
,
FTDM_LOG_ERROR
,
"Odd, no peer chan
\n
"
);
}
}
}
break
;
break
;
...
@@ -597,6 +603,8 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
...
@@ -597,6 +603,8 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
ftdm_log
(
FTDM_LOG_DEBUG
,
"Ignoring duplicated proceeding with callref %d
\n
"
,
crv
);
ftdm_log
(
FTDM_LOG_DEBUG
,
"Ignoring duplicated proceeding with callref %d
\n
"
,
crv
);
break
;
break
;
}
}
pcall
->
proceeding
=
1
;
peerpcall
=
tap_pri_get_pcall
(
pritap
,
NULL
);
peerpcall
=
tap_pri_get_pcall
(
pritap
,
NULL
);
if
(
!
peerpcall
)
{
if
(
!
peerpcall
)
{
ftdm_log
(
FTDM_LOG_ERROR
,
"Failed to get a free peer PRI passive call slot for callref %d in span %s, this is a bug!
\n
"
,
ftdm_log
(
FTDM_LOG_ERROR
,
"Failed to get a free peer PRI passive call slot for callref %d in span %s, this is a bug!
\n
"
,
...
@@ -625,7 +633,6 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
...
@@ -625,7 +633,6 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
pritap
->
span
->
name
,
PRI_SPAN
(
e
->
proceeding
.
channel
),
PRI_CHANNEL
(
e
->
proceeding
.
channel
),
crv
);
pritap
->
span
->
name
,
PRI_SPAN
(
e
->
proceeding
.
channel
),
PRI_CHANNEL
(
e
->
proceeding
.
channel
),
crv
);
break
;
break
;
}
}
pcall
->
fchan
=
fchan
;
peerfchan
=
tap_pri_get_fchan
(
peertap
,
pcall
,
e
->
proceeding
.
channel
);
peerfchan
=
tap_pri_get_fchan
(
peertap
,
pcall
,
e
->
proceeding
.
channel
);
if
(
!
peerfchan
)
{
if
(
!
peerfchan
)
{
...
@@ -633,11 +640,13 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
...
@@ -633,11 +640,13 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
peertap
->
span
->
name
,
PRI_SPAN
(
e
->
proceeding
.
channel
),
PRI_CHANNEL
(
e
->
proceeding
.
channel
),
crv
);
peertap
->
span
->
name
,
PRI_SPAN
(
e
->
proceeding
.
channel
),
PRI_CHANNEL
(
e
->
proceeding
.
channel
),
crv
);
break
;
break
;
}
}
pcall
->
fchan
=
fchan
;
peerpcall
->
fchan
=
fchan
;
peerpcall
->
fchan
=
fchan
;
fchan
->
call_data
=
peerfchan
;
fchan
->
call_data
=
peerfchan
;
peerfchan
->
call_data
=
fchan
;
peerfchan
->
call_data
=
fchan
;
ftdm_log_chan_msg
(
pcall
->
fchan
,
FTDM_LOG_NOTICE
,
"Starting new tapped call
\n
"
);
ftdm_set_state_locked
(
fchan
,
FTDM_CHANNEL_STATE_RING
);
ftdm_set_state_locked
(
fchan
,
FTDM_CHANNEL_STATE_RING
);
break
;
break
;
...
@@ -651,6 +660,12 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
...
@@ -651,6 +660,12 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
pritap
->
span
->
name
,
PRI_SPAN
(
e
->
proceeding
.
channel
),
PRI_CHANNEL
(
e
->
proceeding
.
channel
),
crv
);
pritap
->
span
->
name
,
PRI_SPAN
(
e
->
proceeding
.
channel
),
PRI_CHANNEL
(
e
->
proceeding
.
channel
),
crv
);
break
;
break
;
}
}
if
(
!
pcall
->
fchan
)
{
ftdm_log
(
FTDM_LOG_ERROR
,
"Received answer in channel %s:%d:%d for callref %d but we never got a channel"
,
pritap
->
span
->
name
,
PRI_SPAN
(
e
->
proceeding
.
channel
),
PRI_CHANNEL
(
e
->
proceeding
.
channel
),
crv
);
break
;
}
ftdm_log_chan
(
pcall
->
fchan
,
FTDM_LOG_NOTICE
,
"Tapped call was answered in state %s
\n
"
,
ftdm_channel_state2str
(
pcall
->
fchan
->
state
));
ftdm_log_chan
(
pcall
->
fchan
,
FTDM_LOG_NOTICE
,
"Tapped call was answered in state %s
\n
"
,
ftdm_channel_state2str
(
pcall
->
fchan
->
state
));
ftdm_set_pflag_locked
(
pcall
->
fchan
,
PRITAP_NETWORK_ANSWER
);
ftdm_set_pflag_locked
(
pcall
->
fchan
,
PRITAP_NETWORK_ANSWER
);
ftdm_set_state_locked
(
pcall
->
fchan
,
FTDM_CHANNEL_STATE_UP
);
ftdm_set_state_locked
(
pcall
->
fchan
,
FTDM_CHANNEL_STATE_UP
);
...
@@ -668,6 +683,13 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
...
@@ -668,6 +683,13 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
break
;
break
;
}
}
if
(
!
pcall
->
fchan
)
{
ftdm_log
(
FTDM_LOG_DEBUG
,
"ignoring hangup in channel %s:%d:%d for callref %d since we never got a channel"
,
pritap
->
span
->
name
,
PRI_SPAN
(
e
->
proceeding
.
channel
),
PRI_CHANNEL
(
e
->
proceeding
.
channel
),
crv
);
break
;
}
fchan
=
pcall
->
fchan
;
fchan
=
pcall
->
fchan
;
ftdm_set_state_locked
(
fchan
,
FTDM_CHANNEL_STATE_TERMINATING
);
ftdm_set_state_locked
(
fchan
,
FTDM_CHANNEL_STATE_TERMINATING
);
break
;
break
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论