- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5024 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 26 Apr '07

26 Apr '07

Author: mikej Date: Thu Apr 26 19:09:26 2007 New Revision: 5024 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Log: address http://jira.freeswitch.org/browse/FSCORE-6 We still need to test what the right number is for stack depth is for different platforms. We can get 13 out of msvc on my box (set the level to 12) but this is probably platform dependent and stack size dependent. How can we compute this? Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Thu Apr 26 19:09:26 2007 @@ -623,6 +623,7 @@ return Event; } +#define MAX_STACK_DEPTH 12 static switch_status_t js_common_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { @@ -639,6 +640,8 @@ return SWITCH_STATUS_FALSE; } + jss->stack_depth++; + switch (itype) { case SWITCH_INPUT_TYPE_EVENT: if ((event = (switch_event_t *) input)) { @@ -648,6 +651,7 @@ } } if (!Event) { + jss->stack_depth--; return SWITCH_STATUS_FALSE; } break; @@ -662,10 +666,17 @@ argv[argc++] = cb_state->arg; } + if (jss->stack_depth > MAX_STACK_DEPTH) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Maximum recursive callback limit %d reached.\n", MAX_STACK_DEPTH); + jss->stack_depth--; + return SWITCH_STATUS_FALSE; + } + JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret); cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); + jss->stack_depth--; return SWITCH_STATUS_SUCCESS; } @@ -2037,6 +2048,7 @@ jss->flags = flags; jss->cx = cx; jss->obj = session_obj; + jss->stack_depth = 0; if ((JS_SetPrivate(cx, session_obj, jss) && JS_DefineProperties(cx, session_obj, session_props) && JS_DefineFunctions(cx, session_obj, session_methods))) { return session_obj; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Thu Apr 26 19:09:26 2007 @@ -129,6 +129,7 @@ unsigned int flags; switch_call_cause_t cause; JSFunction *on_hangup; + int stack_depth; switch_channel_state_t hook_state; };

1 0

[commit] r5023 - in freeswitch/trunk: conf src/mod/endpoints/mod_alsa
by Freeswitch SVN 26 Apr '07

26 Apr '07

Author: anthm Date: Thu Apr 26 18:15:07 2007 New Revision: 5023 Added: freeswitch/trunk/src/mod/endpoints/mod_alsa/ freeswitch/trunk/src/mod/endpoints/mod_alsa/Makefile freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/conf/modules.conf.xml Log: mod_alsa (pa impersonator) Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Apr 26 18:15:07 2007 @@ -30,6 +30,7 @@    +     Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Thu Apr 26 18:15:07 2007 @@ -27,6 +27,7 @@   <load module="mod_portaudio"/> + <load module="mod_alsa"/> <load module="mod_sofia"/>   Added: freeswitch/trunk/src/mod/endpoints/mod_alsa/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/Makefile Thu Apr 26 18:15:07 2007 @@ -0,0 +1,10 @@ +BASE=../../../.. + +LOCAL_CFLAGS=-I. -I$(PA_DIR)/include -D__EXTENSION__=1 +LOCAL_LDFLAGS=-lasound +LOCAL_OBJS= +LOCAL_SOURCES= + +include $(BASE)/build/modmake.rules + +$(LOCAL_OBJS): $(LOCAL_SOURCES) Added: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Thu Apr 26 18:15:07 2007 @@ -0,0 +1,1731 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * 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 + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * + * mod_portaudio.c -- PortAudio Endpoint Module + * + */ +#include <switch.h> + +#include <stdio.h> +#include <stdlib.h> +#include <math.h> +#include <string.h> +#include <alsa/asoundlib.h> + +#define MY_EVENT_RINGING "alsa::ringing" + +static const char modname[] = "mod_alsa"; + +static switch_memory_pool_t *module_pool = NULL; +//static int running = 1; + +#define SAMPLE_TYPE paInt16 +//#define SAMPLE_TYPE paFloat32 +typedef short SAMPLE; + +typedef switch_status_t (*pa_command_t) (char **argv, int argc, switch_stream_handle_t *stream); + +typedef enum { + GFLAG_NONE = 0, + GFLAG_EAR = (1 << 0), + GFLAG_MOUTH = (1 << 1), + GFLAG_RING = (1 << 2) +} GFLAGS; + +typedef enum { + TFLAG_IO = (1 << 0), + TFLAG_INBOUND = (1 << 1), + TFLAG_OUTBOUND = (1 << 2), + TFLAG_DTMF = (1 << 3), + TFLAG_VOICE = (1 << 4), + TFLAG_HANGUP = (1 << 5), + TFLAG_LINEAR = (1 << 6), + TFLAG_ANSWER = (1 << 7), + TFLAG_HUP = (1 << 8), + TFLAG_MASTER = (1 << 9) +} TFLAGS; + +struct private_object { + unsigned int flags; + switch_core_session_t *session; + switch_caller_profile_t *caller_profile; + char call_id[50]; + int sample_rate; + int codec_ms; + switch_mutex_t *flag_mutex; + char *hold_file; + switch_file_handle_t fh; + switch_file_handle_t *hfh; + switch_frame_t hold_frame; + unsigned char holdbuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_codec_t write_codec; + switch_timer_t timer; + struct private_object *next; +}; + +typedef struct private_object private_t; + +static struct { + int debug; + int port; + char *cid_name; + char *cid_num; + char *dialplan; + char *ring_file; + char *hold_file; + char *timer_name; + int call_id; + switch_hash_t *call_hash; + switch_mutex_t *device_lock; + switch_mutex_t *pvt_lock; + switch_mutex_t *flag_mutex; + int sample_rate; + int codec_ms; + snd_pcm_t *audio_stream_in; + snd_pcm_t *audio_stream_out; + snd_pcm_t *ring_stream; + + switch_codec_t read_codec; + switch_codec_t write_codec; + switch_frame_t read_frame; + switch_frame_t cng_frame; + unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + unsigned char cngbuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + private_t *call_list; + int ring_interval; + GFLAGS flags; + switch_timer_t timer; +} globals; + + +#define PA_MASTER 1 +#define PA_SLAVE 0 + + +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) + SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ring_file, globals.ring_file) + SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_hold_file, globals.hold_file) + SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_timer_name, globals.timer_name) +#define is_master(t) switch_test_flag(t, TFLAG_MASTER) + static void add_pvt(private_t * tech_pvt, int master); + static void remove_pvt(private_t * tech_pvt); + 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_call_cause_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_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(unsigned int samplerate, int codec_ms); + static switch_status_t engage_ring_device(unsigned int sample_rate, int channels); + static void deactivate_ring_device(void); + + static switch_status_t load_config(void); + static switch_status_t pa_cmd(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t padep(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + + +/* + 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_t channel_on_init(switch_core_session_t *session) +{ + switch_channel_t *channel; + private_t *tech_pvt = NULL; + switch_time_t last; + int waitsec = globals.ring_interval * 1000000; + switch_file_handle_t fh = { 0 }; + char *val, *ring_file = NULL, *hold_file = NULL; + int16_t abuf[2048]; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + + last = switch_time_now() - waitsec; + + + + if ((val = switch_channel_get_variable(channel, "pa_hold_file"))) { + hold_file = val; + } else { + hold_file = globals.hold_file; + } + + if (hold_file) { + tech_pvt->hold_file = switch_core_session_strdup(session, hold_file); + } + + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL INIT %d %d\n", + switch_channel_get_name(channel), switch_channel_get_state(channel), switch_test_flag(tech_pvt, TFLAG_ANSWER)); + + + + if (engage_device(tech_pvt->sample_rate, tech_pvt->codec_ms) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return SWITCH_STATUS_FALSE; + } + + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + add_pvt(tech_pvt, PA_SLAVE); + + ring_file = globals.ring_file; + if ((val = switch_channel_get_variable(channel, "pa_ring_file"))) { + ring_file = val; + } + + if (switch_test_flag((&globals), GFLAG_RING)) { + ring_file = NULL; + } + switch_set_flag_locked((&globals), GFLAG_RING); + if (ring_file) { + if (switch_core_file_open(&fh, + ring_file, + globals.read_codec.implementation->number_of_channels, + globals.read_codec.implementation->samples_per_second, + SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) { + + if (engage_ring_device(fh.samplerate, fh.channels) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ring Error!\n"); + switch_core_file_close(&fh); + return SWITCH_STATUS_GENERR; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot open %s, disabling ring file!\n", ring_file); + ring_file = NULL; + } + } + } + + switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_channel_mark_ring_ready(channel); + + while (switch_channel_get_state(channel) == CS_INIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) { + if (switch_time_now() - last >= waitsec) { + char buf[512]; + switch_event_t *event; + + snprintf(buf, sizeof(buf), "BRRRRING! BRRRRING! call %s\n", tech_pvt->call_id); + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_RINGING) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_info", "%s", buf); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call_id", "%s", tech_pvt->call_id); + switch_channel_event_set_data(channel, event); + switch_event_fire(&event); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", buf); + last = switch_time_now(); + if (ring_file) { + unsigned int pos = 0; + switch_core_file_seek(&fh, &pos, 0, SEEK_SET); + for (;;) { + switch_size_t olen = 1024; + switch_core_file_read(&fh, abuf, &olen); + if (olen == 0) { + break; + } + snd_pcm_writei(globals.ring_stream, abuf, (int) olen); + } + } + } + + switch_yield(globals.read_codec.implementation->microseconds_per_frame); + + } + switch_clear_flag_locked((&globals), GFLAG_RING); + } + + if (ring_file) { + deactivate_ring_device(); + switch_core_file_close(&fh); + switch_core_codec_destroy(&tech_pvt->write_codec); + switch_core_timer_destroy(&tech_pvt->timer); + } + + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + if (!switch_test_flag(tech_pvt, TFLAG_ANSWER)) { + switch_channel_hangup(channel, SWITCH_CAUSE_NO_ANSWER); + return SWITCH_STATUS_SUCCESS; + } + } + + switch_set_flag_locked(tech_pvt, TFLAG_IO); + + /* Move Channel's State Machine to RING */ + switch_channel_set_state(channel, CS_RING); + + return SWITCH_STATUS_SUCCESS; + +} + +static switch_status_t channel_on_ring(switch_core_session_t *session) +{ + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL RING\n", switch_channel_get_name(channel)); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t channel_on_execute(switch_core_session_t *session) +{ + + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel)); + + + return SWITCH_STATUS_SUCCESS; +} + +static void deactivate_audio_device(void) +{ + switch_mutex_lock(globals.device_lock); + if (globals.audio_stream_in) { + snd_pcm_close(globals.audio_stream_in); + globals.audio_stream_in = NULL; + } + if (globals.audio_stream_out) { + snd_pcm_close(globals.audio_stream_out); + globals.audio_stream_out = NULL; + } + switch_mutex_unlock(globals.device_lock); +} + + +static void deactivate_ring_device(void) +{ + switch_mutex_lock(globals.device_lock); + if (globals.ring_stream) { + snd_pcm_close(globals.ring_stream); + globals.ring_stream = NULL; + } + switch_mutex_unlock(globals.device_lock); +} + + + +static void add_pvt(private_t * tech_pvt, int master) +{ + private_t *tp; + uint8_t in_list = 0; + + switch_mutex_lock(globals.pvt_lock); + + if (switch_strlen_zero(tech_pvt->call_id)) { + snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", ++globals.call_id); + switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt); + switch_core_session_set_read_codec(tech_pvt->session, &globals.read_codec); + switch_core_session_set_write_codec(tech_pvt->session, &globals.write_codec); + } + + for (tp = globals.call_list; tp; tp = tp->next) { + if (tp == tech_pvt) { + in_list = 1; + } + if (master) { + switch_clear_flag_locked(tp, TFLAG_MASTER); + } + } + + + if (master) { + if (!in_list) { + tech_pvt->next = globals.call_list; + globals.call_list = tech_pvt; + } + switch_set_flag_locked(tech_pvt, TFLAG_MASTER); + + } else if (!in_list) { + for (tp = globals.call_list; tp && tp->next; tp = tp->next); + if (tp) { + tp->next = tech_pvt; + } else { + globals.call_list = tech_pvt; + } + } + + switch_mutex_unlock(globals.pvt_lock); +} + +static void remove_pvt(private_t * tech_pvt) +{ + private_t *tp, *last = NULL; + + switch_mutex_lock(globals.pvt_lock); + for (tp = globals.call_list; tp; tp = tp->next) { + switch_clear_flag_locked(tp, TFLAG_MASTER); + if (tp == tech_pvt) { + if (last) { + last->next = tp->next; + } else { + globals.call_list = tp->next; + } + } + last = tp; + } + + if (globals.call_list) { + switch_set_flag_locked(globals.call_list, TFLAG_MASTER); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No more channels, deactivating audio\n"); + deactivate_audio_device(); + } + + switch_mutex_unlock(globals.pvt_lock); +} + +static switch_status_t channel_on_hangup(switch_core_session_t *session) +{ + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + remove_pvt(tech_pvt); + + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_HUP); + + switch_core_hash_delete(globals.call_hash, tech_pvt->call_id); + + if (tech_pvt->hfh) { + tech_pvt->hfh = NULL; + switch_core_file_close(&tech_pvt->fh); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel)); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig) +{ + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + switch (sig) { + case SWITCH_SIG_KILL: + switch_set_flag_locked(tech_pvt, TFLAG_HUP); + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + break; + default: + break; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); + + + return SWITCH_STATUS_SUCCESS; +} + +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_t channel_on_loopback(switch_core_session_t *session) +{ + switch_channel_t *channel = NULL; + private_t *tech_pvt = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n"); + + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id) +{ + private_t *tech_pvt = NULL; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id) +{ + private_t *tech_pvt = NULL; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + return SWITCH_STATUS_SUCCESS; + +} + +static switch_status_t channel_send_dtmf(switch_core_session_t *session, char *dtmf) +{ + private_t *tech_pvt = NULL; + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF ON CALL %s [%s]\n", tech_pvt->call_id, dtmf); + + return SWITCH_STATUS_SUCCESS; +} + +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; + private_t *tech_pvt = NULL; + int samples = 0; + switch_status_t status = SWITCH_STATUS_FALSE; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + if (!globals.audio_stream_in) { + return SWITCH_STATUS_FALSE; + } + + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { + return SWITCH_STATUS_FALSE; + } + + if (!switch_test_flag(tech_pvt, TFLAG_IO)) { + goto cng; + } + + if (!is_master(tech_pvt)) { + if (tech_pvt->hold_file) { + if (!tech_pvt->hfh) { + int codec_ms = tech_pvt->codec_ms ? tech_pvt->codec_ms : globals.codec_ms; + int sample_rate = tech_pvt->sample_rate ? tech_pvt->sample_rate : globals.sample_rate; + + if (switch_core_codec_init(&tech_pvt->write_codec, + "L16", + NULL, + sample_rate, + codec_ms, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + switch_core_codec_destroy(&globals.read_codec); + tech_pvt->hold_file = NULL; + goto cng; + } + + if (switch_core_file_open(&tech_pvt->fh, + tech_pvt->hold_file, + globals.read_codec.implementation->number_of_channels, + globals.read_codec.implementation->samples_per_second, + SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, + switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { + switch_core_codec_destroy(&tech_pvt->write_codec); + tech_pvt->hold_file = NULL; + goto cng; + } + + tech_pvt->hfh = &tech_pvt->fh; + tech_pvt->hold_frame.data = tech_pvt->holdbuf; + tech_pvt->hold_frame.buflen = sizeof(tech_pvt->holdbuf); + tech_pvt->hold_frame.rate = sample_rate; + tech_pvt->hold_frame.codec = &tech_pvt->write_codec; + } + + goto hold; + } + cng: + switch_yield(globals.read_codec.implementation->microseconds_per_frame); + *frame = &globals.cng_frame; + return SWITCH_STATUS_SUCCESS; + + hold: + + { + switch_size_t olen = globals.read_codec.implementation->samples_per_frame; + if (switch_core_timer_next(&tech_pvt->timer) != SWITCH_STATUS_SUCCESS) { + switch_core_file_close(&tech_pvt->fh); + switch_core_codec_destroy(&tech_pvt->write_codec); + goto cng; + } + switch_core_file_read(tech_pvt->hfh, tech_pvt->hold_frame.data, &olen); + + if (olen == 0) { + unsigned int pos = 0; + switch_core_file_seek(tech_pvt->hfh, &pos, 0, SEEK_SET); + goto cng; + } + + + tech_pvt->hold_frame.datalen = (uint32_t) (olen * sizeof(int16_t)); + tech_pvt->hold_frame.samples = (uint32_t) olen; + tech_pvt->hold_frame.timestamp = tech_pvt->timer.samplecount; + *frame = &tech_pvt->hold_frame; + + } + + return SWITCH_STATUS_SUCCESS; + } + + switch_mutex_lock(globals.device_lock); + + + if ((samples = snd_pcm_readi (globals.audio_stream_in, globals.read_frame.data, globals.read_codec.implementation->samples_per_frame)) != 0) { + globals.read_frame.datalen = samples / 2; + globals.read_frame.samples = globals.read_frame.datalen / 2; + + switch_core_timer_check(&globals.timer); + globals.read_frame.timestamp = globals.timer.samplecount; + *frame = &globals.read_frame; + + if (!switch_test_flag((&globals), GFLAG_MOUTH)) { + memset(globals.read_frame.data, 255, globals.read_frame.datalen); + } + + status = SWITCH_STATUS_SUCCESS; + } + switch_mutex_unlock(globals.device_lock); + + return status; +} + +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; + private_t *tech_pvt = NULL; + switch_status_t status = SWITCH_STATUS_FALSE; + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + if (!globals.audio_stream_out) { + return SWITCH_STATUS_FALSE; + } + + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { + return SWITCH_STATUS_FALSE; + } + + if (!is_master(tech_pvt) || !switch_test_flag(tech_pvt, TFLAG_IO)) { + return SWITCH_STATUS_SUCCESS; + } + + if (globals.audio_stream_out) { + if (switch_test_flag((&globals), GFLAG_EAR)) { + snd_pcm_writei(globals.audio_stream_out, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE))); + } + status = SWITCH_STATUS_SUCCESS; + } + + return status; + +} + +static switch_status_t channel_answer_channel(switch_core_session_t *session) +{ + private_t *tech_pvt; + switch_channel_t *channel = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + private_t *tech_pvt; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + + switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_ANSWER: + channel_answer_channel(session); + break; + case SWITCH_MESSAGE_INDICATE_PROGRESS: + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Engage Early Media\n"); + switch_set_flag_locked(tech_pvt, TFLAG_IO); + } + default: + break; + } + return SWITCH_STATUS_SUCCESS; +} + +static switch_api_interface_t send_dtmf_interface = { + /*.interface_name */ "padtmf", + /*.desc */ "DEPRICATED (see 'pa')", + /*.function */ padep, + /*.syntax */ "DEPRICATED (see 'pa')", + /*.next */ NULL +}; + +static switch_api_interface_t answer_call_interface = { + /*.interface_name */ "paoffhook", + /*.desc */ "DEPRICATED (see 'pa')", + /*.function */ padep, + /*.syntax */ "DEPRICATED (see 'pa')", + /*.next */ &send_dtmf_interface +}; + +static switch_api_interface_t channel_info_interface = { + /*.interface_name */ "painfo", + /*.desc */ "DEPRICATED (see 'pa')", + /*.function */ padep, + /*.syntax */ "DEPRICATED (see 'pa')", + /*.next */ &answer_call_interface +}; + +static switch_api_interface_t channel_hup_interface = { + /*.interface_name */ "pahup", + /*.desc */ "DEPRICATED (see 'pa')", + /*.function */ padep, + /*.syntax */ "DEPRICATED (see 'pa')", + /*.next */ &channel_info_interface +}; + +static switch_api_interface_t channel_call_interface = { + /*.interface_name */ "pacall", + /*.desc */ "DEPRICATED (see 'pa')", + /*.function */ padep, + /*.syntax */ "DEPRICATED (see 'pa')", + /*.next */ &channel_hup_interface +}; + +static switch_api_interface_t channel_api_interface = { + /*.interface_name */ "pa", + /*.desc */ "Alsa", + /*.function */ pa_cmd, + /*.syntax */ "<command> [<args>]", + /*.next */ &channel_call_interface +}; + +static const switch_state_handler_table_t channel_event_handlers = { + /*.on_init */ channel_on_init, + /*.on_ring */ channel_on_ring, + /*.on_execute */ channel_on_execute, + /*.on_hangup */ channel_on_hangup, + /*.on_loopback */ channel_on_loopback, + /*.on_transmit */ channel_on_transmit +}; + +static const switch_io_routines_t channel_io_routines = { + /*.outgoing_channel */ channel_outgoing_channel, + /*.read_frame */ channel_read_frame, + /*.write_frame */ channel_write_frame, + /*.kill_channel */ channel_kill_channel, + /*.waitfor_read */ channel_waitfor_read, + /*.waitfor_write */ channel_waitfor_write, + /*.send_dtmf */ channel_send_dtmf, + /*.receive_message */ channel_receive_message +}; + +static const switch_endpoint_interface_t channel_endpoint_interface = { + /*.interface_name */ "alsa", + /*.io_routines */ &channel_io_routines, + /*.event_handlers */ &channel_event_handlers, + /*.private */ NULL, + /*.next */ NULL +}; + +static const switch_loadable_module_interface_t channel_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ &channel_endpoint_interface, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ &channel_api_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_call_cause_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) { + private_t *tech_pvt; + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + + switch_core_session_add_stream(*new_session, NULL); + if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { + memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); + channel = switch_core_session_get_channel(*new_session); + switch_core_session_set_private(*new_session, tech_pvt); + tech_pvt->session = *new_session; + globals.flags = GFLAG_EAR | GFLAG_MOUTH; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + if (outbound_profile) { + char name[128]; + char *id = !switch_strlen_zero(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na"; + snprintf(name, sizeof(name), "Alsa/%s", id); + + switch_channel_set_name(channel, name); + + caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); + switch_channel_set_caller_profile(channel, caller_profile); + tech_pvt->caller_profile = caller_profile; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n"); + switch_core_session_destroy(new_session); + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + switch_channel_set_flag(channel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + switch_channel_set_state(channel, CS_INIT); + return SWITCH_CAUSE_SUCCESS; + } + + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + +} + + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + + switch_status_t status; + + if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); + return SWITCH_STATUS_TERM; + } + + + + if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { + return status; + } + + + + switch_core_hash_init(&globals.call_hash, module_pool); + switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&globals.pvt_lock, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&globals.flag_mutex, SWITCH_MUTEX_NESTED, module_pool); + + + + if (switch_event_reserve_subclass(MY_EVENT_RINGING) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass!"); + return SWITCH_STATUS_GENERR; + } + + globals.read_frame.data = globals.databuf; + globals.read_frame.buflen = sizeof(globals.databuf); + globals.cng_frame.data = globals.cngbuf; + globals.cng_frame.buflen = sizeof(globals.cngbuf); + globals.cng_frame.datalen = sizeof(globals.cngbuf); + switch_set_flag((&globals.cng_frame), SFF_CNG); + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &channel_module_interface; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + + +static switch_status_t load_config(void) +{ + char *cf = "alsa.conf"; + switch_xml_t cfg, xml, settings, param; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + memset(&globals, 0, sizeof(globals)); + + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "debug")) { + globals.debug = atoi(val); + } else if (!strcmp(var, "ring-interval")) { + globals.ring_interval = atoi(val); + } else if (!strcmp(var, "ring-file")) { + set_global_ring_file(val); + } else if (!strcmp(var, "hold-file")) { + set_global_hold_file(val); + } else if (!strcmp(var, "timer-name")) { + set_global_timer_name(val); + } else if (!strcmp(var, "sample-rate")) { + globals.sample_rate = atoi(val); + } else if (!strcmp(var, "codec-ms")) { + globals.codec_ms = atoi(val); + } else if (!strcmp(var, "dialplan")) { + set_global_dialplan(val); + } else if (!strcmp(var, "cid-name")) { + set_global_cid_name(val); + } else if (!strcmp(var, "cid-num")) { + set_global_cid_num(val); + } + } + } + + if (!globals.dialplan) { + set_global_dialplan("default"); + } + + if (!globals.sample_rate) { + globals.sample_rate = 8000; + } + + if (!globals.codec_ms) { + globals.codec_ms = 20; + } + + if (!globals.ring_interval) { + globals.ring_interval = 5; + } + + if (!globals.timer_name) { + set_global_timer_name("soft"); + } + + switch_xml_free(xml); + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +{ + if (globals.read_codec.implementation) { + switch_core_codec_destroy(&globals.read_codec); + } + + if (globals.write_codec.implementation) { + switch_core_codec_destroy(&globals.write_codec); + } + + return SWITCH_STATUS_SUCCESS; +} + + + +static switch_status_t engage_device(unsigned int sample_rate, int codec_ms) +{ + int err = 0; + snd_pcm_hw_params_t *hw_params = NULL; + char *device = "default"; + + if (globals.audio_stream_in && globals.audio_stream_out) { + return SWITCH_STATUS_SUCCESS; + } + + if (globals.audio_stream_in) { + snd_pcm_close (globals.audio_stream_in); + globals.audio_stream_in = NULL; + } + + if (globals.audio_stream_out) { + snd_pcm_close (globals.audio_stream_out); + globals.audio_stream_out = NULL; + } + + if (!sample_rate) { + sample_rate = globals.sample_rate; + } + + if (!codec_ms) { + codec_ms = globals.codec_ms; + } + + if (switch_core_codec_init(&globals.read_codec, + "L16", + NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; + } else { + if (switch_core_codec_init(&globals.write_codec, + "L16", + NULL, + sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + switch_core_codec_destroy(&globals.read_codec); + return SWITCH_STATUS_FALSE; + } + } + + if (switch_core_timer_init(&globals.timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_frame, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + return SWITCH_STATUS_FALSE; + } + + + + globals.read_frame.rate = sample_rate; + globals.read_frame.codec = &globals.read_codec; + + + + switch_mutex_lock(globals.device_lock); + /* LOCKED ************************************************************************************************** */ + + + if ((err = snd_pcm_open (&globals.audio_stream_out, device, SND_PCM_STREAM_PLAYBACK, 0)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot open audio device %s (%s)\n", + device, + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_malloc (&hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot allocate hardware parameter structure (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_any (globals.audio_stream_out, hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot initialize hardware parameter structure (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_access (globals.audio_stream_out, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set access type (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_format (globals.audio_stream_out, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set sample format (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_rate_near (globals.audio_stream_out, hw_params, &sample_rate, 0)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set sample rate (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_channels (globals.audio_stream_out, hw_params, 1)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set channel count (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params (globals.audio_stream_out, hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set parameters (%s)\n", + snd_strerror (err)); + goto fail; + } + + + snd_pcm_hw_params_free (hw_params); + hw_params = NULL; + + + + if ((err = snd_pcm_open (&globals.audio_stream_in, device, SND_PCM_STREAM_CAPTURE, 0)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot open audio device %s (%s)\n", + device, + snd_strerror (err)); + goto fail; + } + if ((err = snd_pcm_hw_params_malloc (&hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot allocate hardware parameter structure (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_any (globals.audio_stream_in, hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot initialize hardware parameter structure (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_access (globals.audio_stream_in, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set access type (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_format (globals.audio_stream_in, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set sample format (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_rate_near (globals.audio_stream_in, hw_params, &sample_rate, 0)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set sample rate (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_channels (globals.audio_stream_in, hw_params, 1)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set channel count (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params (globals.audio_stream_in, hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set parameters (%s)\n", + snd_strerror (err)); + goto fail; + } + + if (hw_params) { + snd_pcm_hw_params_free (hw_params); + hw_params = NULL; + } + + if ((err = snd_pcm_prepare (globals.audio_stream_out)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot prepare audio interface for use (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_prepare (globals.audio_stream_in)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot prepare audio interface for use (%s)\n", + snd_strerror (err)); + goto fail; + } + + switch_mutex_unlock(globals.device_lock); + return SWITCH_STATUS_SUCCESS; + + fail: + + if (hw_params) { + snd_pcm_hw_params_free (hw_params); + hw_params = NULL; + } + + switch_mutex_unlock(globals.device_lock); + + if (globals.audio_stream_in) { + snd_pcm_close (globals.audio_stream_in); + } + + if (globals.audio_stream_out) { + snd_pcm_close (globals.audio_stream_out); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + + return SWITCH_STATUS_FALSE; + + + +} + + +static switch_status_t engage_ring_device(unsigned int sample_rate, int channels) +{ + int err = 0; + snd_pcm_hw_params_t *hw_params; + char *device = "default"; + + if (globals.ring_stream) { + return SWITCH_STATUS_SUCCESS; + } + + if (!sample_rate) { + sample_rate = globals.sample_rate; + } + + switch_mutex_lock(globals.device_lock); + /* LOCKED ************************************************************************************************** */ + + + if ((err = snd_pcm_open (&globals.ring_stream, device, SND_PCM_STREAM_PLAYBACK, 0)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot open audio device %s (%s)\n", + device, + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_malloc (&hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot allocate hardware parameter structure (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_any (globals.ring_stream, hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot initialize hardware parameter structure (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_access (globals.ring_stream, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set access type (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_format (globals.ring_stream, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set sample format (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_rate_near (globals.ring_stream, hw_params, &sample_rate, 0)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set sample rate (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params_set_channels (globals.ring_stream, hw_params, 1)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set channel count (%s)\n", + snd_strerror (err)); + goto fail; + } + + if ((err = snd_pcm_hw_params (globals.ring_stream, hw_params)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot set parameters (%s)\n", + snd_strerror (err)); + goto fail; + } + + if (hw_params) { + snd_pcm_hw_params_free (hw_params); + hw_params = NULL; + } + + if ((err = snd_pcm_prepare (globals.ring_stream)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "cannot prepare audio interface for use (%s)\n", + snd_strerror (err)); + goto fail; + } + + switch_mutex_unlock(globals.device_lock); + return SWITCH_STATUS_SUCCESS; + + fail: + switch_mutex_unlock(globals.device_lock); + + + if (hw_params) { + snd_pcm_hw_params_free (hw_params); + hw_params = NULL; + } + + if (globals.ring_stream) { + snd_pcm_close (globals.ring_stream); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + + return SWITCH_STATUS_FALSE; +} + +static switch_status_t dtmf_call(char **argv, int argc, switch_stream_handle_t *stream) +{ + char *dtmf = argv[0]; + + if (switch_strlen_zero(dtmf)) { + stream->write_function(stream, "No DTMF Supplied!\n"); + } else { + switch_mutex_lock(globals.pvt_lock); + if (globals.call_list) { + switch_channel_t *channel = switch_core_session_get_channel(globals.call_list->session); + switch_channel_queue_dtmf(channel, dtmf); + } + switch_mutex_unlock(globals.pvt_lock); + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_call(char **argv, int argc, switch_stream_handle_t *stream) +{ + private_t *tp, *tech_pvt = NULL; + char *callid = argv[0]; + uint8_t one_call = 0; + + switch_mutex_lock(globals.pvt_lock); + if (switch_strlen_zero(callid)) { + if (globals.call_list) { + if (globals.call_list->next) { + tech_pvt = globals.call_list->next; + } else { + tech_pvt = globals.call_list; + one_call = 1; + } + } + } else if (!strcasecmp(callid, "none")) { + for (tp = globals.call_list; tp; tp = tp->next) { + switch_clear_flag_locked(tp, TFLAG_MASTER); + } + stream->write_function(stream, "OK\n"); + goto done; + } else { + tech_pvt = switch_core_hash_find(globals.call_hash, callid); + } + + if (tech_pvt) { + if (tech_pvt == globals.call_list && !tech_pvt->next) { + one_call = 1; + } + + if (!one_call) { + remove_pvt(tech_pvt); + } + add_pvt(tech_pvt, PA_MASTER); + stream->write_function(stream, "OK\n"); + } else { + stream->write_function(stream, "NO SUCH CALL\n"); + } + + done: + switch_mutex_unlock(globals.pvt_lock); + + return SWITCH_STATUS_SUCCESS; + +} + +static switch_status_t hangup_call(char **argv, int argc, switch_stream_handle_t *stream) +{ + private_t *tech_pvt; + char *callid = argv[0]; + + switch_mutex_lock(globals.pvt_lock); + if (switch_strlen_zero(callid)) { + tech_pvt = globals.call_list; + } else { + tech_pvt = switch_core_hash_find(globals.call_hash, callid); + } + + if (tech_pvt) { + switch_channel_hangup(switch_core_session_get_channel(tech_pvt->session), SWITCH_CAUSE_NORMAL_CLEARING); + //switch_set_flag_locked(tech_pvt, TFLAG_HUP); + stream->write_function(stream, "OK\n"); + } else { + stream->write_function(stream, "NO SUCH CALL\n"); + } + switch_mutex_unlock(globals.pvt_lock); + + return SWITCH_STATUS_SUCCESS; + +} + +static switch_status_t answer_call(char **argv, int argc, switch_stream_handle_t *stream) +{ + private_t *tp; + int x = 0; + char *callid = argv[0]; + + switch_mutex_lock(globals.pvt_lock); + + if (!switch_strlen_zero(callid)) { + if ((tp = switch_core_hash_find(globals.call_hash, callid))) { + if (switch_test_flag(tp, TFLAG_ANSWER)) { + stream->write_function(stream, "CALL ALREADY ANSWERED\n"); + } else { + switch_channel_t *channel = switch_core_session_get_channel(tp->session); + switch_set_flag_locked(tp, TFLAG_ANSWER); + switch_channel_answer(channel); + add_pvt(tp, PA_MASTER); + } + } else { + stream->write_function(stream, "NO SUCH CALL\n"); + } + + goto done; + } + + for (tp = globals.call_list; tp; tp = tp->next) { + if (!switch_test_flag(tp, TFLAG_ANSWER)) { + switch_channel_t *channel = switch_core_session_get_channel(tp->session); + switch_set_flag_locked(tp, TFLAG_ANSWER); + switch_channel_answer(channel); + add_pvt(tp, PA_MASTER); + x++; + break; + } + } + done: + switch_mutex_unlock(globals.pvt_lock); + + stream->write_function(stream, "Answered %d channels.\n", x); + + + return SWITCH_STATUS_SUCCESS; + +} + +static switch_status_t do_flags(char **argv, int argc, switch_stream_handle_t *stream) +{ + char *action = argv[0]; + char *flag_str = argv[1]; + GFLAGS flags = GFLAG_NONE; + char *p; + int x = 0; + + if (argc < 2) { + goto desc; + } + + for (x = 1; x < argc; x++) { + flag_str = argv[x]; + for (p = flag_str; *p; p++) { + *p = (char) tolower(*p); + } + + if (strstr(flag_str, "ear")) { + flags |= GFLAG_EAR; + } + if (strstr(flag_str, "mouth")) { + flags |= GFLAG_MOUTH; + } + } + + if (!strcasecmp(action, "on")) { + if (flags & GFLAG_EAR) { + switch_set_flag((&globals), GFLAG_EAR); + } + if (flags & GFLAG_MOUTH) { + switch_set_flag((&globals), GFLAG_MOUTH); + } + } else if (!strcasecmp(action, "off")) { + if (flags & GFLAG_EAR) { + switch_clear_flag((&globals), GFLAG_EAR); + } + if (flags & GFLAG_MOUTH) { + switch_clear_flag((&globals), GFLAG_MOUTH); + } + } else { + goto bad; + } + + desc: + x = 0; + stream->write_function(stream, "FLAGS: "); + if (switch_test_flag((&globals), GFLAG_EAR)) { + stream->write_function(stream, "ear"); + x++; + } + if (switch_test_flag((&globals), GFLAG_MOUTH)) { + stream->write_function(stream, "%smouth", x ? "|" : ""); + x++; + } + if (!x) { + stream->write_function(stream, "none"); + } + + goto done; + + bad: + stream->write_function(stream, "Usage: flags [on|off] <flags>\n"); + done: + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t list_calls(char **argv, int argc, switch_stream_handle_t *stream) +{ + private_t *tp; + int x = 0; + char *cid_name = "n/a"; + char *cid_num = "n/a"; + + switch_mutex_lock(globals.pvt_lock); + for (tp = globals.call_list; tp; tp = tp->next) { + switch_channel_t *channel; + switch_caller_profile_t *profile; + x++; + channel = switch_core_session_get_channel(tp->session); + + if ((profile = switch_channel_get_caller_profile(channel))) { + if (profile->originatee_caller_profile) { + cid_name = "Outbound Call"; + cid_num = profile->originatee_caller_profile->destination_number; + } else { + cid_name = profile->caller_id_name; + cid_num = profile->caller_id_number; + } + } + + stream->write_function(stream, "%s %s [%s (%s)] %s\n", tp->call_id, switch_channel_get_name(channel), + cid_name, cid_num, switch_test_flag(tp, TFLAG_MASTER) ? "active" : "hold"); + } + switch_mutex_unlock(globals.pvt_lock); + + stream->write_function(stream, "\n%d call%s\n", x, x == 1 ? "" : "s"); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t place_call(char **argv, int argc, switch_stream_handle_t *stream) +{ + switch_core_session_t *session; + switch_status_t status = SWITCH_STATUS_SUCCESS; + char *dest = NULL; + + if (!argv[0]) { + stream->write_function(stream, "FAIL:Usage: call <dest>\n"); + return SWITCH_STATUS_SUCCESS; + } + dest = argv[0]; + + if ((session = switch_core_session_request(&channel_endpoint_interface, NULL)) != 0) { + private_t *tech_pvt; + switch_channel_t *channel; + char *dialplan = globals.dialplan; + char *cid_name = globals.cid_name; + char *cid_num = globals.cid_num; + + switch_core_session_add_stream(session, NULL); + if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) { + memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + channel = switch_core_session_get_channel(session); + switch_core_session_set_private(session, tech_pvt); + tech_pvt->session = session; + globals.flags = GFLAG_EAR | GFLAG_MOUTH; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); + switch_core_session_destroy(&session); + return SWITCH_STATUS_MEMERR; + } + + if (!switch_strlen_zero(argv[1])) { + dialplan = argv[1]; + } + + if (!switch_strlen_zero(argv[2])) { + cid_num = argv[2]; + } + + if (!switch_strlen_zero(argv[3])) { + cid_name = argv[3]; + } + + if (!switch_strlen_zero(argv[4])) { + tech_pvt->sample_rate = atoi(argv[4]); + } + + if (!switch_strlen_zero(argv[4])) { + tech_pvt->codec_ms = atoi(argv[5]); + } + + if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + NULL, + dialplan, cid_name, cid_num, NULL, NULL, NULL, NULL, (char *) modname, NULL, + dest)) != 0) { + char name[128]; + snprintf(name, sizeof(name), "Alsa/%s", + tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : modname); + switch_channel_set_name(channel, name); + + switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); + } + tech_pvt->session = session; + if ((status = engage_device(tech_pvt->sample_rate, tech_pvt->codec_ms)) == SWITCH_STATUS_SUCCESS) { + switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); + switch_channel_mark_answered(channel); + switch_channel_set_state(channel, CS_INIT); + switch_core_session_thread_launch(tech_pvt->session); + add_pvt(tech_pvt, PA_MASTER); + stream->write_function(stream, "SUCCESS:%s:%s\n", tech_pvt->call_id, switch_core_session_get_uuid(tech_pvt->session)); + } else { + switch_core_session_destroy(&session); + stream->write_function(stream, "FAIL:Device Error!\n"); + } + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t padep(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +{ + stream->write_function(stream, "This command no longer exists (try 'pa help')\n"); + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t pa_cmd(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +{ + char *argv[1024] = { 0 }; + int argc = 0; + char *mycmd = NULL, *devname = NULL; + switch_status_t status = SWITCH_STATUS_SUCCESS; + pa_command_t func = NULL; + int lead = 1, devval = 0; + const char *usage_string = "USAGE:\n" + "--------------------------------------------------------------------------------\n" + "pa help\n" + "pa dump\n" + "pa call <dest> [<dialplan> <cid_name> <cid_num> <rate>]\n" + "pa answer [<call_id>]\n" + "pa hangup [<call_id>]\n" + "pa list\n" + "pa switch [<call_id>|none]\n" + "pa dtmf <digit string>\n" + "pa flags [on|off] [ear] [mouth]\n" + "--------------------------------------------------------------------------------\n"; + + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "%s", usage_string); + goto done; + } + + if (!(mycmd = strdup(cmd))) { + status = SWITCH_STATUS_MEMERR; + goto done; + } + + if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + stream->write_function(stream, "%s", usage_string); + goto done; + } + + if (!strcasecmp(argv[0], "call")) { + func = place_call; + } else if (!strcasecmp(argv[0], "help")) { + stream->write_function(stream, "%s", usage_string); + goto done; + } else if (!strcasecmp(argv[0], "list")) { + func = list_calls; + } else if (!strcasecmp(argv[0], "flags")) { + func = do_flags; + } else if (!strcasecmp(argv[0], "hangup")) { + func = hangup_call; + } else if (!strcasecmp(argv[0], "answer")) { + func = answer_call; + } else if (!strcasecmp(argv[0], "switch")) { + func = switch_call; + } else if (!strcasecmp(argv[0], "dtmf")) { + func = dtmf_call; + } + + if (func) { + status = func(&argv[lead], argc - lead, stream); + } else { + if (devname) { + if (devval > 0) { + stream->write_function(stream, "%s set to %d\n", devname, devval); + } else { + stream->write_function(stream, "%s not set (invalid value)\n", devname); + } + } else { + stream->write_function(stream, "Unknown Command [%s]\n", argv[0]); + } + } + + done: + + switch_safe_free(mycmd); + + return status; +} + + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r5022 - freeswitch/trunk/libs/js/src
by Freeswitch SVN 26 Apr '07

26 Apr '07

Author: mikej Date: Thu Apr 26 18:03:58 2007 New Revision: 5022 Modified: freeswitch/trunk/libs/js/src/jspubtd.h Log: fix MODLANG-12 and proper fix for MODLANG-7 Modified: freeswitch/trunk/libs/js/src/jspubtd.h ============================================================================== --- freeswitch/trunk/libs/js/src/jspubtd.h (original) +++ freeswitch/trunk/libs/js/src/jspubtd.h Thu Apr 26 18:03:58 2007 @@ -552,7 +552,7 @@ * JSEXN_NONE marks an unthrowable error. */ typedef enum JSExnType { - JSEXN_NONE, + JSEXN_NONE = -1, JSEXN_ERR, JSEXN_INTERNALERR, JSEXN_EVALERR, @@ -567,7 +567,7 @@ typedef struct JSErrorFormatString { const char *format; /* the error message (may be UTF-8 if compiled with JS_C_STRINGS_ARE_UTF8) */ uint16 argCount; /* the number of arguments to convert in the error message */ - uint16 exnType; /* One of the JSExnType constants above */ + JSExnType exnType; /* One of the JSExnType constants above */ } JSErrorFormatString; typedef const JSErrorFormatString *

1 0

[commit] r5021 - freeswitch/trunk/src
by Freeswitch SVN 26 Apr '07

26 Apr '07

Author: anthm Date: Thu Apr 26 17:57:50 2007 New Revision: 5021 Modified: freeswitch/trunk/src/switch_rtp.c Log: fix rfc2833 bs Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Apr 26 17:57:50 2007 @@ -967,6 +967,7 @@ char key = switch_rfc2833_to_char(packet[0]); uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); + /* SHEESH.... Curse you RFC2833 inventors!!!! */ if ((time(NULL) - rtp_session->dtmf_data.last_digit_time) > 2) { rtp_session->dtmf_data.last_digit = 0; @@ -974,12 +975,12 @@ } if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { rtp_session->dtmf_data.in_digit_seq = in_digit_seq; - if (duration && end) { if (key != rtp_session->dtmf_data.last_digit) { char digit_str[] = { key, 0 }; time(&rtp_session->dtmf_data.last_digit_time); switch_rtp_queue_dtmf(rtp_session, digit_str); + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); } if (++rtp_session->dtmf_data.dc >= 3) { rtp_session->dtmf_data.last_digit = 0;

1 0

[commit] r5020 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 26 Apr '07

26 Apr '07

Author: anthm Date: Thu Apr 26 11:02:46 2007 New Revision: 5020 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix potential NULL fiasco Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Apr 26 11:02:46 2007 @@ -849,8 +849,15 @@ switch_xml_set_attr_d(row, "row_id", id); for(x = 0; x < argc; x++) { - if ((field = switch_xml_add_child_d(row, columnNames[x], f_off++))) { - switch_xml_set_txt_d(field, argv[x]); + char *name = columnNames[x]; + char *val = switch_str_nil(argv[x]); + + if (!name) { + name = "undefined"; + } + + if ((field = switch_xml_add_child_d(row, name, f_off++))) { + switch_xml_set_txt_d(field, val); } else { return -1; } @@ -873,11 +880,18 @@ } for (x = 0; x < argc; x++) { + char *name = columnNames[x]; + + + if (!name) { + name = "undefined"; + } + if (holder->http) { holder->stream->write_function(holder->stream, "<td>"); - holder->stream->write_function(holder->stream, "<b>%s</b>%s", columnNames[x], x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); + holder->stream->write_function(holder->stream, "<b>%s</b>%s", name, x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); } else { - holder->stream->write_function(holder->stream, "%s%s", columnNames[x], x == (argc - 1) ? "\n" : holder->delim); + holder->stream->write_function(holder->stream, "%s%s", name, x == (argc - 1) ? "\n" : holder->delim); } } } @@ -887,11 +901,13 @@ } for (x = 0; x < argc; x++) { + char *val = switch_str_nil(argv[x]); + if (holder->http) { holder->stream->write_function(holder->stream, "<td>"); - holder->stream->write_function(holder->stream, "%s%s", argv[x] ? argv[x] : "", x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); + holder->stream->write_function(holder->stream, "%s%s", val, x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); } else { - holder->stream->write_function(holder->stream, "%s%s", argv[x] ? argv[x] : "", x == (argc - 1) ? "\n" : holder->delim); + holder->stream->write_function(holder->stream, "%s%s", val, x == (argc - 1) ? "\n" : holder->delim); } } @@ -997,6 +1013,7 @@ } } else if (!strcasecmp(as, "xml")) { switch_core_db_exec(db, sql, show_as_xml_callback, &holder, &errmsg); + if (holder.xml) { char count[50]; char *xmlstr;

1 0

[commit] r5019 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 26 Apr '07

26 Apr '07

Author: anthm Date: Thu Apr 26 10:38:40 2007 New Revision: 5019 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: update Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Apr 26 10:38:40 2007 @@ -1716,18 +1716,19 @@ } } - +#define TLEN 8192 void ldl_handle_send_vcard(ldl_handle_t *handle, char *from, char *to, char *id, char *vcard) { - iks *vxml, *iq; + iks *vxml = NULL, *iq = NULL; int e = 0; - ldl_avatar_t *ap; + ldl_avatar_t *ap = NULL; + char *text = NULL; ap = ldl_get_avatar(handle, NULL, from); if (!vcard) { - char text[8192]; char *ext; + if (!ap) { return; } @@ -1737,8 +1738,8 @@ } else { ext = "png"; } - - snprintf(text, sizeof(text), + text = malloc(TLEN); + snprintf(text, TLEN, "<vCard xmlns='vcard-temp'><PHOTO><TYPE>image/%s</TYPE><BINVAL>%s</BINVAL></PHOTO></vCard>", ext, ap->base64 @@ -1753,12 +1754,12 @@ if (!(vxml = iks_tree(vcard, 0, &e))) { globals.logger(DL_LOG_ERR, "Parse returned error [%d]\n", e); - return; + goto fail; } if (!(iq = iks_new("iq"))) { globals.logger(DL_LOG_ERR, "Memory Error\n"); - return; + goto fail; } if (!iks_insert_attrib(iq, "to", to)) goto fail; @@ -1769,17 +1770,24 @@ if (!iks_insert_node(iq, vxml)) goto fail; apr_queue_push(handle->queue, iq); + iq = NULL; vxml = NULL; fail: + if (iq) { iks_delete(iq); } + if (vxml) { iks_delete(vxml); } + if (text) { + free(text); + } + } void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, char *subject, char *body)

1 0

[commit] r5018 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 26 Apr '07

26 Apr '07

Author: mikej Date: Thu Apr 26 09:52:56 2007 New Revision: 5018 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: more completely fix http://jira.freeswitch.org/browse/MDXMLINT-6 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Thu Apr 26 09:52:56 2007 @@ -306,7 +306,8 @@ if (ServerInit(&abyssServer) != TRUE) { globals.running = 0; - return SWITCH_STATUS_FALSE; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to start HTTP Port %d\n", globals.port); + return SWITCH_STATUS_TERM; } ServerAddHandler(&abyssServer, HandleHook);

1 0

[commit] r5017 - freeswitch/trunk/src/mod/languages/mod_mono
by Freeswitch SVN 25 Apr '07

25 Apr '07

Author: anthm Date: Wed Apr 25 18:24:19 2007 New Revision: 5017 Modified: freeswitch/trunk/src/mod/languages/mod_mono/Makefile Log: a bit closer on getting mod_mono to build again Modified: freeswitch/trunk/src/mod/languages/mod_mono/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_mono/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_mono/Makefile Wed Apr 25 18:24:19 2007 @@ -1,17 +1,40 @@ -VERSION = mono-1.1.13.8 -TARBALL = mono-1.1.13.8.tar.gz -GLIB_TARBALL = glib-2.12.3.tar.gz -GETTEXT_TARBALL = gettext-0.15.tar.gz -PKGCONFIG_TARBALL = pkg-config-0.21.tar.gz +MONO = mono-1.1.13.8 +MONO_DIR = $(switch_srcdir)/libs/$(MONO) +GLIB = glib-2.12.3 +GLIB_DIR = $(switch_srcdir)/libs/$(GLIB) +GETTEXT = gettext-0.15 +GETTEXT_DIR = $(switch_srcdir)/libs/$(GETTEXT) +PKGCONFIG = pkg-config-0.21 +PKGCONFIG_DIR = $(switch_srcdir)/libs/$(PKGCONFIG) LOCAL_CFLAGS=`$(PREFIX)/bin/pkg-config --cflags mono` LOCAL_LDFLAGS=`$(PREFIX)/bin/pkg-config --libs mono` include ../../../../build/modmake.rules -local_depend: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GETTEXT_TARBALL) --prefix=$(PREFIX) --with-pic - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(PKGCONFIG_TARBALL) --prefix=$(PREFIX) --with-pic - export PKG_CONFIG=$(PREFIX)/bin/pkg-config; export MSGFMT=$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GLIB_TARBALL) --prefix=$(PREFIX) --with-pic - export PATH=$(PATH):$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(TARBALL) --prefix=$(PREFIX) --with-pic --with-gc=boehm --with-preview=yes --without-sigaltstack +DEFAULT_ARGS=--prefix=$(PREFIX) --with-pic +local_depend: $(GETTEXT_DIR) $(PKGCONFIG_DIR) $(GLIB_DIR) $(MONO_DIR) + +$(GETTEXT_DIR): + $(GETLIB) $(GETTEXT).tar.gz + cd $(GETTEXT_DIR) && ./configure $(DEFAULT_ARGS) + cd $(GETTEXT_DIR) && $(MAKE) install + +$(PKGCONFIG_DIR): + $(GETLIB) $(PKGCONFIG).tar.gz + cd $(PKGCONFIG_DIR) && ./configure $(DEFAULT_ARGS) + cd $(PKGCONFIG_DIR) && $(MAKE) install + +$(GLIB_DIR): + $(GETLIB) $(GLIB).tar.gz + export PKG_CONFIG=$(PREFIX)/bin/pkg-config + export MSGFMT=$(PREFIX)/bin/ + cd $(GLIB_DIR) && ./configure $(DEFAULT_ARGS) + cd $(GLIB_DIR) && $(MAKE) install + +$(MONO_DIR): + $(GETLIB) $(MONO).tar.gz + export PATH=$(PATH):$(PREFIX)/bin/ + cd $(MONO_DIR) && ./configure $(DEFAULT_ARGS) --with-pic --with-gc=boehm --with-preview=yes --without-sigaltstack + cd $(MONO_DIR) && $(MAKE) install

1 0

[commit] r5016 - in freeswitch/trunk: libs/xmlrpc-c libs/xmlrpc-c/include/xmlrpc-c libs/xmlrpc-c/lib/abyss/src src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 25 Apr '07

25 Apr '07

Author: mikej Date: Wed Apr 25 15:57:14 2007 New Revision: 5016 Modified: freeswitch/trunk/libs/xmlrpc-c/.update freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/trace.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: resolve http://jira.freeswitch.org/browse/MDXMLINT-6 Modified: freeswitch/trunk/libs/xmlrpc-c/.update ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/.update (original) +++ freeswitch/trunk/libs/xmlrpc-c/.update Wed Apr 25 15:57:14 2007 @@ -1 +1 @@ -Fri Mar 16 17:21:00 EDT 2007 +Wed Apr 25 16:05:00 EDT 2007 Modified: freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h (original) +++ freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h Wed Apr 25 15:57:14 2007 @@ -634,7 +634,7 @@ void ServerFree(TServer *srv); -void ServerInit(TServer *srv); +int ServerInit(TServer *srv); void ServerRun(TServer *srv); void ServerRunOnce(TServer *srv); void ServerRunOnce2(TServer * const srv, Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c Wed Apr 25 15:57:14 2007 @@ -711,20 +711,30 @@ SocketClose(&(c->socket)); } -void ServerInit(TServer *srv) +int ServerInit(TServer *srv) { /********* Must check errors from these functions *************/ - if (!SocketInit()) - TraceExit("Can't initialize TCP sockets\n");; + if (!SocketInit()) { + TraceMsg("Can't initialize TCP sockets\n"); + return FALSE; + } + + if (!SocketCreate(&srv->listensock)) { + TraceMsg("Can't create a socket\n"); + return FALSE; + } + + if (!SocketBind(&srv->listensock,NULL,srv->port)) { + TraceMsg("Can't bind\n"); + return FALSE; + } + + if (!SocketListen(&srv->listensock,MAX_CONN)) { + TraceMsg("Can't listen\n"); + return FALSE; + } - if (!SocketCreate(&srv->listensock)) - TraceExit("Can't create a socket\n");; - - if (!SocketBind(&srv->listensock,NULL,srv->port)) - TraceExit("Can't bind\n"); - - if (!SocketListen(&srv->listensock,MAX_CONN)) - TraceExit("Can't listen\n"); + return TRUE; } /* With pthread configuration, our connections run as threads of a Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/trace.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/trace.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/trace.c Wed Apr 25 15:57:14 2007 @@ -63,5 +63,5 @@ va_start(argptr,fmt); TraceVMsg(fmt,argptr); va_end(argptr); - exit(1); + abort(); } Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Wed Apr 25 15:57:14 2007 @@ -304,7 +304,11 @@ xmlrpc_server_abyss_set_handler(&env, &abyssServer, "/RPC2", registryP); - ServerInit(&abyssServer); + if (ServerInit(&abyssServer) != TRUE) { + globals.running = 0; + return SWITCH_STATUS_FALSE; + } + ServerAddHandler(&abyssServer, HandleHook); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting HTTP Port %d, DocRoot [%s]\n", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir);

1 0

[commit] r5015 - in freeswitch/trunk: libs/apr-util/xml/expat/lib libs/libetpan/build-windows libs/portaudio/build/msvc src/mod/codecs/mod_amr src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g729 src/mod/codecs/mod_h26x src/mod/directories/mod_ldap
by Freeswitch SVN 25 Apr '07

25 Apr '07

Author: mikej Date: Wed Apr 25 15:36:48 2007 New Revision: 5015 Modified: freeswitch/trunk/libs/apr-util/xml/expat/lib/ (props changed) freeswitch/trunk/libs/libetpan/build-windows/ (props changed) freeswitch/trunk/libs/portaudio/build/msvc/ (props changed) freeswitch/trunk/src/mod/codecs/mod_amr/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g723_1/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/codecs/mod_h26x/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) Log: svn:ignore properties

1 0