Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
b8fb8acc
提交
b8fb8acc
authored
11月 25, 2010
作者:
David Yat Sin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
freetdm: ISDN allow change state from PROCEED to UP
上级
7433a1e5
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
13 行增加
和
8 行删除
+13
-8
ftdm_io.c
libs/freetdm/src/ftdm_io.c
+6
-1
ftmod_sangoma_isdn.c
...freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
+2
-1
ftmod_sangoma_isdn_stack_hndl.c
.../ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
+5
-6
没有找到文件。
libs/freetdm/src/ftdm_io.c
浏览文件 @
b8fb8acc
...
@@ -2033,6 +2033,11 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_answer(const char *file, const char
...
@@ -2033,6 +2033,11 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_answer(const char *file, const char
goto
done
;
goto
done
;
}
}
#if 0
/* DAVIDY - We will fail RFC's if we do that, but some modules apart from ftmod_sangoma_isdn
* expect the call to always to go PROGRESS and PROGRESS MEDIA state before going to UP, so
* remove this only in netborder branch for now */
if (ftdmchan->state < FTDM_CHANNEL_STATE_PROGRESS) {
if (ftdmchan->state < FTDM_CHANNEL_STATE_PROGRESS) {
ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROGRESS, 1);
ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROGRESS, 1);
}
}
...
@@ -2052,7 +2057,7 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_answer(const char *file, const char
...
@@ -2052,7 +2057,7 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_answer(const char *file, const char
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Ignoring answer because the call has moved to TERMINATING while we're moving to UP\n");
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Ignoring answer because the call has moved to TERMINATING while we're moving to UP\n");
goto done;
goto done;
}
}
#endif
ftdm_channel_set_state
(
file
,
func
,
line
,
ftdmchan
,
FTDM_CHANNEL_STATE_UP
,
1
);
ftdm_channel_set_state
(
file
,
func
,
line
,
ftdmchan
,
FTDM_CHANNEL_STATE_UP
,
1
);
done
:
done
:
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
浏览文件 @
b8fb8acc
...
@@ -121,7 +121,8 @@ ftdm_state_map_t sangoma_isdn_state_map = {
...
@@ -121,7 +121,8 @@ ftdm_state_map_t sangoma_isdn_state_map = {
ZSD_INBOUND
,
ZSD_INBOUND
,
ZSM_UNACCEPTABLE
,
ZSM_UNACCEPTABLE
,
{
FTDM_CHANNEL_STATE_PROCEED
,
FTDM_END
},
{
FTDM_CHANNEL_STATE_PROCEED
,
FTDM_END
},
{
FTDM_CHANNEL_STATE_TERMINATING
,
FTDM_CHANNEL_STATE_HANGUP
,
FTDM_CHANNEL_STATE_RINGING
,
FTDM_CHANNEL_STATE_PROGRESS
,
FTDM_CHANNEL_STATE_PROGRESS_MEDIA
,
FTDM_END
}
{
FTDM_CHANNEL_STATE_TERMINATING
,
FTDM_CHANNEL_STATE_HANGUP
,
FTDM_CHANNEL_STATE_RINGING
,
FTDM_CHANNEL_STATE_PROGRESS
,
FTDM_CHANNEL_STATE_PROGRESS_MEDIA
,
FTDM_CHANNEL_STATE_UP
,
FTDM_END
}
},
},
{
{
ZSD_INBOUND
,
ZSD_INBOUND
,
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
浏览文件 @
b8fb8acc
...
@@ -377,18 +377,17 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
...
@@ -377,18 +377,17 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
switch
(
ftdmchan
->
state
)
{
switch
(
ftdmchan
->
state
)
{
case
FTDM_CHANNEL_STATE_DIALING
:
case
FTDM_CHANNEL_STATE_DIALING
:
if
(
evntType
==
MI_CALLPROC
)
{
if
(
cnStEvnt
->
progInd
.
eh
.
pres
&&
cnStEvnt
->
progInd
.
progDesc
.
val
==
IN_PD_IBAVAIL
)
{
ftdm_set_state
(
ftdmchan
,
FTDM_CHANNEL_STATE_PROCEED
);
}
else
if
(
evntType
==
MI_PROGRESS
||
(
cnStEvnt
->
progInd
.
eh
.
pres
&&
cnStEvnt
->
progInd
.
progDesc
.
val
==
IN_PD_IBAVAIL
))
{
ftdm_set_state
(
ftdmchan
,
FTDM_CHANNEL_STATE_PROGRESS_MEDIA
);
ftdm_set_state
(
ftdmchan
,
FTDM_CHANNEL_STATE_PROGRESS_MEDIA
);
}
else
if
(
evntType
==
MI_CALLPROC
)
{
ftdm_set_state
(
ftdmchan
,
FTDM_CHANNEL_STATE_PROCEED
);
}
else
{
}
else
{
ftdm_set_state
(
ftdmchan
,
FTDM_CHANNEL_STATE_PROGRESS
);
ftdm_set_state
(
ftdmchan
,
FTDM_CHANNEL_STATE_PROGRESS
);
}
}
break
;
break
;
case
FTDM_CHANNEL_STATE_PROCEED
:
case
FTDM_CHANNEL_STATE_PROGRESS
:
case
FTDM_CHANNEL_STATE_PROGRESS
:
if
(
evntType
==
MI_PROGRESS
||
if
(
cnStEvnt
->
progInd
.
eh
.
pres
&&
cnStEvnt
->
progInd
.
progDesc
.
val
==
IN_PD_IBAVAIL
)
{
(
cnStEvnt
->
progInd
.
eh
.
pres
&&
cnStEvnt
->
progInd
.
progDesc
.
val
==
IN_PD_IBAVAIL
))
{
ftdm_set_state
(
ftdmchan
,
FTDM_CHANNEL_STATE_PROGRESS_MEDIA
);
ftdm_set_state
(
ftdmchan
,
FTDM_CHANNEL_STATE_PROGRESS_MEDIA
);
}
}
break
;
break
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论