Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
9b73c808
提交
9b73c808
authored
7月 18, 2012
作者:
Kapil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
adding MODIFY command handler API
上级
62787362
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
268 行增加
和
1 行删除
+268
-1
media_gateway_cmd_handler.c
...d/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
+265
-0
media_gateway_stack.h
src/mod/endpoints/mod_media_gateway/media_gateway_stack.h
+2
-1
mod_media_gateway.c
src/mod/endpoints/mod_media_gateway/mod_media_gateway.c
+1
-0
没有找到文件。
src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
浏览文件 @
9b73c808
...
@@ -279,6 +279,271 @@ error:
...
@@ -279,6 +279,271 @@ error:
return
SWITCH_STATUS_FALSE
;
return
SWITCH_STATUS_FALSE
;
}
}
/*****************************************************************************************************************************/
/*
*
* Fun: handle_mg_modify_cmd
*
* Desc: this api will handle the Modify request received from MG stack
*
*
*/
switch_status_t
handle_mg_modify_cmd
(
megaco_profile_t
*
mg_profile
,
MgMgcoCommand
*
inc_cmd
)
{
MgMgcoContextId
*
ctxtId
;
int
descId
;
MgStr
errTxt
;
MgMgcoInd
*
mgErr
;
MgMgcoTermId
*
termId
;
MgMgcoTermIdLst
*
termLst
;
int
err_code
;
int
i
;
int
j
;
int
fmtCnt
;
MgMgcoAmmReq
*
cmd
=
&
inc_cmd
->
u
.
mgCmdInd
[
0
]
->
cmd
.
u
.
mod
;
U32
txn_id
=
inc_cmd
->
transId
.
val
;
MgMgcoLocalDesc
*
local
;
MgMgcoRemoteDesc
*
remote
;
MgMgcoLclCtlDesc
*
locCtl
;
CmSdpInfo
*
sdp
;
MgMgcoLocalParm
*
lclParm
;
MgMgcoTermStateDesc
*
tstate
;
CmSdpMedFmtRtpList
*
fmt_list
;
MgMgcoTermStateParm
*
tsp
;
TknU8
*
fmt
;
CmSdpMedProtoFmts
*
format
;
/********************************************************************/
ctxtId
=
&
inc_cmd
->
contextId
;
termLst
=
mg_get_term_id_list
(
inc_cmd
);
termId
=
termLst
->
terms
[
0
];
/* For Matt - termId->name.lcl.val - to get the termination id name */
/********************************************************************/
/* Validation *******************************************/
/********************************************************************/
/*** CHOOSE Context NOT ALLOWED ***/
if
((
NOTPRSNT
!=
ctxtId
->
type
.
pres
)
&&
(
MGT_CXTID_CHOOSE
==
ctxtId
->
type
.
val
))
{
switch_log_printf
(
SWITCH_CHANNEL_LOG_CLEAN
,
SWITCH_LOG_ERROR
,
"Modify request processing failure, CHOOSE Context should not present in Modify
\n
"
);
err_code
=
MGT_MGCO_RSP_CODE_INVLD_IDENTIFIER
;
mg_util_set_ctxt_string
(
&
errTxt
,
ctxtId
);
goto
error
;
}
/*** CHOOSE Termination NOT ALLOWED **/
else
if
((
NOTPRSNT
!=
termId
->
type
.
pres
)
&&
(
MGT_TERMID_CHOOSE
==
termId
->
type
.
val
))
{
switch_log_printf
(
SWITCH_CHANNEL_LOG_CLEAN
,
SWITCH_LOG_ERROR
,
"Modify request processing failure, CHOOSE Termination should not present in Modify
\n
"
);
err_code
=
MGT_MGCO_RSP_CODE_INVLD_IDENTIFIER
;
mg_util_set_term_string
(
&
errTxt
,
termId
);
goto
error
;
}
/********************************************************************/
/* context id presence check is already being done, we are here it means context-id requested in megaco message is present */
/* Matt - to check if we have terminations in the context */
/* TODO - Matt */
/* Matt to indicate ERROR - If there is no terminations in requested context */
/* Kapil - If there is an error - send response back to MG stack with MGT_MGCO_RSP_CODE_NO_TERM_CTXT error code*/
/********************************************************************/
for
(
descId
=
0
;
descId
<
cmd
->
dl
.
num
.
val
;
descId
++
)
{
switch
(
cmd
->
dl
.
descs
[
descId
]
->
type
.
val
)
{
case
MGT_MEDIADESC
:
{
int
mediaId
;
for
(
mediaId
=
0
;
mediaId
<
cmd
->
dl
.
descs
[
descId
]
->
u
.
media
.
num
.
val
;
mediaId
++
)
{
MgMgcoMediaPar
*
mediaPar
=
cmd
->
dl
.
descs
[
descId
]
->
u
.
media
.
parms
[
mediaId
];
switch
(
mediaPar
->
type
.
val
)
{
case
MGT_MEDIAPAR_LOCAL
:
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_CONSOLE
,
"MGT_MEDIAPAR_LOCAL"
);
/* Matt - check local descriptor processing */
local
=
&
mediaPar
->
u
.
local
;
sdp
=
local
->
sdp
.
info
[
0
];
for
(
i
=
0
;
i
<
sdp
->
mediaDescSet
.
numComp
.
val
;
i
++
)
{
/* sdp formats */
for
(
j
=
0
;
j
<
sdp
->
mediaDescSet
.
mediaDesc
[
i
]
->
field
.
par
.
numProtFmts
.
val
;
j
++
)
{
format
=
sdp
->
mediaDescSet
.
mediaDesc
[
i
]
->
field
.
par
.
pflst
[
j
];
/* Matt - format has field for T38 also */
if
((
format
->
protType
.
pres
!=
NOTPRSNT
)
&&
(
format
->
protType
.
val
==
CM_SDP_MEDIA_PROTO_RTP
))
{
/* protocol type RTP */
fmt_list
=
&
format
->
u
.
rtp
;
/* print format */
for
(
fmtCnt
=
0
;
fmtCnt
<
fmt_list
->
num
.
val
;
fmtCnt
++
){
fmt
=
&
fmt_list
->
fmts
[
i
]
->
val
;
if
(
fmt
->
pres
==
NOTPRSNT
)
continue
;
printf
(
"Format [%d]
\n
"
,
fmt
->
val
);
}
}
}
}
break
;
}
case
MGT_MEDIAPAR_REMOTE
:
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_CONSOLE
,
"MGT_MEDIAPAR_REMOTE"
);
/* Matt - check remote descriptor processing */
remote
=
&
mediaPar
->
u
.
remote
;
sdp
=
remote
->
sdp
.
info
[
0
];
/* for Matt - same like local descriptor */
break
;
}
case
MGT_MEDIAPAR_LOCCTL
:
{
/* Matt - check Local Control descriptor processing */
locCtl
=
&
mediaPar
->
u
.
locCtl
;
for
(
i
=
0
;
i
<
locCtl
->
num
.
val
;
i
++
){
lclParm
=
locCtl
->
parms
[
i
];
if
(
PRSNT_NODEF
==
lclParm
->
type
.
pres
){
switch
(
lclParm
->
type
.
val
)
{
case
MGT_LCLCTL_MODE
:
{
/* Mode Property */
printf
(
"MGT_LCLCTL_MODE - Mode value [%d]
\n
"
,
lclParm
->
u
.
mode
.
val
);
break
;
}
case
MGT_LCLCTL_RESVAL
:
{
/* Reserve Value */
printf
(
"MGT_LCLCTL_RESVAL: Reserve Value[%d]
\n
"
,
lclParm
->
u
.
resVal
.
val
);
break
;
}
case
MGT_LCLCTL_RESGRP
:
{
/* Reserve group */
printf
(
"MGT_LCLCTL_RESGRP: Reserve Group[%d]
\n
"
,
lclParm
->
u
.
resGrp
.
val
);
break
;
}
case
MGT_LCLCTL_PROPPARM
:
{
/* Properties (of a termination) */
/* Matt - See how we can apply this to a termination */
printf
(
"MGT_LCLCTL_PROPPARM:
\n
"
);
break
;
}
default:
printf
(
"Invalid local control descriptor type[%d]
\n
"
,
lclParm
->
type
.
val
);
break
;
}
}
}
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_CONSOLE
,
"MGT_MEDIAPAR_LOCCTL"
);
break
;
}
case
MGT_MEDIAPAR_TERMST
:
{
/* Matt - apply termination state descriptor */
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_CONSOLE
,
"MGT_MEDIAPAR_TERMST"
);
tstate
=
&
mediaPar
->
u
.
tstate
;
for
(
i
=
0
;
i
<
tstate
->
numComp
.
val
;
i
++
)
{
/* Matt to see how to apply below descriptors to a termination */
tsp
=
tstate
->
trmStPar
[
i
];
if
(
PRSNT_NODEF
==
tsp
->
type
.
pres
)
{
switch
(
tsp
->
type
.
val
)
{
case
MGT_TERMST_PROPLST
:
{
/* Matt to see how to apply properties to a termination */
/* Properties of a termination */
printf
(
"MGT_TERMST_PROPLST:
\n
"
);
break
;
}
case
MGT_TERMST_EVTBUFCTL
:
{
/* Event /buffer Control Properties */
printf
(
" MGT_TERMST_EVTBUFCTL: value[%d]
\n
"
,
tsp
->
u
.
evtBufCtl
.
val
);
break
;
}
case
MGT_TERMST_SVCST
:
{
/* Service State Properties */
printf
(
" MGT_TERMST_SVCST: value[%d]
\n
"
,
tsp
->
u
.
svcState
.
val
);
break
;
}
default:
printf
(
"Invalid termination state descriptor type[%d]
\n
"
,
tsp
->
type
.
val
);
break
;
}
}
}
break
;
}
case
MGT_MEDIAPAR_STRPAR
:
{
MgMgcoStreamDesc
*
mgStream
=
&
mediaPar
->
u
.
stream
;
if
(
mgStream
->
sl
.
remote
.
pres
.
pres
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"Got remote stream media description:
\n
"
);
mgco_print_sdp
(
&
mgStream
->
sl
.
remote
.
sdp
);
}
if
(
mgStream
->
sl
.
local
.
pres
.
pres
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"Got local stream media description:
\n
"
);
mgco_print_sdp
(
&
mgStream
->
sl
.
local
.
sdp
);
}
break
;
}
}
}
}
case
MGT_MODEMDESC
:
case
MGT_MUXDESC
:
case
MGT_REQEVTDESC
:
case
MGT_EVBUFDESC
:
case
MGT_SIGNALSDESC
:
case
MGT_DIGMAPDESC
:
case
MGT_AUDITDESC
:
case
MGT_STATSDESC
:
break
;
}
}
/* Matt - to provide the response SDP structure which needs to fill in Modify command response */
/* Matt - to indicate if there is any failure while processing add message */
/* Kapil - to return error if there is any failure based on Matt's indication */
/* Kapil - to fill the response structure and call the response API to send Modify response */
return
SWITCH_STATUS_SUCCESS
;
error:
if
(
SWITCH_STATUS_SUCCESS
==
mg_build_mgco_err_request
(
&
mgErr
,
txn_id
,
ctxtId
,
err_code
,
&
errTxt
))
{
sng_mgco_send_err
(
mg_profile
->
idx
,
mgErr
);
}
mg_free_cmd
(
cmd
);
return
SWITCH_STATUS_FALSE
;
}
/*****************************************************************************************************************************/
/*****************************************************************************************************************************/
/*
/*
*
*
...
...
src/mod/endpoints/mod_media_gateway/media_gateway_stack.h
浏览文件 @
9b73c808
...
@@ -133,7 +133,8 @@ int sng_mgco_mg_get_status(int elemId, MgMngmt* cfm, megaco_profile_t* mg_cfg, m
...
@@ -133,7 +133,8 @@ int sng_mgco_mg_get_status(int elemId, MgMngmt* cfm, megaco_profile_t* mg_cfg, m
switch_status_t
mg_send_end_of_axn
(
SuId
suId
,
MgMgcoTransId
*
transId
,
MgMgcoContextId
*
ctxtId
,
TknU32
*
peerId
);
switch_status_t
mg_send_end_of_axn
(
SuId
suId
,
MgMgcoTransId
*
transId
,
MgMgcoContextId
*
ctxtId
,
TknU32
*
peerId
);
void
mgco_print_sdp
(
CmSdpInfoSet
*
sdp
);
void
mgco_print_sdp
(
CmSdpInfoSet
*
sdp
);
void
mg_util_set_ctxt_string
(
MgStr
*
errTxt
,
MgMgcoContextId
*
ctxtId
);
void
mg_util_set_ctxt_string
(
MgStr
*
errTxt
,
MgMgcoContextId
*
ctxtId
);
switch_status_t
handle_mg_add_cmd
(
megaco_profile_t
*
mg_profile
,
MgMgcoCommand
*
addReq
);
switch_status_t
handle_mg_add_cmd
(
megaco_profile_t
*
mg_profile
,
MgMgcoCommand
*
cmd
);
switch_status_t
handle_mg_modify_cmd
(
megaco_profile_t
*
mg_profile
,
MgMgcoCommand
*
cmd
);
switch_status_t
mg_stack_free_mem
(
void
*
msg
);
switch_status_t
mg_stack_free_mem
(
void
*
msg
);
switch_status_t
mg_stack_alloc_mem
(
Ptr
*
_memPtr
,
Size
_memSize
);
switch_status_t
mg_stack_alloc_mem
(
Ptr
*
_memPtr
,
Size
_memSize
);
MgMgcoMediaDesc
*
get_default_media_desc
(
void
);
MgMgcoMediaDesc
*
get_default_media_desc
(
void
);
...
...
src/mod/endpoints/mod_media_gateway/mod_media_gateway.c
浏览文件 @
9b73c808
...
@@ -551,6 +551,7 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
...
@@ -551,6 +551,7 @@ void handle_mgco_cmd_ind(Pst *pst, SuId suId, MgMgcoCommand* cmd)
case
MGT_MODIFY
:
case
MGT_MODIFY
:
{
{
/*MgMgcoAmmReq *addReq = &cmdReq->cmd.u.mod;*/
/*MgMgcoAmmReq *addReq = &cmdReq->cmd.u.mod;*/
handle_mg_modify_cmd
(
mg_profile
,
cmd
);
mg_send_modify_rsp
(
suId
,
cmd
);
mg_send_modify_rsp
(
suId
,
cmd
);
break
;
break
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论