mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-29 22:54:18 +00:00
part 3 of 3 standardizing typedefed types to end in _t.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1300 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris committed
1 parent
76f4a10a18
commit
14fee78470
60 files changed
+957
-957
No files matched your search
@@ -104,7 +104,7 @@ struct private_object {
|
||||
switch_caller_profile_t *caller_profile;
|
||||
unsigned short samprate;
|
||||
switch_mutex_t *mutex;
|
||||
switch_codec_interface *codecs[SWITCH_MAX_CODECS];
|
||||
switch_codec_interface_t *codecs[SWITCH_MAX_CODECS];
|
||||
unsigned int num_codecs;
|
||||
int codec_index;
|
||||
switch_rtp_t *rtp_session;
|
||||
@@ -149,21 +149,21 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan)
|
||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string)
|
||||
|
||||
|
||||
static switch_status channel_on_init(switch_core_session_t *session);
|
||||
static switch_status channel_on_hangup(switch_core_session_t *session);
|
||||
static switch_status channel_on_ring(switch_core_session_t *session);
|
||||
static switch_status channel_on_loopback(switch_core_session_t *session);
|
||||
static switch_status channel_on_transmit(switch_core_session_t *session);
|
||||
static switch_status channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t channel_on_init(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_hangup(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_ring(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_loopback(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_transmit(switch_core_session_t *session);
|
||||
static switch_status_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool);
|
||||
static switch_status channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status channel_kill_channel(switch_core_session_t *session, int sig);
|
||||
static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
|
||||
static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t signal, char *msg);
|
||||
static ldl_status handle_response(ldl_handle_t *handle, char *id);
|
||||
static switch_status load_config(void);
|
||||
static switch_status_t load_config(void);
|
||||
|
||||
static void dl_logger(char *file, const char *func, int line, int level, char *fmt, ...)
|
||||
{
|
||||
@@ -548,7 +548,7 @@ static void negotiate_thread_launch(switch_core_session_t *session)
|
||||
returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
|
||||
so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
|
||||
*/
|
||||
static switch_status channel_on_init(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_init(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -567,7 +567,7 @@ static switch_status channel_on_init(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_ring(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_ring(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -583,7 +583,7 @@ static switch_status channel_on_ring(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_execute(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_execute(switch_core_session_t *session)
|
||||
{
|
||||
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -601,7 +601,7 @@ static switch_status channel_on_execute(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_hangup(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_hangup(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -640,7 +640,7 @@ static switch_status channel_on_hangup(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_kill_channel(switch_core_session_t *session, int sig)
|
||||
static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -664,19 +664,19 @@ static switch_status channel_kill_channel(switch_core_session_t *session, int si
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_loopback(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_loopback(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_transmit(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_transmit(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -686,7 +686,7 @@ static switch_status channel_waitfor_read(switch_core_session_t *session, int ms
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -697,7 +697,7 @@ static switch_status channel_waitfor_write(switch_core_session_t *session, int m
|
||||
|
||||
}
|
||||
|
||||
static switch_status channel_send_dtmf(switch_core_session_t *session, char *dtmf)
|
||||
static switch_status_t channel_send_dtmf(switch_core_session_t *session, char *dtmf)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
//char *digit;
|
||||
@@ -709,15 +709,15 @@ static switch_status channel_send_dtmf(switch_core_session_t *session, char *dtm
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
uint32_t bytes = 0;
|
||||
switch_size_t samples = 0, frames = 0, ms = 0;
|
||||
switch_channel_t *channel = NULL;
|
||||
switch_payload_t payload = 0;
|
||||
switch_status status;
|
||||
switch_status_t status;
|
||||
|
||||
channel = switch_core_session_get_channel(session);
|
||||
assert(channel != NULL);
|
||||
@@ -806,12 +806,12 @@ static switch_status channel_read_frame(switch_core_session_t *session, switch_f
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
switch_status status = SWITCH_STATUS_SUCCESS;
|
||||
switch_status_t status = SWITCH_STATUS_SUCCESS;
|
||||
int bytes = 0, samples = 0, frames = 0;
|
||||
|
||||
|
||||
@@ -914,7 +914,7 @@ static switch_status channel_write_frame(switch_core_session_t *session, switch_
|
||||
return status;
|
||||
}
|
||||
|
||||
static switch_status channel_answer_channel(switch_core_session_t *session)
|
||||
static switch_status_t channel_answer_channel(switch_core_session_t *session)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -934,7 +934,7 @@ static switch_status channel_answer_channel(switch_core_session_t *session)
|
||||
}
|
||||
|
||||
|
||||
static switch_status channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
|
||||
static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
|
||||
{
|
||||
switch_channel_t *channel;
|
||||
struct private_object *tech_pvt;
|
||||
@@ -975,7 +975,7 @@ static const switch_state_handler_table_t channel_event_handlers = {
|
||||
/*.on_transmit */ channel_on_transmit
|
||||
};
|
||||
|
||||
static const switch_io_routines channel_io_routines = {
|
||||
static const switch_io_routines_t channel_io_routines = {
|
||||
/*.outgoing_channel */ channel_outgoing_channel,
|
||||
/*.answer_channel */ channel_answer_channel,
|
||||
/*.read_frame */ channel_read_frame,
|
||||
@@ -987,7 +987,7 @@ static const switch_io_routines channel_io_routines = {
|
||||
/*.receive_message*/ channel_receive_message
|
||||
};
|
||||
|
||||
static const switch_endpoint_interface channel_endpoint_interface = {
|
||||
static const switch_endpoint_interface_t channel_endpoint_interface = {
|
||||
/*.interface_name */ "dingaling",
|
||||
/*.io_routines */ &channel_io_routines,
|
||||
/*.event_handlers */ &channel_event_handlers,
|
||||
@@ -995,7 +995,7 @@ static const switch_endpoint_interface channel_endpoint_interface = {
|
||||
/*.next */ NULL
|
||||
};
|
||||
|
||||
static const switch_loadable_module_interface channel_module_interface = {
|
||||
static const switch_loadable_module_interface_t channel_module_interface = {
|
||||
/*.module_name */ modname,
|
||||
/*.endpoint_interface */ &channel_endpoint_interface,
|
||||
/*.timer_interface */ NULL,
|
||||
@@ -1008,7 +1008,7 @@ static const switch_loadable_module_interface channel_module_interface = {
|
||||
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
||||
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
||||
*/
|
||||
static switch_status channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool)
|
||||
{
|
||||
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, pool)) != 0) {
|
||||
@@ -1105,7 +1105,7 @@ static switch_status channel_outgoing_channel(switch_core_session_t *session, sw
|
||||
|
||||
}
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename)
|
||||
{
|
||||
|
||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||
@@ -1161,7 +1161,7 @@ static void init_profile(struct mdl_profile *profile)
|
||||
}
|
||||
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void)
|
||||
{
|
||||
if (globals.running) {
|
||||
int x = 0;
|
||||
@@ -1179,7 +1179,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
}
|
||||
|
||||
|
||||
static switch_status load_config(void)
|
||||
static switch_status_t load_config(void)
|
||||
{
|
||||
switch_config_t cfg;
|
||||
char *var, *val;
|
||||
@@ -1506,7 +1506,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
|
||||
case LDL_SIGNAL_ERROR:
|
||||
case LDL_SIGNAL_TERMINATE:
|
||||
if (channel) {
|
||||
switch_channel_state state = switch_channel_get_state(channel);
|
||||
switch_channel_state_t state = switch_channel_get_state(channel);
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s %u %d\n", switch_channel_get_name(channel), state, CS_INIT);
|
||||
switch_set_flag(tech_pvt, TFLAG_BYE);
|
||||
switch_clear_flag(tech_pvt, TFLAG_IO);
|
||||
|
||||
@@ -145,20 +145,20 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_rtpip, globals.rtpip)
|
||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string)
|
||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_sipip, globals.sipip)
|
||||
|
||||
static switch_status exosip_on_init(switch_core_session_t *session);
|
||||
static switch_status exosip_on_hangup(switch_core_session_t *session);
|
||||
static switch_status exosip_on_loopback(switch_core_session_t *session);
|
||||
static switch_status exosip_on_transmit(switch_core_session_t *session);
|
||||
static switch_status exosip_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t exosip_on_init(switch_core_session_t *session);
|
||||
static switch_status_t exosip_on_hangup(switch_core_session_t *session);
|
||||
static switch_status_t exosip_on_loopback(switch_core_session_t *session);
|
||||
static switch_status_t exosip_on_transmit(switch_core_session_t *session);
|
||||
static switch_status_t exosip_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool);
|
||||
static switch_status exosip_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status exosip_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status_t exosip_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t exosip_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static int config_exosip(int reload);
|
||||
static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload);
|
||||
static switch_status exosip_kill_channel(switch_core_session_t *session, int sig);
|
||||
static switch_status activate_rtp(struct private_object *tech_pvt);
|
||||
static switch_status_t parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload);
|
||||
static switch_status_t exosip_kill_channel(switch_core_session_t *session, int sig);
|
||||
static switch_status_t activate_rtp(struct private_object *tech_pvt);
|
||||
static void deactivate_rtp(struct private_object *tech_pvt);
|
||||
static void sdp_add_rfc2833(struct osip_rfc3264 *cnf, int rate);
|
||||
|
||||
@@ -173,7 +173,7 @@ static struct private_object *get_pvt_by_call_id(int id)
|
||||
return tech_pvt;
|
||||
}
|
||||
|
||||
static switch_status exosip_on_execute(switch_core_session_t *session)
|
||||
static switch_status_t exosip_on_execute(switch_core_session_t *session)
|
||||
{
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ State methods they get called when the state changes to the specific state
|
||||
returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
|
||||
so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
|
||||
*/
|
||||
static switch_status exosip_on_init(switch_core_session_t *session)
|
||||
static switch_status_t exosip_on_init(switch_core_session_t *session)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -244,7 +244,7 @@ static switch_status exosip_on_init(switch_core_session_t *session)
|
||||
char *dest_uri;
|
||||
char *ip, *err;
|
||||
switch_port_t sdp_port;
|
||||
switch_codec_interface *codecs[SWITCH_MAX_CODECS];
|
||||
switch_codec_interface_t *codecs[SWITCH_MAX_CODECS];
|
||||
int num_codecs = 0;
|
||||
/* do SIP Goodies... */
|
||||
|
||||
@@ -382,7 +382,7 @@ static switch_status exosip_on_init(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status exosip_on_ring(switch_core_session_t *session)
|
||||
static switch_status_t exosip_on_ring(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -398,7 +398,7 @@ static switch_status exosip_on_ring(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status exosip_on_hangup(switch_core_session_t *session)
|
||||
static switch_status_t exosip_on_hangup(switch_core_session_t *session)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -427,13 +427,13 @@ static switch_status exosip_on_hangup(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status exosip_on_loopback(switch_core_session_t *session)
|
||||
static switch_status_t exosip_on_loopback(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXOSIP LOOPBACK\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status exosip_on_transmit(switch_core_session_t *session)
|
||||
static switch_status_t exosip_on_transmit(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXOSIP TRANSMIT\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
@@ -459,7 +459,7 @@ static void deactivate_rtp(struct private_object *tech_pvt)
|
||||
}
|
||||
}
|
||||
|
||||
static switch_status activate_rtp(struct private_object *tech_pvt)
|
||||
static switch_status_t activate_rtp(struct private_object *tech_pvt)
|
||||
{
|
||||
int bw, ms;
|
||||
switch_channel_t *channel;
|
||||
@@ -537,7 +537,7 @@ static switch_status activate_rtp(struct private_object *tech_pvt)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status exosip_answer_channel(switch_core_session_t *session)
|
||||
static switch_status_t exosip_answer_channel(switch_core_session_t *session)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -571,8 +571,8 @@ static switch_status exosip_answer_channel(switch_core_session_t *session)
|
||||
}
|
||||
|
||||
|
||||
static switch_status exosip_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t exosip_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
size_t bytes = 0, samples = 0, frames = 0, ms = 0;
|
||||
@@ -607,7 +607,7 @@ static switch_status exosip_read_frame(switch_core_session_t *session, switch_fr
|
||||
}
|
||||
|
||||
if (switch_test_flag(tech_pvt, TFLAG_IO)) {
|
||||
switch_status status;
|
||||
switch_status_t status;
|
||||
|
||||
if (!switch_test_flag(tech_pvt, TFLAG_RTP)) {
|
||||
return SWITCH_STATUS_GENERR;
|
||||
@@ -699,12 +699,12 @@ static switch_status exosip_read_frame(switch_core_session_t *session, switch_fr
|
||||
}
|
||||
|
||||
|
||||
static switch_status exosip_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t exosip_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
switch_status status = SWITCH_STATUS_SUCCESS;
|
||||
switch_status_t status = SWITCH_STATUS_SUCCESS;
|
||||
int bytes = 0, samples = 0, frames = 0;
|
||||
|
||||
channel = switch_core_session_get_channel(session);
|
||||
@@ -811,7 +811,7 @@ static switch_status exosip_write_frame(switch_core_session_t *session, switch_f
|
||||
|
||||
|
||||
|
||||
static switch_status exosip_kill_channel(switch_core_session_t *session, int sig)
|
||||
static switch_status_t exosip_kill_channel(switch_core_session_t *session, int sig)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -833,7 +833,7 @@ static switch_status exosip_kill_channel(switch_core_session_t *session, int sig
|
||||
|
||||
}
|
||||
|
||||
static switch_status exosip_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t exosip_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -848,7 +848,7 @@ static switch_status exosip_waitfor_read(switch_core_session_t *session, int ms,
|
||||
}
|
||||
|
||||
|
||||
static switch_status exosip_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t exosip_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -863,7 +863,7 @@ static switch_status exosip_waitfor_write(switch_core_session_t *session, int ms
|
||||
|
||||
}
|
||||
|
||||
static switch_status exosip_send_dtmf(switch_core_session_t *session, char *digits)
|
||||
static switch_status_t exosip_send_dtmf(switch_core_session_t *session, char *digits)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
char *c;
|
||||
@@ -891,7 +891,7 @@ static switch_status exosip_send_dtmf(switch_core_session_t *session, char *digi
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status exosip_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
|
||||
static switch_status_t exosip_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
|
||||
{
|
||||
switch_channel_t *channel;
|
||||
struct private_object *tech_pvt;
|
||||
@@ -957,7 +957,7 @@ static switch_status exosip_receive_message(switch_core_session_t *session, swit
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static const switch_io_routines exosip_io_routines = {
|
||||
static const switch_io_routines_t exosip_io_routines = {
|
||||
/*.outgoing_channel */ exosip_outgoing_channel,
|
||||
/*.answer_channel */ exosip_answer_channel,
|
||||
/*.read_frame */ exosip_read_frame,
|
||||
@@ -978,7 +978,7 @@ static const switch_state_handler_table_t exosip_event_handlers = {
|
||||
/*.on_transmit */ exosip_on_transmit
|
||||
};
|
||||
|
||||
static const switch_endpoint_interface exosip_endpoint_interface = {
|
||||
static const switch_endpoint_interface_t exosip_endpoint_interface = {
|
||||
/*.interface_name */ "exosip",
|
||||
/*.io_routines */ &exosip_io_routines,
|
||||
/*.event_handlers */ &exosip_event_handlers,
|
||||
@@ -986,7 +986,7 @@ static const switch_endpoint_interface exosip_endpoint_interface = {
|
||||
/*.next */ NULL
|
||||
};
|
||||
|
||||
static const switch_loadable_module_interface exosip_module_interface = {
|
||||
static const switch_loadable_module_interface_t exosip_module_interface = {
|
||||
/*.module_name */ modname,
|
||||
/*.endpoint_interface */ &exosip_endpoint_interface,
|
||||
/*.timer_interface */ NULL,
|
||||
@@ -995,7 +995,7 @@ static const switch_loadable_module_interface exosip_module_interface = {
|
||||
/*.application_interface */ NULL
|
||||
};
|
||||
|
||||
static switch_status exosip_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t exosip_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool)
|
||||
{
|
||||
if ((*new_session = switch_core_session_request(&exosip_endpoint_interface, pool)) != 0) {
|
||||
@@ -1060,7 +1060,7 @@ static switch_status exosip_outgoing_channel(switch_core_session_t *session, swi
|
||||
}
|
||||
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void)
|
||||
{
|
||||
if (globals.running) {
|
||||
globals.running = -1;
|
||||
@@ -1071,7 +1071,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename)
|
||||
{
|
||||
/* NOTE: **interface is **_interface because the common lib redefines interface to struct in some situations */
|
||||
|
||||
@@ -1111,7 +1111,7 @@ static void sdp_add_rfc2833(struct osip_rfc3264 *cnf, int rate)
|
||||
}
|
||||
|
||||
|
||||
static switch_status exosip_create_call(eXosip_event_t * event)
|
||||
static switch_status_t exosip_create_call(eXosip_event_t * event)
|
||||
{
|
||||
switch_core_session_t *session;
|
||||
sdp_message_t *remote_sdp = NULL;
|
||||
@@ -1126,7 +1126,7 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||
|
||||
if ((session = switch_core_session_request(&exosip_endpoint_interface, NULL)) != 0) {
|
||||
struct private_object *tech_pvt;
|
||||
switch_codec_interface *codecs[SWITCH_MAX_CODECS];
|
||||
switch_codec_interface_t *codecs[SWITCH_MAX_CODECS];
|
||||
int num_codecs = 0;
|
||||
switch_port_t sdp_port;
|
||||
char *ip, *err;
|
||||
@@ -1434,12 +1434,12 @@ static void destroy_call_by_event(eXosip_event_t *event)
|
||||
|
||||
}
|
||||
|
||||
static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload)
|
||||
static switch_status_t parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload)
|
||||
{
|
||||
int pos = 0;
|
||||
sdp_attribute_t *attr = NULL;
|
||||
char *name, *rate, *payload;
|
||||
switch_status status = SWITCH_STATUS_GENERR;
|
||||
switch_status_t status = SWITCH_STATUS_GENERR;
|
||||
|
||||
while (osip_list_eol(media->a_attributes, pos) == 0) {
|
||||
attr = (sdp_attribute_t *) osip_list_get(media->a_attributes, pos);
|
||||
@@ -1805,7 +1805,7 @@ static int config_exosip(int reload)
|
||||
}
|
||||
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
|
||||
{
|
||||
eXosip_event_t *event = NULL;
|
||||
switch_event_t *s_event;
|
||||
|
||||
@@ -204,7 +204,7 @@ typedef enum {
|
||||
IAX_QUERY = 2
|
||||
} iax_io_t;
|
||||
|
||||
static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_session *iax_session,
|
||||
static switch_status_t iax_set_codec(struct private_object *tech_pvt, struct iax_session *iax_session,
|
||||
unsigned int *format, unsigned int *cababilities, unsigned short *samprate,
|
||||
iax_io_t io)
|
||||
{
|
||||
@@ -212,7 +212,7 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||
//int rate = 8000;
|
||||
//int codec_ms = 20;
|
||||
switch_channel_t *channel;
|
||||
switch_codec_interface *codecs[SWITCH_MAX_CODECS];
|
||||
switch_codec_interface_t *codecs[SWITCH_MAX_CODECS];
|
||||
int num_codecs = 0;
|
||||
unsigned int local_cap = 0, mixed_cap = 0, chosen = 0, leading = 0;
|
||||
int x, srate = 8000;
|
||||
@@ -390,18 +390,18 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_init(switch_core_session_t *session);
|
||||
static switch_status channel_on_hangup(switch_core_session_t *session);
|
||||
static switch_status channel_on_ring(switch_core_session_t *session);
|
||||
static switch_status channel_on_loopback(switch_core_session_t *session);
|
||||
static switch_status channel_on_transmit(switch_core_session_t *session);
|
||||
static switch_status channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t channel_on_init(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_hangup(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_ring(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_loopback(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_transmit(switch_core_session_t *session);
|
||||
static switch_status_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool);
|
||||
static switch_status channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status channel_kill_channel(switch_core_session_t *session, int sig);
|
||||
static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
|
||||
|
||||
|
||||
static void iax_err_cb(const char *s)
|
||||
@@ -422,7 +422,7 @@ State methods they get called when the state changes to the specific state
|
||||
returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
|
||||
so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
|
||||
*/
|
||||
static switch_status channel_on_init(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_init(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -449,7 +449,7 @@ static switch_status channel_on_init(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_ring(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_ring(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -465,7 +465,7 @@ static switch_status channel_on_ring(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_execute(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_execute(switch_core_session_t *session)
|
||||
{
|
||||
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -483,7 +483,7 @@ static switch_status channel_on_execute(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_hangup(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_hangup(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -519,7 +519,7 @@ static switch_status channel_on_hangup(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_kill_channel(switch_core_session_t *session, int sig)
|
||||
static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -541,19 +541,19 @@ static switch_status channel_kill_channel(switch_core_session_t *session, int si
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_loopback(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_loopback(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_transmit(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_transmit(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -563,7 +563,7 @@ static switch_status channel_waitfor_read(switch_core_session_t *session, int ms
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -574,7 +574,7 @@ static switch_status channel_waitfor_write(switch_core_session_t *session, int m
|
||||
|
||||
}
|
||||
|
||||
static switch_status channel_send_dtmf(switch_core_session_t *session, char *dtmf)
|
||||
static switch_status_t channel_send_dtmf(switch_core_session_t *session, char *dtmf)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
char *digit;
|
||||
@@ -590,8 +590,8 @@ static switch_status channel_send_dtmf(switch_core_session_t *session, char *dtm
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -636,8 +636,8 @@ static switch_status channel_read_frame(switch_core_session_t *session, switch_f
|
||||
return SWITCH_STATUS_FALSE;
|
||||
}
|
||||
|
||||
static switch_status channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -665,7 +665,7 @@ static switch_status channel_write_frame(switch_core_session_t *session, switch_
|
||||
|
||||
}
|
||||
|
||||
static switch_status channel_answer_channel(switch_core_session_t *session)
|
||||
static switch_status_t channel_answer_channel(switch_core_session_t *session)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -691,7 +691,7 @@ static const switch_state_handler_table_t channel_event_handlers = {
|
||||
/*.on_transmit */ channel_on_transmit
|
||||
};
|
||||
|
||||
static const switch_io_routines channel_io_routines = {
|
||||
static const switch_io_routines_t channel_io_routines = {
|
||||
/*.outgoing_channel */ channel_outgoing_channel,
|
||||
/*.answer_channel */ channel_answer_channel,
|
||||
/*.read_frame */ channel_read_frame,
|
||||
@@ -702,7 +702,7 @@ static const switch_io_routines channel_io_routines = {
|
||||
/*.send_dtmf */ channel_send_dtmf
|
||||
};
|
||||
|
||||
static const switch_endpoint_interface channel_endpoint_interface = {
|
||||
static const switch_endpoint_interface_t channel_endpoint_interface = {
|
||||
/*.interface_name */ "iax",
|
||||
/*.io_routines */ &channel_io_routines,
|
||||
/*.event_handlers */ &channel_event_handlers,
|
||||
@@ -710,7 +710,7 @@ static const switch_endpoint_interface channel_endpoint_interface = {
|
||||
/*.next */ NULL
|
||||
};
|
||||
|
||||
static const switch_loadable_module_interface channel_module_interface = {
|
||||
static const switch_loadable_module_interface_t channel_module_interface = {
|
||||
/*.module_name */ modname,
|
||||
/*.endpoint_interface */ &channel_endpoint_interface,
|
||||
/*.timer_interface */ NULL,
|
||||
@@ -723,7 +723,7 @@ static const switch_loadable_module_interface channel_module_interface = {
|
||||
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
||||
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
||||
*/
|
||||
static switch_status channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool)
|
||||
{
|
||||
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, pool)) != 0) {
|
||||
@@ -790,7 +790,7 @@ static switch_status channel_outgoing_channel(switch_core_session_t *session, sw
|
||||
|
||||
}
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename)
|
||||
{
|
||||
|
||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||
@@ -815,7 +815,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||
#define REGISTERED 1
|
||||
|
||||
|
||||
static switch_status load_config(void)
|
||||
static switch_status_t load_config(void)
|
||||
{
|
||||
switch_config_t cfg;
|
||||
char *var, *val;
|
||||
@@ -867,7 +867,7 @@ static switch_status load_config(void)
|
||||
}
|
||||
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
|
||||
{
|
||||
//int refresh;
|
||||
struct iax_event *iaxevent = NULL;
|
||||
@@ -1115,7 +1115,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||
}
|
||||
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void)
|
||||
{
|
||||
int x = 0;
|
||||
|
||||
|
||||
@@ -98,35 +98,35 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan)
|
||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_name, globals.cid_name)
|
||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_num, globals.cid_num)
|
||||
|
||||
static switch_status channel_on_init(switch_core_session_t *session);
|
||||
static switch_status channel_on_hangup(switch_core_session_t *session);
|
||||
static switch_status channel_on_ring(switch_core_session_t *session);
|
||||
static switch_status channel_on_loopback(switch_core_session_t *session);
|
||||
static switch_status channel_on_transmit(switch_core_session_t *session);
|
||||
static switch_status channel_outgoing_channel(switch_core_session_t *session,
|
||||
static switch_status_t channel_on_init(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_hangup(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_ring(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_loopback(switch_core_session_t *session);
|
||||
static switch_status_t channel_on_transmit(switch_core_session_t *session);
|
||||
static switch_status_t channel_outgoing_channel(switch_core_session_t *session,
|
||||
switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool);
|
||||
static switch_status channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status channel_kill_channel(switch_core_session_t *session, int sig);
|
||||
static switch_status engage_device(struct private_object *tech_pvt);
|
||||
static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
|
||||
static switch_status_t engage_device(struct private_object *tech_pvt);
|
||||
static int dump_info(void);
|
||||
static switch_status load_config(void);
|
||||
static switch_status_t load_config(void);
|
||||
static int get_dev_by_name(char *name, int in);
|
||||
static switch_status place_call(char *dest, char *out, size_t outlen);
|
||||
static switch_status hup_call(char *callid, char *out, size_t outlen);
|
||||
static switch_status call_info(char *callid, char *out, size_t outlen);
|
||||
static switch_status send_dtmf(char *callid, char *out, size_t outlen);
|
||||
static switch_status answer_call(char *callid, char *out, size_t outlen);
|
||||
static switch_status_t place_call(char *dest, char *out, size_t outlen);
|
||||
static switch_status_t hup_call(char *callid, char *out, size_t outlen);
|
||||
static switch_status_t call_info(char *callid, char *out, size_t outlen);
|
||||
static switch_status_t send_dtmf(char *callid, char *out, size_t outlen);
|
||||
static switch_status_t answer_call(char *callid, char *out, size_t outlen);
|
||||
|
||||
/*
|
||||
State methods they get called when the state changes to the specific state
|
||||
returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
|
||||
so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
|
||||
*/
|
||||
static switch_status channel_on_init(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_init(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -148,7 +148,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_ring(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_ring(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -164,7 +164,7 @@ static switch_status channel_on_ring(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_execute(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_execute(switch_core_session_t *session)
|
||||
{
|
||||
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -196,7 +196,7 @@ static void deactivate_audio_device(struct private_object *tech_pvt)
|
||||
switch_mutex_unlock(globals.device_lock);
|
||||
}
|
||||
|
||||
static switch_status channel_on_hangup(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_hangup(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -220,7 +220,7 @@ static switch_status channel_on_hangup(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_kill_channel(switch_core_session_t *session, int sig)
|
||||
static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -241,13 +241,13 @@ static switch_status channel_kill_channel(switch_core_session_t *session, int si
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_loopback(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_loopback(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_on_transmit(switch_core_session_t *session)
|
||||
static switch_status_t channel_on_transmit(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -291,7 +291,7 @@ static switch_status channel_on_transmit(switch_core_session_t *session)
|
||||
}
|
||||
|
||||
|
||||
static switch_status channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -301,7 +301,7 @@ static switch_status channel_waitfor_read(switch_core_session_t *session, int ms
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -312,7 +312,7 @@ static switch_status channel_waitfor_write(switch_core_session_t *session, int m
|
||||
|
||||
}
|
||||
|
||||
static switch_status channel_send_dtmf(switch_core_session_t *session, char *dtmf)
|
||||
static switch_status_t channel_send_dtmf(switch_core_session_t *session, char *dtmf)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -324,13 +324,13 @@ static switch_status channel_send_dtmf(switch_core_session_t *session, char *dtm
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
int samples;
|
||||
switch_status status = SWITCH_STATUS_FALSE;
|
||||
switch_status_t status = SWITCH_STATUS_FALSE;
|
||||
|
||||
channel = switch_core_session_get_channel(session);
|
||||
assert(channel != NULL);
|
||||
@@ -358,12 +358,12 @@ static switch_status channel_read_frame(switch_core_session_t *session, switch_f
|
||||
return status;
|
||||
}
|
||||
|
||||
static switch_status channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
switch_status status = SWITCH_STATUS_FALSE;
|
||||
switch_status_t status = SWITCH_STATUS_FALSE;
|
||||
channel = switch_core_session_get_channel(session);
|
||||
assert(channel != NULL);
|
||||
|
||||
@@ -384,7 +384,7 @@ static switch_status channel_write_frame(switch_core_session_t *session, switch_
|
||||
|
||||
}
|
||||
|
||||
static switch_status channel_answer_channel(switch_core_session_t *session)
|
||||
static switch_status_t channel_answer_channel(switch_core_session_t *session)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -399,35 +399,35 @@ static switch_status channel_answer_channel(switch_core_session_t *session)
|
||||
}
|
||||
|
||||
|
||||
static struct switch_api_interface send_dtmf_interface = {
|
||||
static switch_api_interface_t send_dtmf_interface = {
|
||||
/*.interface_name */ "padtmf",
|
||||
/*.desc */ "PortAudio Dial DTMF",
|
||||
/*.function */ send_dtmf,
|
||||
/*.next */ NULL
|
||||
};
|
||||
|
||||
static struct switch_api_interface answer_call_interface = {
|
||||
static switch_api_interface_t answer_call_interface = {
|
||||
/*.interface_name */ "paoffhook",
|
||||
/*.desc */ "PortAudio Answer Call",
|
||||
/*.function */ answer_call,
|
||||
/*.next */ &send_dtmf_interface
|
||||
};
|
||||
|
||||
static struct switch_api_interface channel_info_interface = {
|
||||
static switch_api_interface_t channel_info_interface = {
|
||||
/*.interface_name */ "painfo",
|
||||
/*.desc */ "PortAudio Call Info",
|
||||
/*.function */ call_info,
|
||||
/*.next */ &answer_call_interface
|
||||
};
|
||||
|
||||
static struct switch_api_interface channel_hup_interface = {
|
||||
static switch_api_interface_t channel_hup_interface = {
|
||||
/*.interface_name */ "pahup",
|
||||
/*.desc */ "PortAudio Hangup Call",
|
||||
/*.function */ hup_call,
|
||||
/*.next */ &channel_info_interface
|
||||
};
|
||||
|
||||
static struct switch_api_interface channel_api_interface = {
|
||||
static switch_api_interface_t channel_api_interface = {
|
||||
/*.interface_name */ "pacall",
|
||||
/*.desc */ "PortAudio Call",
|
||||
/*.function */ place_call,
|
||||
@@ -443,7 +443,7 @@ static const switch_state_handler_table_t channel_event_handlers = {
|
||||
/*.on_transmit */ channel_on_transmit
|
||||
};
|
||||
|
||||
static const switch_io_routines channel_io_routines = {
|
||||
static const switch_io_routines_t channel_io_routines = {
|
||||
/*.outgoing_channel */ channel_outgoing_channel,
|
||||
/*.answer_channel */ channel_answer_channel,
|
||||
/*.read_frame */ channel_read_frame,
|
||||
@@ -454,7 +454,7 @@ static const switch_io_routines channel_io_routines = {
|
||||
/*.send_dtmf */ channel_send_dtmf
|
||||
};
|
||||
|
||||
static const switch_endpoint_interface channel_endpoint_interface = {
|
||||
static const switch_endpoint_interface_t channel_endpoint_interface = {
|
||||
/*.interface_name */ "portaudio",
|
||||
/*.io_routines */ &channel_io_routines,
|
||||
/*.event_handlers */ &channel_event_handlers,
|
||||
@@ -462,7 +462,7 @@ static const switch_endpoint_interface channel_endpoint_interface = {
|
||||
/*.next */ NULL
|
||||
};
|
||||
|
||||
static const switch_loadable_module_interface channel_module_interface = {
|
||||
static const switch_loadable_module_interface_t channel_module_interface = {
|
||||
/*.module_name */ modname,
|
||||
/*.endpoint_interface */ &channel_endpoint_interface,
|
||||
/*.timer_interface */ NULL,
|
||||
@@ -475,7 +475,7 @@ static const switch_loadable_module_interface channel_module_interface = {
|
||||
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
||||
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
||||
*/
|
||||
static switch_status channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t channel_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool)
|
||||
{
|
||||
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, pool)) != 0) {
|
||||
@@ -523,7 +523,7 @@ static switch_status channel_outgoing_channel(switch_core_session_t *session, sw
|
||||
}
|
||||
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename)
|
||||
{
|
||||
|
||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||
@@ -552,7 +552,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||
}
|
||||
|
||||
|
||||
static switch_status load_config(void)
|
||||
static switch_status_t load_config(void)
|
||||
{
|
||||
switch_config_t cfg;
|
||||
char *var, *val;
|
||||
@@ -607,7 +607,7 @@ static switch_status load_config(void)
|
||||
}
|
||||
|
||||
/*
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
|
||||
{
|
||||
|
||||
switch_yield(50000);
|
||||
@@ -616,7 +616,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||
}
|
||||
*/
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void)
|
||||
{
|
||||
Pa_Terminate();
|
||||
|
||||
@@ -710,7 +710,7 @@ static int dump_info(void)
|
||||
return err;
|
||||
}
|
||||
|
||||
static switch_status engage_device(struct private_object *tech_pvt)
|
||||
static switch_status_t engage_device(struct private_object *tech_pvt)
|
||||
{
|
||||
int sample_rate = globals.sample_rate;
|
||||
int codec_ms = 20;
|
||||
@@ -780,10 +780,10 @@ static switch_status engage_device(struct private_object *tech_pvt)
|
||||
return SWITCH_STATUS_FALSE;
|
||||
}
|
||||
|
||||
static switch_status place_call(char *dest, char *out, size_t outlen)
|
||||
static switch_status_t place_call(char *dest, char *out, size_t outlen)
|
||||
{
|
||||
switch_core_session_t *session;
|
||||
switch_status status = SWITCH_STATUS_FALSE;
|
||||
switch_status_t status = SWITCH_STATUS_FALSE;
|
||||
|
||||
if (!dest) {
|
||||
strncpy(out, "Usage: pacall <exten>", outlen - 1);
|
||||
@@ -831,7 +831,7 @@ static switch_status place_call(char *dest, char *out, size_t outlen)
|
||||
}
|
||||
|
||||
|
||||
static switch_status hup_call(char *callid, char *out, size_t outlen)
|
||||
static switch_status_t hup_call(char *callid, char *out, size_t outlen)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -875,7 +875,7 @@ static switch_status hup_call(char *callid, char *out, size_t outlen)
|
||||
}
|
||||
|
||||
|
||||
static switch_status send_dtmf(char *callid, char *out, size_t outlen)
|
||||
static switch_status_t send_dtmf(char *callid, char *out, size_t outlen)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -899,7 +899,7 @@ static switch_status send_dtmf(char *callid, char *out, size_t outlen)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status answer_call(char *callid, char *out, size_t outlen)
|
||||
static switch_status_t answer_call(char *callid, char *out, size_t outlen)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -931,7 +931,7 @@ static void print_info(struct private_object *tech_pvt, char *out, size_t outlen
|
||||
|
||||
}
|
||||
|
||||
static switch_status call_info(char *callid, char *out, size_t outlen)
|
||||
static switch_status_t call_info(char *callid, char *out, size_t outlen)
|
||||
{
|
||||
struct private_object *tech_pvt;
|
||||
switch_hash_index_t *hi;
|
||||
|
||||
@@ -163,18 +163,18 @@ typedef struct woomera_event_queue woomera_event_queue;
|
||||
|
||||
static woomera_profile default_profile;
|
||||
|
||||
static switch_status woomerachan_on_init(switch_core_session_t *session);
|
||||
static switch_status woomerachan_on_hangup(switch_core_session_t *session);
|
||||
static switch_status woomerachan_on_ring(switch_core_session_t *session);
|
||||
static switch_status woomerachan_on_loopback(switch_core_session_t *session);
|
||||
static switch_status woomerachan_on_transmit(switch_core_session_t *session);
|
||||
static switch_status woomerachan_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t woomerachan_on_init(switch_core_session_t *session);
|
||||
static switch_status_t woomerachan_on_hangup(switch_core_session_t *session);
|
||||
static switch_status_t woomerachan_on_ring(switch_core_session_t *session);
|
||||
static switch_status_t woomerachan_on_loopback(switch_core_session_t *session);
|
||||
static switch_status_t woomerachan_on_transmit(switch_core_session_t *session);
|
||||
static switch_status_t woomerachan_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool);
|
||||
static switch_status woomerachan_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status woomerachan_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id);
|
||||
static switch_status woomerachan_kill_channel(switch_core_session_t *session, int sig);
|
||||
static switch_status_t woomerachan_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t woomerachan_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id);
|
||||
static switch_status_t woomerachan_kill_channel(switch_core_session_t *session, int sig);
|
||||
static void tech_destroy(private_object * tech_pvt);
|
||||
static void woomera_printf(woomera_profile * profile, switch_socket_t *socket, char *fmt, ...);
|
||||
static char *woomera_message_header(woomera_message * wmsg, char *key);
|
||||
@@ -195,7 +195,7 @@ static int tech_activate(private_object * tech_pvt);
|
||||
returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
|
||||
so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
|
||||
*/
|
||||
static switch_status woomerachan_on_init(switch_core_session_t *session)
|
||||
static switch_status_t woomerachan_on_init(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -239,7 +239,7 @@ static switch_status woomerachan_on_init(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status woomerachan_on_ring(switch_core_session_t *session)
|
||||
static switch_status_t woomerachan_on_ring(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -255,7 +255,7 @@ static switch_status woomerachan_on_ring(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status woomerachan_on_execute(switch_core_session_t *session)
|
||||
static switch_status_t woomerachan_on_execute(switch_core_session_t *session)
|
||||
{
|
||||
|
||||
switch_channel_t *channel = NULL;
|
||||
@@ -273,7 +273,7 @@ static switch_status woomerachan_on_execute(switch_core_session_t *session)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status woomerachan_on_hangup(switch_core_session_t *session)
|
||||
static switch_status_t woomerachan_on_hangup(switch_core_session_t *session)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -311,7 +311,7 @@ static void udp_socket_close(struct private_object *tech_pvt)
|
||||
}
|
||||
|
||||
|
||||
static switch_status woomerachan_kill_channel(switch_core_session_t *session, int sig)
|
||||
static switch_status_t woomerachan_kill_channel(switch_core_session_t *session, int sig)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -336,19 +336,19 @@ static switch_status woomerachan_kill_channel(switch_core_session_t *session, in
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status woomerachan_on_loopback(switch_core_session_t *session)
|
||||
static switch_status_t woomerachan_on_loopback(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WOOMERACHAN LOOPBACK\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status woomerachan_on_transmit(switch_core_session_t *session)
|
||||
static switch_status_t woomerachan_on_transmit(switch_core_session_t *session)
|
||||
{
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WOOMERACHAN TRANSMIT\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status woomerachan_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t woomerachan_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -358,7 +358,7 @@ static switch_status woomerachan_waitfor_read(switch_core_session_t *session, in
|
||||
return switch_socket_waitfor(&tech_pvt->read_poll, ms) ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static switch_status woomerachan_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
static switch_status_t woomerachan_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
|
||||
{
|
||||
struct private_object *tech_pvt = NULL;
|
||||
|
||||
@@ -369,8 +369,8 @@ static switch_status woomerachan_waitfor_write(switch_core_session_t *session, i
|
||||
// return switch_socket_waitfor(&tech_pvt->write_poll, ms);
|
||||
}
|
||||
|
||||
static switch_status woomerachan_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t woomerachan_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -404,8 +404,8 @@ static switch_status woomerachan_read_frame(switch_core_session_t *session, swit
|
||||
return SWITCH_STATUS_FALSE;
|
||||
}
|
||||
|
||||
static switch_status woomerachan_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag flags, int stream_id)
|
||||
static switch_status_t woomerachan_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout,
|
||||
switch_io_flag_t flags, int stream_id)
|
||||
{
|
||||
switch_channel_t *channel = NULL;
|
||||
struct private_object *tech_pvt = NULL;
|
||||
@@ -441,7 +441,7 @@ static const switch_state_handler_table_t woomerachan_event_handlers = {
|
||||
/*.on_transmit */ woomerachan_on_transmit
|
||||
};
|
||||
|
||||
static const switch_io_routines woomerachan_io_routines = {
|
||||
static const switch_io_routines_t woomerachan_io_routines = {
|
||||
/*.outgoing_channel */ woomerachan_outgoing_channel,
|
||||
/*.answer_channel */ NULL,
|
||||
/*.read_frame */ woomerachan_read_frame,
|
||||
@@ -451,7 +451,7 @@ static const switch_io_routines woomerachan_io_routines = {
|
||||
/*.waitfor_write */ woomerachan_waitfor_write
|
||||
};
|
||||
|
||||
static const switch_endpoint_interface woomerachan_endpoint_interface = {
|
||||
static const switch_endpoint_interface_t woomerachan_endpoint_interface = {
|
||||
/*.interface_name */ "woomera",
|
||||
/*.io_routines */ &woomerachan_io_routines,
|
||||
/*.event_handlers */ &woomerachan_event_handlers,
|
||||
@@ -459,7 +459,7 @@ static const switch_endpoint_interface woomerachan_endpoint_interface = {
|
||||
/*.next */ NULL
|
||||
};
|
||||
|
||||
static const switch_loadable_module_interface woomerachan_module_interface = {
|
||||
static const switch_loadable_module_interface_t woomerachan_module_interface = {
|
||||
/*.module_name */ modname,
|
||||
/*.endpoint_interface */ &woomerachan_endpoint_interface,
|
||||
/*.timer_interface */ NULL,
|
||||
@@ -472,7 +472,7 @@ static const switch_loadable_module_interface woomerachan_module_interface = {
|
||||
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
||||
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
||||
*/
|
||||
static switch_status woomerachan_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
static switch_status_t woomerachan_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
|
||||
switch_core_session_t **new_session, switch_memory_pool_t *pool)
|
||||
{
|
||||
if ((*new_session = switch_core_session_request(&woomerachan_endpoint_interface, pool)) != 0) {
|
||||
@@ -1276,7 +1276,7 @@ static void *woomera_thread_run(void *obj)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void)
|
||||
{
|
||||
|
||||
woomera_thread_run(&default_profile);
|
||||
@@ -1284,7 +1284,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||
return SWITCH_STATUS_TERM;
|
||||
}
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void)
|
||||
{
|
||||
int x = 0;
|
||||
woomera_profile_thread_running(&default_profile, 1, 0);
|
||||
@@ -1298,7 +1298,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
||||
SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename)
|
||||
{
|
||||
|
||||
switch_config_t cfg;
|
||||
|
||||
Reference in new issue
Block a user