- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6131 - freeswitch/trunk/dtd
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: brian Date: Thu Nov 1 10:58:30 2007 New Revision: 6131 Added: freeswitch/trunk/dtd/ Log:

1 0

[commit] r6130 - freeswitch/trunk/src
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 10:58:12 2007 New Revision: 6130 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: attempt to make gcc 4.3 happy, seems to be a little tricky so far Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Nov 1 10:58:12 2007 @@ -1229,11 +1229,11 @@ len += strlen(context) + 1; } - switch_zmalloc(helper, len); + switch_zmalloc(cur, len); + helper = (struct transfer_helper *)cur; switch_copy_string(helper->uuid_str, uuid, sizeof(helper->uuid_str)); - cur = (char *) helper; cur += sizeof(*helper); if (extension) { @@ -1278,9 +1278,9 @@ size_t len = sizeof(*helper) + strlen(path) + 1; char *cur = NULL; - switch_zmalloc(helper, len); + switch_zmalloc(cur, len); + helper = (struct broadcast_helper *)cur; - cur = (char *) helper; cur += sizeof(*helper); switch_copy_string(helper->uuid_str, uuid, sizeof(helper->uuid_str)); helper->flags = flags; @@ -1402,3 +1402,13 @@ return SWITCH_STATUS_SUCCESS; } +/* 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] r6129 - freeswitch/trunk/conf
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: brian Date: Thu Nov 1 10:55:27 2007 New Revision: 6129 Modified: freeswitch/trunk/conf/default_context.xml Log: woops Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Thu Nov 1 10:55:27 2007 @@ -15,7 +15,7 @@ <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> <anti-action application="set" data="call_timeout=30000"/> <anti-action application="set" data="hangup_after_bridge=true"/> - <anti-actino application="set" data="continue_on_fail=true"/> + <anti-action application="set" data="continue_on_fail=true"/> <anti-action application="bridge" data="sofia/$${domain}/${dialed_ext}"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition>

1 0

[commit] r6128 - freeswitch/trunk/src
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 10:22:58 2007 New Revision: 6128 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: attempt to make gcc 4.3 happy, getting off to a great new friendship Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Nov 1 10:22:58 2007 @@ -1233,23 +1233,24 @@ switch_copy_string(helper->uuid_str, uuid, sizeof(helper->uuid_str)); - cur = (char *) helper + sizeof(*helper); + cur = (char *) helper; + cur += sizeof(*helper); if (extension) { + switch_copy_string(cur, extension, strlen(extension) + 1); helper->extension = cur; - switch_copy_string(helper->extension, extension, strlen(extension) + 1); cur += strlen(helper->extension) + 1; } if (dialplan) { + switch_copy_string(cur, dialplan, strlen(dialplan) + 1); helper->dialplan = cur; - switch_copy_string(helper->dialplan, dialplan, strlen(dialplan) + 1); cur += strlen(helper->dialplan) + 1; } if (context) { + switch_copy_string(cur, context, strlen(context) + 1); helper->context = cur; - switch_copy_string(helper->context, context, strlen(context) + 1); } return switch_scheduler_add_task(runtime, sch_transfer_callback, (char *) __SWITCH_FUNC__, uuid, 0, helper, SSHF_FREE_ARG); @@ -1275,14 +1276,17 @@ { struct broadcast_helper *helper; size_t len = sizeof(*helper) + strlen(path) + 1; + char *cur = NULL; switch_zmalloc(helper, len); - + + cur = (char *) helper; + cur += sizeof(*helper); switch_copy_string(helper->uuid_str, uuid, sizeof(helper->uuid_str)); helper->flags = flags; - helper->path = (char *) helper + sizeof(*helper); - switch_copy_string(helper->path, path, len - sizeof(helper)); - + + switch_copy_string(cur, path, len - sizeof(helper)); + helper->path = cur; return switch_scheduler_add_task(runtime, sch_broadcast_callback, (char *) __SWITCH_FUNC__, uuid, 0, helper, SSHF_FREE_ARG); }

1 0

[commit] r6127 - in freeswitch/trunk/src/mod/applications: mod_rss mod_voicemail
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: mikej Date: Thu Nov 1 09:29:06 2007 New Revision: 6127 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: don't check array's for null with switch_str_nil macro (MODAPP-44) Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Nov 1 09:29:06 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Bret McDanel <trixter AT 0xdecafbad.com> * * * mod_rss.c -- RSS Browser @@ -323,7 +324,7 @@ goto finished; } } - if (!switch_strlen_zero(cmd)) { + if (*cmd != '\0') { int32_t i; char *p; @@ -482,7 +483,7 @@ if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto finished; } - if (!switch_strlen_zero(cmd)) { + if (*cmd != '\0') { switch (*cmd) { case '0': switch_set_flag(&dtb, SFLAG_INSTRUCT); Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Thu Nov 1 09:29:06 2007 @@ -1262,7 +1262,7 @@ sql = switch_mprintf("select count(*) from voicemail_prefs where user='%q' and domain = '%q'", myid, domain_name); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); switch_safe_free(sql); - if (switch_strlen_zero(msg_count) || !atoi(msg_count)) { + if (*msg_count == '\0' || !atoi(msg_count)) { sql = switch_mprintf("insert into voicemail_prefs values('%q','%q','','')", myid, domain_name); vm_execute_sql(profile, sql, profile->mutex); switch_safe_free(sql); @@ -1395,7 +1395,7 @@ goto end; } - if (switch_strlen_zero(id_buf)) { + if (*id_buf == '\0') { continue; } else { myid = id_buf; @@ -1432,7 +1432,7 @@ if (status != SWITCH_STATUS_SUCCESS) { goto end; } - if (switch_strlen_zero(pass_buf)) { + if (*pass_buf == '\0') { continue; } else { mypass = pass_buf; @@ -1656,13 +1656,13 @@ memset(buf, 0, sizeof(buf)); TRY_CODE(switch_ivr_play_file(session, NULL, cbt.name_path, &args)); } - if (switch_strlen_zero(buf)) { + if (*buf == '\0') { memset(buf, 0, sizeof(buf)); TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, &args)); } } - if (!switch_strlen_zero(buf)) { + if (*buf != '\0') { if (!strcasecmp(buf, profile->main_menu_key)) { voicemail_check_main(session, profile_name, domain_name, id, 0); } else {

1 0

[commit] r6126 - freeswitch/trunk/src/mod/codecs/mod_lpc10
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: mikej Date: Thu Nov 1 09:04:32 2007 New Revision: 6126 Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Log: fix mod_lpc10 module build (part of MODAPP-44) Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Thu Nov 1 09:04:32 2007 @@ -24,14 +24,18 @@ * Contributor(s): * * Brian K. West <brian.west(a)mac.com> + * Bret McDanel <trixter AT 0xdecafbad.com> * * * mod_lpc10.c -- LPC10 Codec Module * */ -#include "switch.h" -#include "lpc10.h" +#include <switch.h> +#include <lpc10.h> + +SWITCH_MODULE_LOAD_FUNCTION(mod_lpc10_load); +SWITCH_MODULE_DEFINITION(mod_lpc10, mod_lpc10_load, NULL, NULL); enum { SamplesPerFrame = 180, @@ -44,8 +48,6 @@ #define MaxSampleValue 32767.0 #define MinSampleValue -32767.0 -static const char modname[] = "mod_lpc10"; - struct lpc10_context { struct lpc10_encoder_state encoder_object; struct lpc10_decoder_state decoder_object; @@ -177,24 +179,13 @@ /*.destroy */ switch_lpc10_destroy, }; -const switch_codec_interface_t lpc10_codec_interface = { - /*.interface_name */ "LPC-10 2.4kbps", - /*.implementations */ &lpc10_implementation, -}; - -static switch_loadable_module_interface_t lpc10_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ &lpc10_codec_interface, - /*.application_interface */ NULL -}; - -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_lpc10_load) { + switch_codec_interface_t *codec_interface; + /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &lpc10_module_interface; + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_CODEC(codec_interface, "LPC-10 2.4kbps", &lpc10_implementation); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r6125 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 08:25:00 2007 New Revision: 6125 Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Log: fix mod_python build Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Thu Nov 1 08:25:00 2007 @@ -198,7 +198,7 @@ } -static void python_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(python_function) { eval_some_python(switch_core_session_get_uuid(session), (char *)data, session);

1 0

[commit] r6124 - in freeswitch/trunk/src/mod: applications/mod_soundtouch formats/mod_shout
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 08:08:40 2007 New Revision: 6124 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: fix mod_soundtouch and mod_shout build Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Thu Nov 1 08:08:40 2007 @@ -246,7 +246,7 @@ return SWITCH_TRUE; } -static void soundtouch_start_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(soundtouch_start_function) { switch_media_bug_t *bug; switch_status_t status; Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Thu Nov 1 08:08:40 2007 @@ -532,7 +532,7 @@ switch_thread_create(&thread, thd_attr, write_stream_thread, context, context->memory_pool); } -static switch_status_t shout_file_open(switch_file_handle_t *handle, char *path) +static switch_status_t shout_file_open(switch_file_handle_t *handle, const char *path) { shout_context_t *context; char *host, *file;

1 0

[commit] r6123 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: mikej Date: Thu Nov 1 08:03:27 2007 New Revision: 6123 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: fix mod_openmrcp build. Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Thu Nov 1 08:03:27 2007 @@ -231,7 +231,7 @@ /** Read in the grammar and construct an MRCP Recognize message that has The grammar attached as the payload */ -static mrcp_status_t openmrcp_recog_start(mrcp_client_context_t *context, openmrcp_session_t *asr_session, char *path) +static mrcp_status_t openmrcp_recog_start(mrcp_client_context_t *context, openmrcp_session_t *asr_session, const char *path) { mrcp_generic_header_t *generic_header; apr_status_t rv; @@ -284,7 +284,11 @@ * This code expects certain one-time initialization of the openmrcp client * engine/systeme to have already taken place.function to open the asr interface */ -static switch_status_t openmrcp_asr_open(switch_asr_handle_t *ah, char *codec, int rate, char *dest, switch_asr_flag_t *flags) +static switch_status_t openmrcp_asr_open(switch_asr_handle_t *ah, + const char *codec, + int rate, + const char *dest, + switch_asr_flag_t *flags) { openmrcp_session_t *asr_session; mrcp_client_channel_t *asr_channel; @@ -345,7 +349,7 @@ } /* function to load a grammar to the asr interface */ -static switch_status_t openmrcp_asr_load_grammar(switch_asr_handle_t *ah, char *grammar, char *path) +static switch_status_t openmrcp_asr_load_grammar(switch_asr_handle_t *ah, const char *grammar, const char *path) { /** Read grammar from path and create and send and MRCP RECOGNIZE msg that has the grammar attached to body. @@ -424,7 +428,7 @@ /*! function to unload a grammar to the asr interface */ -static switch_status_t openmrcp_asr_unload_grammar(switch_asr_handle_t *ah, char *grammar) +static switch_status_t openmrcp_asr_unload_grammar(switch_asr_handle_t *ah, const char *grammar) { return SWITCH_STATUS_SUCCESS;

1 0

[commit] r6122 - freeswitch/trunk/src/mod/applications/mod_ivrtest
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 07:56:36 2007 New Revision: 6122 Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Log: fix mod_ivrtest build Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Thu Nov 1 07:56:36 2007 @@ -55,7 +55,7 @@ return SWITCH_STATUS_SUCCESS; } -static void disast_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(disast_function) { void *x = NULL; memset((void *) x, 0, 1000); @@ -63,7 +63,7 @@ } -static void xml_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(xml_function) { switch_xml_t f1 = switch_xml_parse_file("/root/formula1.xml"), team, driver; const char *teamname; @@ -79,7 +79,7 @@ } -static void ivr_application_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(ivr_application_function) { switch_channel_t *channel = switch_core_session_get_channel(session); char *params = switch_core_session_strdup(session, data); @@ -127,7 +127,7 @@ } } -static void dirtest_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(dirtest_function) { char *var, *val; switch_channel_t *channel; @@ -173,7 +173,7 @@ return SWITCH_STATUS_SUCCESS; } -static void tts_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(tts_function) { switch_channel_t *channel; switch_codec_t *codec; @@ -230,7 +230,7 @@ } #endif -static void bugtest_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(bugtest_function) { #ifdef BUGTEST switch_media_bug_t *bug; @@ -250,13 +250,13 @@ } #if 1 -static void asrtest_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(asrtest_function) { switch_ivr_detect_speech(session, "lumenvox", "demo", data, "127.0.0.1", NULL); } #else -static void asrtest_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(asrtest_function) { switch_asr_handle_t ah = { 0 }; switch_asr_flag_t flags = SWITCH_ASR_FLAG_NONE; @@ -359,7 +359,7 @@ #endif -static void ivrtest_function(switch_core_session_t *session, char *data) +SWITCH_STANDARD_APP(ivrtest_function) { switch_channel_t *channel; switch_status_t status = SWITCH_STATUS_SUCCESS;

1 0