Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
c22aac0e
提交
c22aac0e
authored
4月 22, 2011
作者:
Georgiewskiy Yuriy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix race condition on destroying signaling thread in h323 library
上级
6fbfff0f
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
32 行增加
和
8 行删除
+32
-8
changes.txt
src/mod/endpoints/mod_h323/changes.txt
+1
-0
mod_h323.cpp
src/mod/endpoints/mod_h323/mod_h323.cpp
+18
-5
mod_h323.h
src/mod/endpoints/mod_h323/mod_h323.h
+13
-3
没有找到文件。
src/mod/endpoints/mod_h323/changes.txt
浏览文件 @
c22aac0e
fix race condition on destroying signaling thread in h323 library
Adds an extra switch_rtp_destroy or switch_rtp_release_port when a session ends
- to make sure the port is returned to FS. thx to Peter Olsson.
fix issues with Progress message type if pre_answer enabled
...
...
src/mod/endpoints/mod_h323/mod_h323.cpp
浏览文件 @
c22aac0e
/*
*
FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
*
Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
*
H323 endpoint interface for Freeswitch Modular Media Switching Software Library /
*
Soft-Switch Application
*
* Version: MPL 1.1
*
* Copyright (c) 2010 Ilnitskiy Mixim (max.h323@gmail.com)
* Copyright (c) 2010 Georgiewskiy Yuriy (bottleman@icf.org.ru)
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
...
...
@@ -14,6 +17,11 @@
* for the specific language governing rights and limitations under the
* License.
*
* Contributor(s):
*
*
*
*
* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
*
* The Initial Developer of the Original Code is
...
...
@@ -24,7 +32,7 @@
*
* mod_h323.cpp -- H323 endpoint
*
* Version 0.0.5
6
* Version 0.0.5
7
*/
//#define DEBUG_RTP_PACKETS
...
...
@@ -708,6 +716,7 @@ FSH323Connection::FSH323Connection(FSH323EndPoint& endpoint, H323Transport* tran
h323_private_t
*
tech_pvt
=
(
h323_private_t
*
)
switch_core_session_alloc
(
m_fsSession
,
sizeof
(
*
tech_pvt
));
tech_pvt
->
me
=
this
;
tech_pvt
->
active_connection
=
true
;
switch_core_session_set_private
(
m_fsSession
,
tech_pvt
);
switch_mutex_init
(
&
tech_pvt
->
flag_mutex
,
SWITCH_MUTEX_NESTED
,
switch_core_session_get_pool
(
m_fsSession
));
...
...
@@ -748,8 +757,9 @@ FSH323Connection::~FSH323Connection()
}
else
if
(
m_RTPlocalPort
)
{
switch_rtp_release_port
((
const
char
*
)
m_RTPlocalIP
.
AsString
(),
m_RTPlocalPort
);
}
tech_pvt
->
me
=
NULL
;
tech_pvt
->
active_connection
=
false
;
// switch_mutex_unlock(tech_pvt->h323_mutex);
// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"------------->h323_mutex_unlock\n");
}
...
...
@@ -2387,6 +2397,9 @@ static switch_status_t on_hangup(switch_core_session_t *session)
switch_mutex_lock
(
tech_pvt
->
h323_mutex
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_DEBUG
,
"------------->h323_mutex_unlock
\n
"
);
switch_mutex_unlock
(
tech_pvt
->
h323_mutex
);
while
(
tech_pvt
->
active_connection
){
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_DEBUG
,
"Wait clear h323 connection
\n
"
);
h_timer
(
1
);
}
return
SWITCH_STATUS_SUCCESS
;
}
src/mod/endpoints/mod_h323/mod_h323.h
浏览文件 @
c22aac0e
/*
*
FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
*
Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
*
H323 endpoint interface for Freeswitch Modular Media Switching Software Library /
*
Soft-Switch Application
*
* Version: MPL 1.1
*
* Copyright (c) 2010 Ilnitskiy Mixim (max.h323@gmail.com)
* Copyright (c) 2010 Georgiewskiy Yuriy (bottleman@icf.org.ru)
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
...
...
@@ -14,6 +17,11 @@
* for the specific language governing rights and limitations under the
* License.
*
* Contributor(s):
*
*
*
*
* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
*
* The Initial Developer of the Original Code is
...
...
@@ -24,7 +32,8 @@
*
* mod_h323.h -- H323 endpoint
*
*/
* Version 0.0.57
*/
#if defined(__GNUC__) && defined(HAVE_VISIBILITY)
#pragma GCC visibility push(default)
...
...
@@ -184,6 +193,7 @@ typedef struct {
switch_mutex_t
*
h323_io_mutex
;
FSH323Connection
*
me
;
bool
active_connection
;
char
*
token
;
}
h323_private_t
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论