Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
4e020e2f
提交
4e020e2f
authored
8月 03, 2011
作者:
David Yat Sin
浏览文件
操作
浏览文件
下载
差异文件
Merge remote branch 'smgfs/master'
上级
5d37bc94
473fd0ce
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
59 行增加
和
10 行删除
+59
-10
ftmod_sangoma_isdn.h
...freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
+2
-1
ftmod_sangoma_isdn_stack_hndl.c
.../ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
+7
-3
ftmod_sangoma_isdn_stack_out.c
...c/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
+26
-4
ftmod_sangoma_isdn_stack_rcv.c
...c/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
+2
-1
ftmod_sangoma_isdn_support.c
...src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
+8
-0
ftmod_sangoma_isdn_trace.c
...m/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
+9
-1
ftmod_sangoma_isdn_trace.h
...m/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h
+5
-0
没有找到文件。
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
浏览文件 @
4e020e2f
...
@@ -380,6 +380,7 @@ void sngisdn_snd_setup_ack(ftdm_channel_t *ftdmchan);
...
@@ -380,6 +380,7 @@ void sngisdn_snd_setup_ack(ftdm_channel_t *ftdmchan);
void
sngisdn_snd_proceed
(
ftdm_channel_t
*
ftdmchan
,
ftdm_sngisdn_progind_t
prog_ind
);
void
sngisdn_snd_proceed
(
ftdm_channel_t
*
ftdmchan
,
ftdm_sngisdn_progind_t
prog_ind
);
void
sngisdn_snd_progress
(
ftdm_channel_t
*
ftdmchan
,
ftdm_sngisdn_progind_t
prog_ind
);
void
sngisdn_snd_progress
(
ftdm_channel_t
*
ftdmchan
,
ftdm_sngisdn_progind_t
prog_ind
);
void
sngisdn_snd_alert
(
ftdm_channel_t
*
ftdmchan
,
ftdm_sngisdn_progind_t
prog_ind
);
void
sngisdn_snd_alert
(
ftdm_channel_t
*
ftdmchan
,
ftdm_sngisdn_progind_t
prog_ind
);
void
sngisdn_snd_notify_req
(
ftdm_channel_t
*
ftdmchan
);
void
sngisdn_snd_connect
(
ftdm_channel_t
*
ftdmchan
);
void
sngisdn_snd_connect
(
ftdm_channel_t
*
ftdmchan
);
void
sngisdn_snd_disconnect
(
ftdm_channel_t
*
ftdmchan
);
void
sngisdn_snd_disconnect
(
ftdm_channel_t
*
ftdmchan
);
void
sngisdn_snd_release
(
ftdm_channel_t
*
ftdmchan
,
uint8_t
glare
);
void
sngisdn_snd_release
(
ftdm_channel_t
*
ftdmchan
,
uint8_t
glare
);
...
@@ -480,7 +481,7 @@ ftdm_status_t set_facility_ie(ftdm_channel_t *ftdmchan, FacilityStr *facilityStr
...
@@ -480,7 +481,7 @@ ftdm_status_t set_facility_ie(ftdm_channel_t *ftdmchan, FacilityStr *facilityStr
ftdm_status_t
set_facility_ie_str
(
ftdm_channel_t
*
ftdmchan
,
uint8_t
*
data
,
uint8_t
*
data_len
);
ftdm_status_t
set_facility_ie_str
(
ftdm_channel_t
*
ftdmchan
,
uint8_t
*
data
,
uint8_t
*
data_len
);
ftdm_status_t
set_user_to_user_ie
(
ftdm_channel_t
*
ftdmchan
,
UsrUsr
*
usrUsr
);
ftdm_status_t
set_user_to_user_ie
(
ftdm_channel_t
*
ftdmchan
,
UsrUsr
*
usrUsr
);
ftdm_status_t
set_cause_ie
(
ftdm_channel_t
*
ftdmchan
,
CauseDgn
*
causeDgn
);
ftdm_status_t
set_cause_ie
(
ftdm_channel_t
*
ftdmchan
,
CauseDgn
*
causeDgn
);
ftdm_status_t
set_not_ind_ie
(
ftdm_channel_t
*
ftdmchan
,
NotInd
*
notInd
);
ftdm_status_t
sngisdn_add_var
(
sngisdn_chan_data_t
*
sngisdn_info
,
const
char
*
var
,
const
char
*
val
);
ftdm_status_t
sngisdn_add_var
(
sngisdn_chan_data_t
*
sngisdn_info
,
const
char
*
var
,
const
char
*
val
);
ftdm_status_t
sngisdn_add_raw_data
(
sngisdn_chan_data_t
*
sngisdn_info
,
uint8_t
*
data
,
ftdm_size_t
data_len
);
ftdm_status_t
sngisdn_add_raw_data
(
sngisdn_chan_data_t
*
sngisdn_info
,
uint8_t
*
data
,
ftdm_size_t
data_len
);
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
浏览文件 @
4e020e2f
...
@@ -361,8 +361,9 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
...
@@ -361,8 +361,9 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
(
evntType
==
MI_CALLPROC
)
?
"PROCEED"
:
(
evntType
==
MI_CALLPROC
)
?
"PROCEED"
:
(
evntType
==
MI_PROGRESS
)
?
"PROGRESS"
:
(
evntType
==
MI_PROGRESS
)
?
"PROGRESS"
:
(
evntType
==
MI_SETUPACK
)
?
"SETUP ACK"
:
(
evntType
==
MI_SETUPACK
)
?
"SETUP ACK"
:
(
evntType
==
MI_INFO
)
?
"INFO"
:
"UNKNOWN"
,
(
evntType
==
MI_NOTIFY
)
?
"NOTIFY"
:
suId
,
suInstId
,
spInstId
,
ces
);
(
evntType
==
MI_INFO
)
?
"INFO"
:
"UNKNOWN"
,
suId
,
suInstId
,
spInstId
,
ces
);
switch
(
evntType
)
{
switch
(
evntType
)
{
case
MI_CALLPROC
:
case
MI_CALLPROC
:
...
@@ -493,7 +494,10 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
...
@@ -493,7 +494,10 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
break
;
break
;
}
}
}
}
break
;
case
MI_NOTIFY
:
ftdm_log_chan
(
ftdmchan
,
FTDM_LOG_DEBUG
,
"Processing NOTIFY (suId:%u suInstId:%u spInstId:%u)
\n
"
,
suId
,
suInstId
,
spInstId
);
/* Do nothing */
break
;
break
;
default:
default:
ftdm_log_chan_msg
(
ftdmchan
,
FTDM_LOG_WARNING
,
"Unhandled STATUS event
\n
"
);
ftdm_log_chan_msg
(
ftdmchan
,
FTDM_LOG_WARNING
,
"Unhandled STATUS event
\n
"
);
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
浏览文件 @
4e020e2f
...
@@ -317,11 +317,7 @@ void sngisdn_snd_info_req(ftdm_channel_t *ftdmchan)
...
@@ -317,11 +317,7 @@ void sngisdn_snd_info_req(ftdm_channel_t *ftdmchan)
}
}
memset
(
&
cnStEvnt
,
0
,
sizeof
(
cnStEvnt
));
memset
(
&
cnStEvnt
,
0
,
sizeof
(
cnStEvnt
));
//ftdm_log_chan_msg(ftdmchan, FTDM_LOG_INFO, "Sending INFO REQ\n");
ftdm_log_chan
(
ftdmchan
,
FTDM_LOG_INFO
,
"Sending INFO REQ (suId:%d dchan:%d ces:%d)
\n
"
,
signal_data
->
cc_id
,
signal_data
->
dchan_id
,
sngisdn_info
->
ces
);
ftdm_log_chan
(
ftdmchan
,
FTDM_LOG_INFO
,
"Sending INFO REQ (suId:%d dchan:%d ces:%d)
\n
"
,
signal_data
->
cc_id
,
signal_data
->
dchan_id
,
sngisdn_info
->
ces
);
if
(
sng_isdn_con_status
(
signal_data
->
cc_id
,
0
,
0
,
&
cnStEvnt
,
MI_INFO
,
signal_data
->
dchan_id
,
sngisdn_info
->
ces
))
{
if
(
sng_isdn_con_status
(
signal_data
->
cc_id
,
0
,
0
,
&
cnStEvnt
,
MI_INFO
,
signal_data
->
dchan_id
,
sngisdn_info
->
ces
))
{
...
@@ -330,6 +326,32 @@ void sngisdn_snd_info_req(ftdm_channel_t *ftdmchan)
...
@@ -330,6 +326,32 @@ void sngisdn_snd_info_req(ftdm_channel_t *ftdmchan)
return
;
return
;
}
}
void
sngisdn_snd_notify_req
(
ftdm_channel_t
*
ftdmchan
)
{
CnStEvnt
cnStEvnt
;
sngisdn_chan_data_t
*
sngisdn_info
=
(
sngisdn_chan_data_t
*
)
ftdmchan
->
call_data
;
sngisdn_span_data_t
*
signal_data
=
(
sngisdn_span_data_t
*
)
ftdmchan
->
span
->
signal_data
;
if
(
!
sngisdn_info
->
suInstId
||
!
sngisdn_info
->
spInstId
)
{
ftdm_log_chan
(
ftdmchan
,
FTDM_LOG_ERROR
,
"Sending NOTIFY, but no call data, aborting (suId:%d suInstId:%u spInstId:%u)
\n
"
,
signal_data
->
cc_id
,
sngisdn_info
->
suInstId
,
sngisdn_info
->
spInstId
);
sngisdn_set_flag
(
sngisdn_info
,
FLAG_LOCAL_ABORT
);
ftdm_set_state_locked
(
ftdmchan
,
FTDM_CHANNEL_STATE_TERMINATING
);
return
;
}
memset
(
&
cnStEvnt
,
0
,
sizeof
(
cnStEvnt
));
set_not_ind_ie
(
ftdmchan
,
&
cnStEvnt
.
notInd
);
ftdm_log_chan
(
ftdmchan
,
FTDM_LOG_INFO
,
"Sending NOTIFY (suId:%d suInstId:%u spInstId:%u dchan:%d ces:%d)
\n
"
,
signal_data
->
cc_id
,
sngisdn_info
->
suInstId
,
sngisdn_info
->
spInstId
,
signal_data
->
dchan_id
,
sngisdn_info
->
ces
);
if
(
sng_isdn_con_status
(
signal_data
->
cc_id
,
sngisdn_info
->
suInstId
,
sngisdn_info
->
spInstId
,
&
cnStEvnt
,
MI_NOTIFY
,
signal_data
->
dchan_id
,
sngisdn_info
->
ces
))
{
ftdm_log_chan_msg
(
ftdmchan
,
FTDM_LOG_CRIT
,
"stack refused NOTIFY request
\n
"
);
}
return
;
}
void
sngisdn_snd_status_enq
(
ftdm_channel_t
*
ftdmchan
)
void
sngisdn_snd_status_enq
(
ftdm_channel_t
*
ftdmchan
)
{
{
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
浏览文件 @
4e020e2f
...
@@ -168,7 +168,8 @@ void sngisdn_rcv_cnst_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, C
...
@@ -168,7 +168,8 @@ void sngisdn_rcv_cnst_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, C
(
evntType
==
MI_CALLPROC
)
?
"PROCEED"
:
(
evntType
==
MI_CALLPROC
)
?
"PROCEED"
:
(
evntType
==
MI_PROGRESS
)
?
"PROGRESS"
:
(
evntType
==
MI_PROGRESS
)
?
"PROGRESS"
:
(
evntType
==
MI_SETUPACK
)
?
"SETUP ACK"
:
(
evntType
==
MI_SETUPACK
)
?
"SETUP ACK"
:
(
evntType
==
MI_INFO
)
?
"INFO"
:
"UNKNOWN"
,
(
evntType
==
MI_NOTIFY
)
?
"NOTIFY"
:
(
evntType
==
MI_INFO
)
?
"INFO"
:
"UNKNOWN"
,
suId
,
suInstId
,
spInstId
,
ces
);
suId
,
suInstId
,
spInstId
,
ces
);
sngisdn_event
=
ftdm_malloc
(
sizeof
(
*
sngisdn_event
));
sngisdn_event
=
ftdm_malloc
(
sizeof
(
*
sngisdn_event
));
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
浏览文件 @
4e020e2f
...
@@ -1021,6 +1021,14 @@ ftdm_status_t set_restart_ind_ie(ftdm_channel_t *ftdmchan, RstInd *rstInd)
...
@@ -1021,6 +1021,14 @@ ftdm_status_t set_restart_ind_ie(ftdm_channel_t *ftdmchan, RstInd *rstInd)
return
FTDM_SUCCESS
;
return
FTDM_SUCCESS
;
}
}
ftdm_status_t
set_not_ind_ie
(
ftdm_channel_t
*
ftdmchan
,
NotInd
*
notInd
)
{
notInd
->
eh
.
pres
=
PRSNT_NODEF
;
notInd
->
notDesc
.
pres
=
PRSNT_NODEF
;
notInd
->
notDesc
.
val
=
0x71
;
/* Call information event */
return
FTDM_SUCCESS
;
}
void
sngisdn_t3_timeout
(
void
*
p_sngisdn_info
)
void
sngisdn_t3_timeout
(
void
*
p_sngisdn_info
)
{
{
sngisdn_chan_data_t
*
sngisdn_info
=
(
sngisdn_chan_data_t
*
)
p_sngisdn_info
;
sngisdn_chan_data_t
*
sngisdn_info
=
(
sngisdn_chan_data_t
*
)
p_sngisdn_info
;
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
浏览文件 @
4e020e2f
...
@@ -737,8 +737,16 @@ uint32_t sngisdn_decode_ie(char *str, uint32_t *str_len, uint8_t current_codeset
...
@@ -737,8 +737,16 @@ uint32_t sngisdn_decode_ie(char *str, uint32_t *str_len, uint8_t current_codeset
calling_subaddr_string
,
(
j
-
1
),
get_code_2_str
(
type
,
dcodQ931TypeOfSubaddressTable
),
type
);
calling_subaddr_string
,
(
j
-
1
),
get_code_2_str
(
type
,
dcodQ931TypeOfSubaddressTable
),
type
);
}
}
break
;
break
;
case
PROT_Q931_IE_REDIRECTION_NUMBER
:
case
PROT_Q931_IE_NOTIFICATION_IND
:
case
PROT_Q931_IE_NOTIFICATION_IND
:
{
uint8_t
desc
;
desc
=
get_bits
(
OCTET
(
3
),
1
,
7
);
*
str_len
+=
sprintf
(
&
str
[
*
str_len
],
"%s (%d)
\n
"
,
get_code_2_str
(
desc
,
dcodQ931NotificationIndTable
),
desc
);
}
break
;
case
PROT_Q931_IE_REDIRECTION_NUMBER
:
case
PROT_Q931_IE_DATE_TIME
:
case
PROT_Q931_IE_DATE_TIME
:
case
PROT_Q931_IE_INFORMATION_REQUEST
:
case
PROT_Q931_IE_INFORMATION_REQUEST
:
case
PROT_Q931_IE_SIGNAL
:
case
PROT_Q931_IE_SIGNAL
:
...
...
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h
浏览文件 @
4e020e2f
...
@@ -591,4 +591,9 @@ struct code2str dcodQ931AssocInfoTable[] = {
...
@@ -591,4 +591,9 @@ struct code2str dcodQ931AssocInfoTable[] = {
{
-
1
,
"Invalid"
},
{
-
1
,
"Invalid"
},
};
};
struct
code2str
dcodQ931NotificationIndTable
[]
=
{
{
0x71
,
"Call Information/event"
},
{
-
1
,
"Invalid"
},
};
#endif
/* __FTMOD_SANGOMA_ISDN_TRACE_H__ */
#endif
/* __FTMOD_SANGOMA_ISDN_TRACE_H__ */
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论