diff --git a/src/include/switch_core.h b/src/include/switch_core.h index 67ae2727aa..6806852592 100644 --- a/src/include/switch_core.h +++ b/src/include/switch_core.h @@ -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, 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 \param session the session to receive the message from diff --git a/src/include/switch_core_event_hook.h b/src/include/switch_core_event_hook.h index 8f16706dd6..24932f004b 100644 --- a/src/include/switch_core_event_hook.h +++ b/src/include/switch_core_event_hook.h @@ -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_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_resurrect_session switch_io_event_hook_resurrect_session_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); 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 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_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 */ struct switch_io_event_hook_outgoing_channel { @@ -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 */ struct switch_io_event_hooks { /*! a list of outgoing channel hooks */ @@ -176,7 +169,6 @@ struct switch_io_event_hooks { /*! a list of state change hooks */ switch_io_event_hook_state_change_t *state_change; 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); @@ -236,7 +228,6 @@ NEW_HOOK_DECL_ADD_P(video_write_frame); NEW_HOOK_DECL_ADD_P(kill_channel); NEW_HOOK_DECL_ADD_P(send_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(receive_message); @@ -250,7 +241,6 @@ NEW_HOOK_DECL_REM_P(video_write_frame); NEW_HOOK_DECL_REM_P(kill_channel); NEW_HOOK_DECL_REM_P(send_dtmf); NEW_HOOK_DECL_REM_P(recv_dtmf); -NEW_HOOK_DECL_REM_P(resurrect_session); SWITCH_END_EXTERN_C diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h index 7e024530c5..f09d879d57 100644 --- a/src/include/switch_module_interfaces.h +++ b/src/include/switch_module_interfaces.h @@ -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_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_call_cause_t (*switch_io_resurrect_session_t) (switch_core_session_t **, switch_memory_pool_t **, void *); typedef enum { SWITCH_IO_OUTGOING_CHANNEL, @@ -131,7 +130,6 @@ typedef enum { SWITCH_IO_STATE_CHANGE, SWITCH_IO_READ_VIDEO_FRAME, SWITCH_IO_WRITE_VIDEO_FRAME, - SWITCH_IO_RESURRECT_SESSION } switch_io_routine_name_t; /*! \brief A table of i/o routines that an endpoint interface can implement */ @@ -158,8 +156,6 @@ struct switch_io_routines { switch_io_write_video_frame_t write_video_frame; /*! change a sessions channel run state */ switch_io_state_run_t state_run; - /*! resurrect a session */ - switch_io_resurrect_session_t resurrect_session; void *padding[10]; }; diff --git a/src/mod/endpoints/mod_sofia/rtp.c b/src/mod/endpoints/mod_sofia/rtp.c index 1377af3936..b807cf962b 100644 --- a/src/mod/endpoints/mod_sofia/rtp.c +++ b/src/mod/endpoints/mod_sofia/rtp.c @@ -122,8 +122,8 @@ switch_io_routines_t crtp_io_routines = { /*state_change*/ NULL, /*read_video_frame*/ NULL, /*write_video_frame*/ NULL, - /*state_run*/ NULL, - /* resurrect_session*/ NULL + /*state_run*/ NULL + }; diff --git a/src/switch_core_event_hook.c b/src/switch_core_event_hook.c index e3b17ca6c6..723197bc09 100644 --- a/src/switch_core_event_hook.c +++ b/src/switch_core_event_hook.c @@ -43,7 +43,6 @@ NEW_HOOK_DECL(outgoing_channel) NEW_HOOK_DECL(kill_channel) NEW_HOOK_DECL(send_dtmf) NEW_HOOK_DECL(recv_dtmf) - NEW_HOOK_DECL(resurrect_session) /* For Emacs: * Local Variables: diff --git a/src/switch_core_session.c b/src/switch_core_session.c index 54eb93addf..fe895d024a 100644 --- a/src/switch_core_session.c +++ b/src/switch_core_session.c @@ -388,19 +388,6 @@ SWITCH_DECLARE(int) switch_core_session_get_stream_count(switch_core_session_t * 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, const char *endpoint_name, switch_caller_profile_t *caller_profile,