Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
dac9d6e3
提交
dac9d6e3
authored
11月 20, 2011
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-3688 try this also with sofia loglevel all 9
上级
5bb2d51c
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
20 行增加
和
12 行删除
+20
-12
mod_sofia.c
src/mod/endpoints/mod_sofia/mod_sofia.c
+1
-1
mod_sofia.h
src/mod/endpoints/mod_sofia/mod_sofia.h
+1
-1
sofia.c
src/mod/endpoints/mod_sofia/sofia.c
+5
-1
sofia_glue.c
src/mod/endpoints/mod_sofia/sofia_glue.c
+13
-9
没有找到文件。
src/mod/endpoints/mod_sofia/mod_sofia.c
浏览文件 @
dac9d6e3
...
@@ -2319,7 +2319,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
...
@@ -2319,7 +2319,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
if
(
switch_channel_test_flag
(
channel
,
CF_PROXY_MEDIA
))
{
if
(
switch_channel_test_flag
(
channel
,
CF_PROXY_MEDIA
))
{
sofia_glue_tech_patch_sdp
(
tech_pvt
);
sofia_glue_tech_patch_sdp
(
tech_pvt
);
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
);
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
,
NULL
);
}
}
if
(
sofia_use_soa
(
tech_pvt
))
{
if
(
sofia_use_soa
(
tech_pvt
))
{
nua_respond
(
tech_pvt
->
nh
,
code
,
su_strdup
(
nua_handle_home
(
tech_pvt
->
nh
),
reason
),
SIPTAG_CONTACT_STR
(
tech_pvt
->
reply_contact
),
nua_respond
(
tech_pvt
->
nh
,
code
,
su_strdup
(
nua_handle_home
(
tech_pvt
->
nh
),
reason
),
SIPTAG_CONTACT_STR
(
tech_pvt
->
reply_contact
),
...
...
src/mod/endpoints/mod_sofia/mod_sofia.h
浏览文件 @
dac9d6e3
...
@@ -1037,7 +1037,7 @@ int sofia_glue_transport_has_tls(const sofia_transport_t tp);
...
@@ -1037,7 +1037,7 @@ int sofia_glue_transport_has_tls(const sofia_transport_t tp);
const
char
*
sofia_glue_get_unknown_header
(
sip_t
const
*
sip
,
const
char
*
name
);
const
char
*
sofia_glue_get_unknown_header
(
sip_t
const
*
sip
,
const
char
*
name
);
switch_status_t
sofia_glue_build_crypto
(
private_object_t
*
tech_pvt
,
int
index
,
switch_rtp_crypto_key_type_t
type
,
switch_rtp_crypto_direction_t
direction
);
switch_status_t
sofia_glue_build_crypto
(
private_object_t
*
tech_pvt
,
int
index
,
switch_rtp_crypto_key_type_t
type
,
switch_rtp_crypto_direction_t
direction
);
void
sofia_glue_tech_patch_sdp
(
private_object_t
*
tech_pvt
);
void
sofia_glue_tech_patch_sdp
(
private_object_t
*
tech_pvt
);
switch_status_t
sofia_glue_tech_proxy_remote_addr
(
private_object_t
*
tech_pvt
);
switch_status_t
sofia_glue_tech_proxy_remote_addr
(
private_object_t
*
tech_pvt
,
const
char
*
sdp_str
);
void
sofia_presence_event_thread_start
(
void
);
void
sofia_presence_event_thread_start
(
void
);
void
sofia_reg_expire_call_id
(
sofia_profile_t
*
profile
,
const
char
*
call_id
,
int
reboot
);
void
sofia_reg_expire_call_id
(
sofia_profile_t
*
profile
,
const
char
*
call_id
,
int
reboot
);
void
sofia_reg_check_call_id
(
sofia_profile_t
*
profile
,
const
char
*
call_id
);
void
sofia_reg_check_call_id
(
sofia_profile_t
*
profile
,
const
char
*
call_id
);
...
...
src/mod/endpoints/mod_sofia/sofia.c
浏览文件 @
dac9d6e3
...
@@ -4935,7 +4935,7 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
...
@@ -4935,7 +4935,7 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
sip
->
sip_content_type
&&
sip
->
sip_content_type
->
c_subtype
&&
switch_stristr
(
"sdp"
,
sip
->
sip_content_type
->
c_subtype
))
{
sip
->
sip_content_type
&&
sip
->
sip_content_type
->
c_subtype
&&
switch_stristr
(
"sdp"
,
sip
->
sip_content_type
->
c_subtype
))
{
tech_pvt
->
remote_sdp_str
=
switch_core_session_strdup
(
tech_pvt
->
session
,
sip
->
sip_payload
->
pl_data
);
tech_pvt
->
remote_sdp_str
=
switch_core_session_strdup
(
tech_pvt
->
session
,
sip
->
sip_payload
->
pl_data
);
r_sdp
=
tech_pvt
->
remote_sdp_str
;
r_sdp
=
tech_pvt
->
remote_sdp_str
;
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
);
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
,
NULL
);
}
}
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_DEBUG
,
"Passing %d %s to other leg
\n
"
,
status
,
phrase
);
switch_log_printf
(
SWITCH_CHANNEL_SESSION_LOG
(
session
),
SWITCH_LOG_DEBUG
,
"Passing %d %s to other leg
\n
"
,
status
,
phrase
);
...
@@ -5780,6 +5780,10 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
...
@@ -5780,6 +5780,10 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
goto
done
;
goto
done
;
}
}
if
(
switch_channel_test_flag
(
channel
,
CF_PROXY_MODE
))
{
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
,
r_sdp
);
}
msg
=
switch_core_session_alloc
(
other_session
,
sizeof
(
*
msg
));
msg
=
switch_core_session_alloc
(
other_session
,
sizeof
(
*
msg
));
msg
->
message_id
=
SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT
;
msg
->
message_id
=
SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT
;
msg
->
from
=
__FILE__
;
msg
->
from
=
__FILE__
;
...
...
src/mod/endpoints/mod_sofia/sofia_glue.c
浏览文件 @
dac9d6e3
...
@@ -1374,7 +1374,7 @@ char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char
...
@@ -1374,7 +1374,7 @@ char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char
}
}
#define RA_PTR_LEN 512
#define RA_PTR_LEN 512
switch_status_t
sofia_glue_tech_proxy_remote_addr
(
private_object_t
*
tech_pvt
)
switch_status_t
sofia_glue_tech_proxy_remote_addr
(
private_object_t
*
tech_pvt
,
const
char
*
sdp_str
)
{
{
const
char
*
err
;
const
char
*
err
;
char
rip
[
RA_PTR_LEN
]
=
""
;
char
rip
[
RA_PTR_LEN
]
=
""
;
...
@@ -1384,23 +1384,27 @@ switch_status_t sofia_glue_tech_proxy_remote_addr(private_object_t *tech_pvt)
...
@@ -1384,23 +1384,27 @@ switch_status_t sofia_glue_tech_proxy_remote_addr(private_object_t *tech_pvt)
int
x
;
int
x
;
const
char
*
val
;
const
char
*
val
;
if
(
zstr
(
tech_pvt
->
remote_sdp_str
))
{
if
(
zstr
(
sdp_str
))
{
sdp_str
=
tech_pvt
->
remote_sdp_str
;
}
if
(
zstr
(
sdp_str
))
{
return
SWITCH_STATUS_FALSE
;
return
SWITCH_STATUS_FALSE
;
}
}
if
((
p
=
(
char
*
)
switch_stristr
(
"c=IN IP4 "
,
tech_pvt
->
remote_sdp_str
))
||
(
p
=
(
char
*
)
switch_stristr
(
"c=IN IP6 "
,
tech_pvt
->
remote_
sdp_str
)))
{
if
((
p
=
(
char
*
)
switch_stristr
(
"c=IN IP4 "
,
sdp_str
))
||
(
p
=
(
char
*
)
switch_stristr
(
"c=IN IP6 "
,
sdp_str
)))
{
ip_ptr
=
p
+
9
;
ip_ptr
=
p
+
9
;
}
}
if
((
p
=
(
char
*
)
switch_stristr
(
"m=audio "
,
tech_pvt
->
remote_
sdp_str
)))
{
if
((
p
=
(
char
*
)
switch_stristr
(
"m=audio "
,
sdp_str
)))
{
port_ptr
=
p
+
8
;
port_ptr
=
p
+
8
;
}
}
if
((
p
=
(
char
*
)
switch_stristr
(
"m=image "
,
tech_pvt
->
remote_
sdp_str
)))
{
if
((
p
=
(
char
*
)
switch_stristr
(
"m=image "
,
sdp_str
)))
{
port_ptr
=
p
+
8
;
port_ptr
=
p
+
8
;
}
}
if
((
p
=
(
char
*
)
switch_stristr
(
"m=video "
,
tech_pvt
->
remote_
sdp_str
)))
{
if
((
p
=
(
char
*
)
switch_stristr
(
"m=video "
,
sdp_str
)))
{
vid_port_ptr
=
p
+
8
;
vid_port_ptr
=
p
+
8
;
}
}
...
@@ -2399,7 +2403,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
...
@@ -2399,7 +2403,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
if
(
switch_channel_test_flag
(
channel
,
CF_PROXY_MEDIA
))
{
if
(
switch_channel_test_flag
(
channel
,
CF_PROXY_MEDIA
))
{
if
(
switch_rtp_ready
(
tech_pvt
->
rtp_session
))
{
if
(
switch_rtp_ready
(
tech_pvt
->
rtp_session
))
{
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
);
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
,
NULL
);
}
}
sofia_glue_tech_patch_sdp
(
tech_pvt
);
sofia_glue_tech_patch_sdp
(
tech_pvt
);
}
}
...
@@ -3167,7 +3171,7 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
...
@@ -3167,7 +3171,7 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
}
}
if
(
switch_channel_test_flag
(
tech_pvt
->
channel
,
CF_PROXY_MEDIA
))
{
if
(
switch_channel_test_flag
(
tech_pvt
->
channel
,
CF_PROXY_MEDIA
))
{
if
((
status
=
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
))
!=
SWITCH_STATUS_SUCCESS
)
{
if
((
status
=
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
,
NULL
))
!=
SWITCH_STATUS_SUCCESS
)
{
goto
end
;
goto
end
;
}
}
...
@@ -3490,7 +3494,7 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
...
@@ -3490,7 +3494,7 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
}
}
if
(
switch_channel_test_flag
(
tech_pvt
->
channel
,
CF_PROXY_MEDIA
))
{
if
(
switch_channel_test_flag
(
tech_pvt
->
channel
,
CF_PROXY_MEDIA
))
{
if
((
status
=
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
))
!=
SWITCH_STATUS_SUCCESS
)
{
if
((
status
=
sofia_glue_tech_proxy_remote_addr
(
tech_pvt
,
NULL
))
!=
SWITCH_STATUS_SUCCESS
)
{
goto
end
;
goto
end
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论