Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
d673f691
提交
d673f691
authored
9月 05, 2012
作者:
Anthony Minessale
提交者:
Ken Rice
9月 11, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move verbos zrtp debug messages to log level DEBUG1 fsctl debug_level 1 to see them
上级
79d86a7d
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
7 行增加
和
7 行删除
+7
-7
sofia_glue.c
src/mod/endpoints/mod_sofia/sofia_glue.c
+7
-7
没有找到文件。
src/mod/endpoints/mod_sofia/sofia_glue.c
浏览文件 @
d673f691
...
...
@@ -3915,9 +3915,9 @@ void sofia_glue_pass_zrtp_hash2(switch_core_session_t *aleg_session, switch_core
bleg_channel
=
switch_core_session_get_channel
(
bleg_session
);
bleg_tech_pvt
=
switch_core_session_get_private
(
bleg_session
);
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
aleg_channel
),
SWITCH_LOG_DEBUG
,
"Deciding whether to pass zrtp-hash between a-leg and b-leg
\n
"
);
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
aleg_channel
),
SWITCH_LOG_DEBUG
1
,
"Deciding whether to pass zrtp-hash between a-leg and b-leg
\n
"
);
if
(
!
(
switch_channel_test_flag
(
aleg_tech_pvt
->
channel
,
CF_ZRTP_PASSTHRU_REQ
)))
{
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
aleg_channel
),
SWITCH_LOG_DEBUG
,
"CF_ZRTP_PASSTHRU_REQ not set on a-leg, so not propagating zrtp-hash
\n
"
);
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
aleg_channel
),
SWITCH_LOG_DEBUG
1
,
"CF_ZRTP_PASSTHRU_REQ not set on a-leg, so not propagating zrtp-hash
\n
"
);
return
;
}
if
(
aleg_tech_pvt
->
remote_sdp_audio_zrtp_hash
)
{
...
...
@@ -3947,15 +3947,15 @@ void sofia_glue_pass_zrtp_hash(switch_core_session_t *session)
switch_channel_t
*
channel
=
switch_core_session_get_channel
(
session
);
private_object_t
*
tech_pvt
=
switch_core_session_get_private
(
session
);
switch_core_session_t
*
other_session
;
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
,
"Deciding whether to pass zrtp-hash between legs
\n
"
);
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
1
,
"Deciding whether to pass zrtp-hash between legs
\n
"
);
if
(
!
(
switch_channel_test_flag
(
tech_pvt
->
channel
,
CF_ZRTP_PASSTHRU_REQ
)))
{
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
,
"CF_ZRTP_PASSTHRU_REQ not set, so not propagating zrtp-hash
\n
"
);
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
1
,
"CF_ZRTP_PASSTHRU_REQ not set, so not propagating zrtp-hash
\n
"
);
return
;
}
else
if
(
!
(
switch_core_session_get_partner
(
session
,
&
other_session
)
==
SWITCH_STATUS_SUCCESS
))
{
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
,
"No partner channel found, so not propagating zrtp-hash
\n
"
);
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
1
,
"No partner channel found, so not propagating zrtp-hash
\n
"
);
return
;
}
else
{
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
,
"Found peer channel; propagating zrtp-hash if set
\n
"
);
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
1
,
"Found peer channel; propagating zrtp-hash if set
\n
"
);
sofia_glue_pass_zrtp_hash2
(
session
,
other_session
);
switch_core_session_rwunlock
(
other_session
);
}
...
...
@@ -3969,7 +3969,7 @@ static void find_zrtp_hash(switch_core_session_t *session, sdp_session_t *sdp)
sdp_attribute_t
*
attr
;
int
got_audio
=
0
,
got_video
=
0
;
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
,
"Looking for zrtp-hash
\n
"
);
switch_log_printf
(
SWITCH_CHANNEL_CHANNEL_LOG
(
channel
),
SWITCH_LOG_DEBUG
1
,
"Looking for zrtp-hash
\n
"
);
for
(
m
=
sdp
->
sdp_media
;
m
;
m
=
m
->
m_next
)
{
if
(
got_audio
&&
got_video
)
break
;
if
(
m
->
m_port
&&
((
m
->
m_type
==
sdp_media_audio
&&
!
got_audio
)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论