Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
33e642e9
提交
33e642e9
authored
8月 22, 2012
作者:
Anthony Minessale
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove unused resurrect code
上级
a6bdbb2c
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
2 行增加
和
34 行删除
+2
-34
switch_core.h
src/include/switch_core.h
+0
-4
switch_core_event_hook.h
src/include/switch_core_event_hook.h
+0
-10
switch_module_interfaces.h
src/include/switch_module_interfaces.h
+0
-4
rtp.c
src/mod/endpoints/mod_sofia/rtp.c
+2
-2
switch_core_event_hook.c
src/switch_core_event_hook.c
+0
-1
switch_core_session.c
src/switch_core_session.c
+0
-13
没有找到文件。
src/include/switch_core.h
浏览文件 @
33e642e9
...
@@ -1031,10 +1031,6 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(_In_opt
...
@@ -1031,10 +1031,6 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(_In_opt
_Inout_
switch_memory_pool_t
**
pool
,
_In_
switch_originate_flag_t
flags
,
_Inout_
switch_memory_pool_t
**
pool
,
_In_
switch_originate_flag_t
flags
,
switch_call_cause_t
*
cancel_cause
);
switch_call_cause_t
*
cancel_cause
);
SWITCH_DECLARE
(
switch_call_cause_t
)
switch_core_session_resurrect_channel
(
_In_z_
const
char
*
endpoint_name
,
_Inout_
switch_core_session_t
**
new_session
,
_Inout_
switch_memory_pool_t
**
pool
,
_In_
void
*
data
);
/*!
/*!
\brief Receive a message on a given session
\brief Receive a message on a given session
\param session the session to receive the message from
\param session the session to receive the message from
...
...
src/include/switch_core_event_hook.h
浏览文件 @
33e642e9
...
@@ -46,7 +46,6 @@ typedef struct switch_io_event_hook_send_dtmf switch_io_event_hook_send_dtmf_t;
...
@@ -46,7 +46,6 @@ typedef struct switch_io_event_hook_send_dtmf switch_io_event_hook_send_dtmf_t;
typedef
struct
switch_io_event_hook_recv_dtmf
switch_io_event_hook_recv_dtmf_t
;
typedef
struct
switch_io_event_hook_recv_dtmf
switch_io_event_hook_recv_dtmf_t
;
typedef
struct
switch_io_event_hook_state_change
switch_io_event_hook_state_change_t
;
typedef
struct
switch_io_event_hook_state_change
switch_io_event_hook_state_change_t
;
typedef
struct
switch_io_event_hook_state_run
switch_io_event_hook_state_run_t
;
typedef
struct
switch_io_event_hook_state_run
switch_io_event_hook_state_run_t
;
typedef
struct
switch_io_event_hook_resurrect_session
switch_io_event_hook_resurrect_session_t
;
typedef
switch_status_t
(
*
switch_outgoing_channel_hook_t
)
typedef
switch_status_t
(
*
switch_outgoing_channel_hook_t
)
(
switch_core_session_t
*
,
switch_event_t
*
,
switch_caller_profile_t
*
,
switch_core_session_t
*
,
switch_originate_flag_t
);
(
switch_core_session_t
*
,
switch_event_t
*
,
switch_caller_profile_t
*
,
switch_core_session_t
*
,
switch_originate_flag_t
);
typedef
switch_status_t
(
*
switch_receive_message_hook_t
)
(
switch_core_session_t
*
,
switch_core_session_message_t
*
);
typedef
switch_status_t
(
*
switch_receive_message_hook_t
)
(
switch_core_session_t
*
,
switch_core_session_message_t
*
);
...
@@ -60,7 +59,6 @@ typedef switch_status_t (*switch_send_dtmf_hook_t) (switch_core_session_t *, con
...
@@ -60,7 +59,6 @@ typedef switch_status_t (*switch_send_dtmf_hook_t) (switch_core_session_t *, con
typedef
switch_status_t
(
*
switch_recv_dtmf_hook_t
)
(
switch_core_session_t
*
,
const
switch_dtmf_t
*
,
switch_dtmf_direction_t
direction
);
typedef
switch_status_t
(
*
switch_recv_dtmf_hook_t
)
(
switch_core_session_t
*
,
const
switch_dtmf_t
*
,
switch_dtmf_direction_t
direction
);
typedef
switch_status_t
(
*
switch_state_change_hook_t
)
(
switch_core_session_t
*
);
typedef
switch_status_t
(
*
switch_state_change_hook_t
)
(
switch_core_session_t
*
);
typedef
switch_status_t
(
*
switch_state_run_hook_t
)
(
switch_core_session_t
*
);
typedef
switch_status_t
(
*
switch_state_run_hook_t
)
(
switch_core_session_t
*
);
typedef
switch_call_cause_t
(
*
switch_resurrect_session_hook_t
)
(
switch_core_session_t
**
,
switch_memory_pool_t
**
,
void
*
);
/*! \brief Node in which to store custom receive message callback hooks */
/*! \brief Node in which to store custom receive message callback hooks */
struct
switch_io_event_hook_outgoing_channel
{
struct
switch_io_event_hook_outgoing_channel
{
...
@@ -146,11 +144,6 @@ struct switch_io_event_hook_state_run {
...
@@ -146,11 +144,6 @@ struct switch_io_event_hook_state_run {
};
};
struct
switch_io_event_hook_resurrect_session
{
switch_resurrect_session_hook_t
resurrect_session
;
struct
switch_io_event_hook_resurrect_session
*
next
;
};
/*! \brief A table of lists of io_event_hooks to store the event hooks associated with a session */
/*! \brief A table of lists of io_event_hooks to store the event hooks associated with a session */
struct
switch_io_event_hooks
{
struct
switch_io_event_hooks
{
/*! a list of outgoing channel hooks */
/*! a list of outgoing channel hooks */
...
@@ -176,7 +169,6 @@ struct switch_io_event_hooks {
...
@@ -176,7 +169,6 @@ struct switch_io_event_hooks {
/*! a list of state change hooks */
/*! a list of state change hooks */
switch_io_event_hook_state_change_t
*
state_change
;
switch_io_event_hook_state_change_t
*
state_change
;
switch_io_event_hook_state_run_t
*
state_run
;
switch_io_event_hook_state_run_t
*
state_run
;
switch_io_event_hook_resurrect_session_t
*
resurrect_session
;
};
};
extern
switch_io_event_hooks_t
switch_core_session_get_event_hooks
(
switch_core_session_t
*
session
);
extern
switch_io_event_hooks_t
switch_core_session_get_event_hooks
(
switch_core_session_t
*
session
);
...
@@ -236,7 +228,6 @@ NEW_HOOK_DECL_ADD_P(video_write_frame);
...
@@ -236,7 +228,6 @@ NEW_HOOK_DECL_ADD_P(video_write_frame);
NEW_HOOK_DECL_ADD_P
(
kill_channel
);
NEW_HOOK_DECL_ADD_P
(
kill_channel
);
NEW_HOOK_DECL_ADD_P
(
send_dtmf
);
NEW_HOOK_DECL_ADD_P
(
send_dtmf
);
NEW_HOOK_DECL_ADD_P
(
recv_dtmf
);
NEW_HOOK_DECL_ADD_P
(
recv_dtmf
);
NEW_HOOK_DECL_ADD_P
(
resurrect_session
);
NEW_HOOK_DECL_REM_P
(
outgoing_channel
);
NEW_HOOK_DECL_REM_P
(
outgoing_channel
);
NEW_HOOK_DECL_REM_P
(
receive_message
);
NEW_HOOK_DECL_REM_P
(
receive_message
);
...
@@ -250,7 +241,6 @@ NEW_HOOK_DECL_REM_P(video_write_frame);
...
@@ -250,7 +241,6 @@ NEW_HOOK_DECL_REM_P(video_write_frame);
NEW_HOOK_DECL_REM_P
(
kill_channel
);
NEW_HOOK_DECL_REM_P
(
kill_channel
);
NEW_HOOK_DECL_REM_P
(
send_dtmf
);
NEW_HOOK_DECL_REM_P
(
send_dtmf
);
NEW_HOOK_DECL_REM_P
(
recv_dtmf
);
NEW_HOOK_DECL_REM_P
(
recv_dtmf
);
NEW_HOOK_DECL_REM_P
(
resurrect_session
);
SWITCH_END_EXTERN_C
SWITCH_END_EXTERN_C
...
...
src/include/switch_module_interfaces.h
浏览文件 @
33e642e9
...
@@ -118,7 +118,6 @@ typedef switch_status_t (*switch_io_state_change_t) (switch_core_session_t *);
...
@@ -118,7 +118,6 @@ typedef switch_status_t (*switch_io_state_change_t) (switch_core_session_t *);
typedef
switch_status_t
(
*
switch_io_state_run_t
)
(
switch_core_session_t
*
);
typedef
switch_status_t
(
*
switch_io_state_run_t
)
(
switch_core_session_t
*
);
typedef
switch_status_t
(
*
switch_io_read_video_frame_t
)
(
switch_core_session_t
*
,
switch_frame_t
**
,
switch_io_flag_t
,
int
);
typedef
switch_status_t
(
*
switch_io_read_video_frame_t
)
(
switch_core_session_t
*
,
switch_frame_t
**
,
switch_io_flag_t
,
int
);
typedef
switch_status_t
(
*
switch_io_write_video_frame_t
)
(
switch_core_session_t
*
,
switch_frame_t
*
,
switch_io_flag_t
,
int
);
typedef
switch_status_t
(
*
switch_io_write_video_frame_t
)
(
switch_core_session_t
*
,
switch_frame_t
*
,
switch_io_flag_t
,
int
);
typedef
switch_call_cause_t
(
*
switch_io_resurrect_session_t
)
(
switch_core_session_t
**
,
switch_memory_pool_t
**
,
void
*
);
typedef
enum
{
typedef
enum
{
SWITCH_IO_OUTGOING_CHANNEL
,
SWITCH_IO_OUTGOING_CHANNEL
,
...
@@ -131,7 +130,6 @@ typedef enum {
...
@@ -131,7 +130,6 @@ typedef enum {
SWITCH_IO_STATE_CHANGE
,
SWITCH_IO_STATE_CHANGE
,
SWITCH_IO_READ_VIDEO_FRAME
,
SWITCH_IO_READ_VIDEO_FRAME
,
SWITCH_IO_WRITE_VIDEO_FRAME
,
SWITCH_IO_WRITE_VIDEO_FRAME
,
SWITCH_IO_RESURRECT_SESSION
}
switch_io_routine_name_t
;
}
switch_io_routine_name_t
;
/*! \brief A table of i/o routines that an endpoint interface can implement */
/*! \brief A table of i/o routines that an endpoint interface can implement */
...
@@ -158,8 +156,6 @@ struct switch_io_routines {
...
@@ -158,8 +156,6 @@ struct switch_io_routines {
switch_io_write_video_frame_t
write_video_frame
;
switch_io_write_video_frame_t
write_video_frame
;
/*! change a sessions channel run state */
/*! change a sessions channel run state */
switch_io_state_run_t
state_run
;
switch_io_state_run_t
state_run
;
/*! resurrect a session */
switch_io_resurrect_session_t
resurrect_session
;
void
*
padding
[
10
];
void
*
padding
[
10
];
};
};
...
...
src/mod/endpoints/mod_sofia/rtp.c
浏览文件 @
33e642e9
...
@@ -122,8 +122,8 @@ switch_io_routines_t crtp_io_routines = {
...
@@ -122,8 +122,8 @@ switch_io_routines_t crtp_io_routines = {
/*state_change*/
NULL
,
/*state_change*/
NULL
,
/*read_video_frame*/
NULL
,
/*read_video_frame*/
NULL
,
/*write_video_frame*/
NULL
,
/*write_video_frame*/
NULL
,
/*state_run*/
NULL
,
/*state_run*/
NULL
/* resurrect_session*/
NULL
};
};
...
...
src/switch_core_event_hook.c
浏览文件 @
33e642e9
...
@@ -43,7 +43,6 @@ NEW_HOOK_DECL(outgoing_channel)
...
@@ -43,7 +43,6 @@ NEW_HOOK_DECL(outgoing_channel)
NEW_HOOK_DECL
(
kill_channel
)
NEW_HOOK_DECL
(
kill_channel
)
NEW_HOOK_DECL
(
send_dtmf
)
NEW_HOOK_DECL
(
send_dtmf
)
NEW_HOOK_DECL
(
recv_dtmf
)
NEW_HOOK_DECL
(
recv_dtmf
)
NEW_HOOK_DECL
(
resurrect_session
)
/* For Emacs:
/* For Emacs:
* Local Variables:
* Local Variables:
...
...
src/switch_core_session.c
浏览文件 @
33e642e9
...
@@ -388,19 +388,6 @@ SWITCH_DECLARE(int) switch_core_session_get_stream_count(switch_core_session_t *
...
@@ -388,19 +388,6 @@ SWITCH_DECLARE(int) switch_core_session_get_stream_count(switch_core_session_t *
return
session
->
stream_count
;
return
session
->
stream_count
;
}
}
SWITCH_DECLARE
(
switch_call_cause_t
)
switch_core_session_resurrect_channel
(
const
char
*
endpoint_name
,
switch_core_session_t
**
new_session
,
switch_memory_pool_t
**
pool
,
void
*
data
)
{
const
switch_endpoint_interface_t
*
endpoint_interface
;
if
((
endpoint_interface
=
switch_loadable_module_get_endpoint_interface
(
endpoint_name
))
==
0
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Could not locate channel type %s
\n
"
,
endpoint_name
);
return
SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED
;
}
return
endpoint_interface
->
io_routines
->
resurrect_session
(
new_session
,
pool
,
data
);
}
SWITCH_DECLARE
(
switch_call_cause_t
)
switch_core_session_outgoing_channel
(
switch_core_session_t
*
session
,
switch_event_t
*
var_event
,
SWITCH_DECLARE
(
switch_call_cause_t
)
switch_core_session_outgoing_channel
(
switch_core_session_t
*
session
,
switch_event_t
*
var_event
,
const
char
*
endpoint_name
,
const
char
*
endpoint_name
,
switch_caller_profile_t
*
caller_profile
,
switch_caller_profile_t
*
caller_profile
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论