Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
2df26cf7
提交
2df26cf7
authored
8月 10, 2012
作者:
Kapil Gupta
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
hardcoding t38 sdp fields...
上级
f6e5cae7
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
46 行增加
和
7 行删除
+46
-7
media_gateway_cli.c
src/mod/endpoints/mod_media_gateway/media_gateway_cli.c
+1
-1
media_gateway_utils.c
src/mod/endpoints/mod_media_gateway/media_gateway_utils.c
+45
-6
没有找到文件。
src/mod/endpoints/mod_media_gateway/media_gateway_cli.c
浏览文件 @
2df26cf7
...
...
@@ -279,7 +279,7 @@ void megaco_cli_print_usage(switch_stream_handle_t *stream)
stream
->
write_function
(
stream
,
"mg profile <profile-name> send cng <term-id>
\n
"
);
stream
->
write_function
(
stream
,
"mg profile <profile-name> show activecalls
\n
"
);
stream
->
write_function
(
stream
,
"mg profile <profile-name> show termstatus <term-id>
\n
"
);
stream
->
write_function
(
stream
,
"mg profile <profile-name> show alltermstatus
<term-id>
\n
"
);
stream
->
write_function
(
stream
,
"mg profile <profile-name> show alltermstatus
\n
"
);
stream
->
write_function
(
stream
,
"Usage: Logging
\n
"
);
stream
->
write_function
(
stream
,
"mg logging enable
\n
"
);
...
...
src/mod/endpoints/mod_media_gateway/media_gateway_utils.c
浏览文件 @
2df26cf7
...
...
@@ -452,24 +452,26 @@ void mgco_fill_t38_sdp_attr(CmSdpAttrSet *s, mg_termination_t* term, CmMemListCp
"CM_SDP_ATTR_T38_FAX: TYPE not present
\n
"
);
break
;
}
printf
(
"f->u.unknown.name.val[%s, len=%d]
\n
"
,
f
->
u
.
unknown
.
name
.
val
,
f
->
u
.
unknown
.
name
.
len
);
/* NOTE - Ideally i should not change ,whatever is coming we can return..due to
trillium issue forcefully coping the data...will remove once get trillium fix*/
if
(
f
->
type
.
val
==
CM_SDP_ATTR_T38_FAX_UNKNOWN
)
{
if
((
i
==
0
)
&&
term
->
u
.
rtp
.
t38_options
->
T38FaxRateManagement
){
if
(
!
strncasecmp
((
char
*
)
f
->
u
.
unknown
.
name
.
val
,
"transferredTCF"
,
14
)
&&
term
->
u
.
rtp
.
t38_options
->
T38FaxRateManagement
){
printf
(
"KAPIL - adding FaxRateManagement
\n
"
);
MG_SET_TKNSTROSXL
((
f
->
u
.
unknown
.
name
),
strlen
(
"FaxRateManagement"
),
"FaxRateManagement"
,
memCp
);
MG_SET_TKNSTROSXL
((
f
->
u
.
unknown
.
val
),
strlen
(
term
->
u
.
rtp
.
t38_options
->
T38FaxRateManagement
),
term
->
u
.
rtp
.
t38_options
->
T38FaxRateManagement
,
memCp
);
}
if
((
i
==
1
)
&&
term
->
u
.
rtp
.
t38_options
->
T38FaxUdpEC
){
}
else
if
((
!
strncasecmp
((
char
*
)
f
->
u
.
unknown
.
name
.
val
,
"t38UDPRedundancy"
,
16
))
&&
term
->
u
.
rtp
.
t38_options
->
T38FaxUdpEC
){
printf
(
"KAPIL - adding FaxUdpEC
\n
"
);
MG_SET_TKNSTROSXL
((
f
->
u
.
unknown
.
name
),
strlen
(
"FaxUdpEC"
),
"FaxUdpEC"
,
memCp
);
MG_SET_TKNSTROSXL
((
f
->
u
.
unknown
.
val
),
strlen
(
term
->
u
.
rtp
.
t38_options
->
T38FaxUdpEC
),
term
->
u
.
rtp
.
t38_options
->
T38FaxUdpEC
,
memCp
);
}
if
((
i
==
2
)){
}
else
if
(
!
strncasecmp
((
char
*
)
f
->
u
.
unknown
.
name
.
val
,
"14400"
,
5
)){
char
buf
[
10
]
=
{
0
};
printf
(
"KAPIL - adding MaxBitRate
\n
"
);
sprintf
(
buf
,
"%d"
,
term
->
u
.
rtp
.
t38_options
->
T38MaxBitRate
);
MG_SET_TKNSTROSXL
((
f
->
u
.
unknown
.
name
),
strlen
(
"MaxBitRate"
),
"MaxBitRate"
,
memCp
);
MG_SET_TKNSTROSXL
((
f
->
u
.
unknown
.
val
),
...
...
@@ -2065,16 +2067,19 @@ switch_status_t mg_rem_unsupported_codecs (megaco_profile_t* mg_profile, mg_term
/*****************************************************************************************************************************/
switch_status_t
mg_build_sdp
(
MgMgcoMediaDesc
*
out
,
MgMgcoMediaDesc
*
inc
,
megaco_profile_t
*
mg_profile
,
mg_termination_t
*
term
,
CmMemListCp
*
memCp
)
{
CmSdpU8OrNil
*
fmt
=
NULL
;
CmSdpInfoSet
*
psdp
=
NULL
;
CmSdpInfoSet
*
pRsdp
=
NULL
;
char
*
ipAddress
[
4
];
int
i
=
0x00
;
int
j
=
0x00
;
int
choose_codec
=
0x00
;
int
k
=
0x00
;
MgMgcoLocalDesc
*
local
=
NULL
;
MgMgcoLocalDesc
*
remote
=
NULL
;
int
fresh_sdp
=
0x00
;
char
*
dup
=
NULL
;
CmSdpMedProtoFmts
*
format
=
NULL
;
...
...
@@ -2107,17 +2112,51 @@ switch_status_t mg_build_sdp(MgMgcoMediaDesc* out, MgMgcoMediaDesc* inc, megaco_
for
(
i
=
0
;
i
<
out
->
num
.
val
;
i
++
)
{
if
(
MGT_MEDIAPAR_LOCAL
==
out
->
parms
[
i
]
->
type
.
val
)
{
local
=
&
out
->
parms
[
i
]
->
u
.
local
;
break
;
}
else
if
(
MGT_MEDIAPAR_STRPAR
==
out
->
parms
[
i
]
->
type
.
val
){
MgMgcoStreamDesc
*
stream
=
&
out
->
parms
[
i
]
->
u
.
stream
;
if
((
NOTPRSNT
!=
stream
->
sl
.
pres
.
pres
)
&&
(
NOTPRSNT
!=
stream
->
sl
.
local
.
pres
.
pres
)){
local
=
&
stream
->
sl
.
local
;
}
}
else
if
(
MGT_MEDIAPAR_REMOTE
==
out
->
parms
[
i
]
->
type
.
val
)
{
remote
=
&
out
->
parms
[
i
]
->
u
.
remote
;
}
}
}
}
if
(
remote
&&
(
NOTPRSNT
!=
remote
->
sdp
.
numComp
.
pres
)
&&
(
0
!=
remote
->
sdp
.
numComp
.
val
)){
pRsdp
=
&
(
remote
->
sdp
);
for
(
i
=
0
;
i
<
pRsdp
->
numComp
.
val
;
i
++
)
{
/* fill media descriptors */
{
CmSdpMediaDescSet
*
med
=
&
pRsdp
->
info
[
pRsdp
->
numComp
.
val
-
1
]
->
mediaDescSet
;
CmSdpMediaDesc
*
media
;
if
((
NOTPRSNT
!=
med
->
numComp
.
pres
)
||
(
0
!=
med
->
numComp
.
val
)){
for
(
j
=
0
;
j
<
med
->
numComp
.
val
;
j
++
){
media
=
med
->
mediaDesc
[
j
];
/* check for codec */
if
((
NOTPRSNT
!=
media
->
field
.
par
.
numProtFmts
.
pres
)
||
(
0
!=
media
->
field
.
par
.
numProtFmts
.
val
)){
for
(
k
=
0
;
k
<
media
->
field
.
par
.
numProtFmts
.
val
;
k
++
){
format
=
media
->
field
.
par
.
pflst
[
k
];
if
((
NOTPRSNT
!=
format
->
protType
.
pres
)
&&
(
CM_SDP_MEDIA_PROTO_UDPTL
==
format
->
protType
.
val
)){
/* ideally whatever is received we can send back *
* due to issue in trillium , we need to manually copy the fields now */
mgco_fill_t38_sdp_attr
(
&
media
->
attrSet
,
term
,
memCp
);
}
}
}
}
}
}
/**********************************************************************************************************************************/
}
}
if
(
!
local
||
(
NOTPRSNT
==
local
->
sdp
.
numComp
.
pres
)
||
(
0
==
local
->
sdp
.
numComp
.
val
)){
/* local sdp is not part of media descriptor, then add local sdp*/
mg_add_local_descriptor
(
out
,
mg_profile
,
term
,
memCp
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论