Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
b35ac6b3
提交
b35ac6b3
authored
11月 30, 2012
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix auto_simplify
上级
de53b398
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
18 行增加
和
10 行删除
+18
-10
mod_sofia.c
src/mod/endpoints/mod_sofia/mod_sofia.c
+6
-3
mod_sofia.h
src/mod/endpoints/mod_sofia/mod_sofia.h
+1
-1
sofia_glue.c
src/mod/endpoints/mod_sofia/sofia_glue.c
+11
-6
没有找到文件。
src/mod/endpoints/mod_sofia/mod_sofia.c
浏览文件 @
b35ac6b3
...
...
@@ -1097,8 +1097,9 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
if
(
sofia_test_flag
(
tech_pvt
,
TFLAG_SIMPLIFY
)
&&
sofia_test_flag
(
tech_pvt
,
TFLAG_GOT_ACK
))
{
sofia_glue_tech_simplify
(
tech_pvt
);
sofia_clear_flag
(
tech_pvt
,
TFLAG_SIMPLIFY
);
if
(
sofia_glue_tech_simplify
(
tech_pvt
))
{
sofia_clear_flag
(
tech_pvt
,
TFLAG_SIMPLIFY
);
}
}
while
(
sofia_test_flag
(
tech_pvt
,
TFLAG_IO
)
&&
tech_pvt
->
read_frame
.
datalen
==
0
)
{
...
...
@@ -1714,7 +1715,9 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
switch_channel_set_variable
(
channel
,
SOFIA_REPLACES_HEADER
,
NULL
);
sofia_set_flag
(
tech_pvt
,
TFLAG_SIMPLIFY
);
if
(
switch_true
(
switch_channel_get_variable
(
tech_pvt
->
channel
,
"sip_auto_simplify"
)))
{
sofia_set_flag
(
tech_pvt
,
TFLAG_SIMPLIFY
);
}
if
(
switch_rtp_ready
(
tech_pvt
->
rtp_session
))
{
...
...
src/mod/endpoints/mod_sofia/mod_sofia.h
浏览文件 @
b35ac6b3
...
...
@@ -1191,7 +1191,7 @@ uint32_t sofia_reg_reg_count(sofia_profile_t *profile, const char *user, const c
void
sofia_glue_copy_t38_options
(
switch_t38_options_t
*
t38_options
,
switch_core_session_t
*
session
);
switch_t38_options_t
*
sofia_glue_extract_t38_options
(
switch_core_session_t
*
session
,
const
char
*
r_sdp
);
char
*
sofia_glue_get_multipart
(
switch_core_session_t
*
session
,
const
char
*
prefix
,
const
char
*
sdp
,
char
**
mp_type
);
void
sofia_glue_tech_simplify
(
private_object_t
*
tech_pvt
);
int
sofia_glue_tech_simplify
(
private_object_t
*
tech_pvt
);
switch_console_callback_match_t
*
sofia_reg_find_reg_url_multi
(
sofia_profile_t
*
profile
,
const
char
*
user
,
const
char
*
host
);
switch_console_callback_match_t
*
sofia_reg_find_reg_url_with_positive_expires_multi
(
sofia_profile_t
*
profile
,
const
char
*
user
,
const
char
*
host
,
time_t
reg_time
,
const
char
*
contact_str
,
long
exptime
);
switch_bool_t
sofia_glue_profile_exists
(
const
char
*
key
);
...
...
src/mod/endpoints/mod_sofia/sofia_glue.c
浏览文件 @
b35ac6b3
...
...
@@ -6785,21 +6785,19 @@ switch_status_t sofia_glue_send_notify(sofia_profile_t *profile, const char *use
}
void
sofia_glue_tech_simplify
(
private_object_t
*
tech_pvt
)
int
sofia_glue_tech_simplify
(
private_object_t
*
tech_pvt
)
{
const
char
*
uuid
,
*
network_addr_a
=
NULL
,
*
network_addr_b
=
NULL
,
*
simplify
,
*
simplify_other_channel
;
switch_channel_t
*
other_channel
=
NULL
,
*
inbound_channel
=
NULL
;
switch_core_session_t
*
other_session
=
NULL
,
*
inbound_session
=
NULL
;
uint8_t
did_simplify
=
0
;
int
r
=
0
;
if
(
!
switch_channel_test_flag
(
tech_pvt
->
channel
,
CF_ANSWERED
)
||
switch_channel_test_flag
(
tech_pvt
->
channel
,
CF_SIMPLIFY
))
{
return
;
goto
end
;
}
if
((
uuid
=
switch_channel_get_partner_uuid
(
tech_pvt
->
channel
))
&&
(
other_session
=
switch_core_session_locate
(
uuid
)))
{
if
((
uuid
=
switch_channel_get_partner_uuid
(
tech_pvt
->
channel
))
&&
(
other_session
=
switch_core_session_locate
(
uuid
)))
{
other_channel
=
switch_core_session_get_channel
(
other_session
);
...
...
@@ -6807,6 +6805,8 @@ void sofia_glue_tech_simplify(private_object_t *tech_pvt)
simplify
=
switch_channel_get_variable
(
tech_pvt
->
channel
,
"sip_auto_simplify"
);
simplify_other_channel
=
switch_channel_get_variable
(
other_channel
,
"sip_auto_simplify"
);
r
=
1
;
if
(
switch_true
(
simplify
)
&&
!
switch_channel_test_flag
(
tech_pvt
->
channel
,
CF_BRIDGE_ORIGINATOR
))
{
network_addr_a
=
switch_channel_get_variable
(
tech_pvt
->
channel
,
"network_addr"
);
network_addr_b
=
switch_channel_get_variable
(
other_channel
,
"network_addr"
);
...
...
@@ -6851,6 +6851,11 @@ void sofia_glue_tech_simplify(private_object_t *tech_pvt)
switch_core_session_rwunlock
(
other_session
);
}
end
:
return
r
;
}
void
sofia_glue_pause_jitterbuffer
(
switch_core_session_t
*
session
,
switch_bool_t
on
)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论