January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11210 - freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: dschreiber Date: Wed Jan 14 21:21:17 2009 New Revision: 11210 Log: mod_nibblebill This is a billing module created for FreeSWITCH. It's purpose is to allow real-time debiting of credit or cash from a database while calls are in progress. More info on the WIKI for mod_nibblebill Added: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/ freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c Added: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/mod_nibblebill.c Wed Jan 14 21:21:17 2009 @@ -0,0 +1,520 @@ +/* + * 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> + * + * The Initial Developer of this module is + * Darren Schreiber <d(a)d-man.org> + * + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Darren Schreiber <d(a)d-man.org> + * + * mod_nibblebill.c - Nibble Billing + * Set the session heartbeat on a call that has a billrate and deduct currency from + * a database table each "tick" of the billing until funds are depleted. + * Terminate the call upon depletion. + * + * + * TODO: Create an override flag so you can force a start-time for when billing should count *from* + * TODO: Fix what happens when the DB is not available + * TODO: Fix what happens when the DB queries fail (right now, all are acting like success) + * TODO: Make the actions function for when funds are depleted + * TODO: Add app and CLI commands (pause, resume, reset, flush, deduct_funds, add_funds) + * TODO: Add buffering abilities + * TODO: Make error handling for database, such that when the database is down (or not installed) we just log to a text file + * TODO: Make a sample .XML config file! + * FUTURE: Possibly make the hooks not tied per-channel, and instead just do this as a supervision style application with one thread that watches all calls + */ + +#include <switch.h> + +#ifdef SWITCH_HAVE_ODBC +#include <switch_odbc.h> +#endif + +// Defaults +//static char SQL_LOOKUP[] = "SELECT cash FROM accounts WHERE id=\"%s\""; +static char SQL_SAVE[] = "UPDATE accounts SET cash=cash-%f WHERE id=\"%s\""; + +typedef struct { + switch_time_t lastts; // Last time we did any billing + float total; // Total amount billed so far +} nibble_data_t; + + +typedef struct nibblebill_results{ + float funds; + + float percall_max; // Overrides global on a per-user level + float lowbal_amt; // ditto +} nibblebill_results_t; + + +/* Keep track of our config, event hooks and database connection variables, for this module only */ +static struct { + // Event hooks + switch_event_node_t *node; + + // Global mutex (don't touch a session when it's already being touched) + switch_mutex_t *mutex; + + // Global billing config options + float percall_max_amt; // Per-call billing limit (safety check, for fraud) + char *percall_action; // Exceeded length of per-call action + float lowbal_amt; // When we warn them they are near depletion + char *lowbal_action; // Low balance action + float nobal_amt; // Minimum amount that must remain in the account + char *nobal_action; // Drop action + + // Database settings + char *db_username; + char *db_password; + char *db_dsn; + char *lookup_query; + char *save_query; +#ifdef SWITCH_HAVE_ODBC + switch_odbc_handle_t *master_odbc; +#else + void *padding1; // Keep structures same size +#endif +} globals; + +/************************** +* Setup FreeSWITCH Macros * +**************************/ +/* Define the module's load function */ +SWITCH_MODULE_LOAD_FUNCTION(mod_nibblebill_load); + +/* Define the module's shutdown function */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_nibblebill_shutdown); + +/* Define the module's name, load function, shutdown function and runtime function */ +SWITCH_MODULE_DEFINITION(mod_nibblebill, mod_nibblebill_load, mod_nibblebill_shutdown, NULL); + +/* String setting functions */ +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_username, globals.db_username); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_password, globals.db_password); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_db_dsn, globals.db_dsn); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_lookup_query, globals.lookup_query); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_save_query, globals.save_query); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_percall_action, globals.percall_action); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_lowbal_action, globals.lowbal_action); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_nobal_action, globals.nobal_action); + + + +static int nibblebill_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + nibblebill_results_t *cbt = (nibblebill_results_t *) pArg; + + cbt->funds = atof(argv[0]); + + return 0; +} + + + +static switch_status_t load_config(void) +{ + char *cf = "nibblebill.conf"; + switch_xml_t cfg, xml = NULL, param, settings; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + status = SWITCH_STATUS_SUCCESS; // We don't fail because we can still write to a text file or buffer + goto done; + } + + 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 (!strcasecmp(var, "db-username")) { + set_global_db_username(val); + } else if (!strcasecmp(var, "db-password")) { + set_global_db_password(val); + } else if (!strcasecmp(var, "db-dsn")) { + set_global_db_dsn(val); + } else if (!strcasecmp(var, "lookup_query")) { + set_global_lookup_query(val); + } else if (!strcasecmp(var, "save_query")) { + set_global_save_query(val); + } else if (!strcasecmp(var, "percall_action")) { + set_global_percall_action(val); + } else if (!strcasecmp(var, "lowbal_action")) { + set_global_lowbal_action(val); + } else if (!strcasecmp(var, "nobal_action")) { + set_global_nobal_action(val); + } + } + } + +done: + if (switch_strlen_zero(globals.db_username)) { + set_global_db_username("phonebooth"); + } + if (switch_strlen_zero(globals.db_password)) { + set_global_db_password("dev"); + } + if (switch_strlen_zero(globals.db_dsn)) { + set_global_db_dsn("phonebooth"); + } + if (switch_strlen_zero(globals.percall_action)) { + set_global_percall_action("hangup"); + } + if (switch_strlen_zero(globals.lowbal_action)) { + set_global_lowbal_action("play ding"); + } + if (switch_strlen_zero(globals.nobal_action)) { + set_global_nobal_action("hangup"); + } + // Need to add defaults for the integers! + + +#ifdef SWITCH_HAVE_ODBC + if (globals.db_dsn) { + if (!(globals.master_odbc = switch_odbc_handle_new(globals.db_dsn, globals.db_username, globals.db_password))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot create handle to ODBC Database!\n"); + status = SWITCH_STATUS_FALSE; + goto reallydone; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opened ODBC Database handle!\n"); + } + if (switch_odbc_handle_connect(globals.master_odbc) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot connect to ODBC driver/database %s (user: %s / pass %s)!\n", globals.db_dsn, globals.db_username, globals.db_password); + status = SWITCH_STATUS_FALSE; + goto reallydone; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opened ODBC Database!\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.db_dsn); + } else { +#endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "ODBC does not appear to be installed in the core\n"); +#ifdef SWITCH_HAVE_ODBC + } +#endif + + +#ifdef SWITCH_HAVE_ODBC +reallydone: +#endif + + if (xml) { + switch_xml_free(xml); + } + return status; +} + + +void debug_event_handler(switch_event_t *event) { + switch_event_header_t *event_header = NULL; + + if (!event) { + return; + } + + // Print out all event headers, for fun + if (event->headers) { + for (event_header = event->headers; event_header; event_header = event_header->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Header info: %s => %s\n", event_header->name, event_header->value); + } + } +} + + +static switch_status_t sched_billing(switch_core_session_t *session) { + + switch_core_session_enable_heartbeat(session, 60); + + return SWITCH_STATUS_SUCCESS; + +} + +/* This is where we actually charge the guy */ +/* This can be called anytime a call is in progress or at the end of a call before the session is destroyed */ +static switch_status_t do_billing(switch_core_session_t *session) { + + // FS vars we will use + switch_channel_t *channel; + switch_caller_profile_t *profile; + + // Local vars + nibble_data_t *nibble_data; + switch_time_t ts = switch_timestamp_now(); + float billamount; + char date[80] = ""; + char *uuid; + switch_size_t retsize; + switch_time_exp_t tm; + + if (!session) { + // wtf? Why are we here? + return SWITCH_STATUS_GENERR; + } + + uuid = switch_core_session_get_uuid(session); + + // Get channel var + channel = switch_core_session_get_channel(session); + if (!channel) { + return SWITCH_STATUS_GENERR; + } + + // Variables kept in FS but relevant only to this module + const char *billrate = switch_channel_get_variable(channel, "nibble_rate"); + const char *billaccount = switch_channel_get_variable(channel, "nibble_account"); + + // Return if there's no billing information on this session + if (!billrate || !billaccount) { + return SWITCH_STATUS_GENERR; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to bill at $%s per minute to account %s\n", billrate, billaccount); + + // Get caller profile info from channel + profile = switch_channel_get_caller_profile(channel); + + if (!profile) { + // No caller profile (why would this happen?) + return SWITCH_STATUS_GENERR; + } + + if (profile->times->answered < 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Not billing %s - call is not in answered state\n", billaccount); + return SWITCH_STATUS_SUCCESS; + } + + // Lock this session's data for this module while we tinker with it + if (globals.mutex) { + switch_mutex_lock(globals.mutex); + } + + // Get our nibble data var. This will be NULL if it's our first call here for this session + nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_"); + + // Have we done any billing on this channel yet? If no, set up vars for doing so + if (!nibble_data) { + nibble_data = switch_core_session_alloc(session, sizeof(*nibble_data)); + if (!nibble_data) { + switch_assert(nibble_data); + } + memset(nibble_data, 0, sizeof(*nibble_data)); + + // Setup new billing data (based on call answer time, in case this module started late with active calls) + nibble_data->lastts = profile->times->answered; // Set the initial answer time to match when the call was really answered + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Beginning new billing on %s\n", uuid); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Last successful billing time was %s\n", date); + } + + switch_time_exp_lt(&tm, nibble_data->lastts); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%d seconds passed since last bill time of %s\n", (int) ((ts - nibble_data->lastts) / 1000000), date); + + + if ((ts - nibble_data->lastts) > 0) { + // Convert billrate into microseconds and multiply by # of microseconds that have passed + billamount = (atof(billrate) / 1000000 / 60) * ((ts - nibble_data->lastts)); + + // if ODBC call fails, we should return BEFORE updating the timestamp of last success! + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Billing $%f to %s (Call: %s / %f so far)\n", billamount, billaccount, uuid, nibble_data->total); + + // DO ODBC BILLING HERE! +#ifdef SWITCH_HAVE_ODBC + char sql[1024] = ""; + nibblebill_results_t pdata; + + memset(&pdata, 0, sizeof(pdata)); + if (!globals.save_query){ + snprintf(sql, 1024, SQL_SAVE, billamount, billaccount); + } else { + snprintf(sql, 1024, globals.save_query, billamount, billaccount); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doing static update query\n[%s]\n", sql); + + if (!(switch_odbc_handle_callback_exec(globals.master_odbc, sql, nibblebill_callback, &pdata) == SWITCH_ODBC_SUCCESS)){ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "DB Error while updating cash!\n"); + + // TODO: If this is a hangup event, we should store this billing in a text file while the DB is unavailable + } +#endif + + // Increment total cost + nibble_data->total += billamount; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Just tried to bill %s negative minutes! wtf?\n", uuid); + } + + // Update the last time we billed + nibble_data->lastts = ts; + + // Save everything back + switch_channel_set_private(channel, "_nibble_data_", nibble_data); + + // Release the session lock + switch_core_session_rwunlock(session); + + // Done changing - release lock + if (globals.mutex) { + switch_mutex_unlock(globals.mutex); + } + + + return SWITCH_STATUS_SUCCESS; +} + + +/* You can turn on session heartbeat on a channel to have us check billing more often */ +static void event_handler(switch_event_t *event) { + if (!event){ + // WTF? We should never get here - it means an event came in without the event info + return; + } + + // FS vars we'll need + switch_core_session_t *session; + char *uuid = switch_event_get_header(event, "Unique-ID"); + + // Make sure everything is sane + if (!uuid){ + // Donde esta channel? + return; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received request via %s!\n", switch_event_name (event->event_id)); + + // Display debugging info + if (switch_event_get_header(event, "nibble_debug")) { + debug_event_handler(event); + } + + // Get session var + session = switch_core_session_locate(uuid); + if (!session) { + return; + } + + // Go bill + do_billing(session); + + switch_core_session_rwunlock(session); +} + +SWITCH_STANDARD_APP(nibblebill_app_function) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "We made it!\n"); + + if (!channel) { + return; + } + +/* if (!(mydata = switch_core_session_strdup(session, data))) { + return; + } + + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + destnum = argv[0]; + do_billing(session); + }*/ +} + +/* We get here from the API only (theoretically) */ +SWITCH_STANDARD_API(nibblebill_function) +{ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "We made it!\n"); + +// Check if session has variable "billrate" set. If it does, activate the heartbeat variable +// switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds) +// switch_core_session_sched_heartbeat(switch_core_session_t *session, uint32_t seconds) + + + return SWITCH_STATUS_SUCCESS; + +} + +switch_state_handler_table_t nibble_state_handler = { + /* on_init */ NULL, + /* on_routing */ NULL, // Need to add a check here for anything in their account before routing + /* on_execute */ sched_billing, // Turn on heartbeat for this session + /* on_hangup */ do_billing, // On hangup - most important place to go bill + /* on_exch_media */ NULL, // Run billing upon a call being established + /* on_soft_exec */ NULL, + /* on_consume_med */ NULL, + /* on_hibernate */ NULL, + /* on_reset */ do_billing // In case the switch is reset, we still want to log billing +}; + + +SWITCH_MODULE_LOAD_FUNCTION(mod_nibblebill_load) +{ + switch_api_interface_t *api_interface; + switch_application_interface_t *app_interface; + + /* Set every byte in this structure to 0 */ + memset(&globals, 0, sizeof(globals)); + load_config(); + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_API(api_interface, "check", "Check the balance of an account", nibblebill_function, ""); + SWITCH_ADD_APP(app_interface, "check", "Check the balance on an account", "Perform an account check for fund balance", nibblebill_app_function, "<number>", SAF_SUPPORT_NOMEDIA); + + /* register state handlers for billing */ + switch_core_add_state_handler(&nibble_state_handler); + + /* bind to heartbeat events */ + if (switch_event_bind_removable(modname, SWITCH_EVENT_SESSION_HEARTBEAT, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event to monitor for session heartbeats!\n"); + return SWITCH_STATUS_GENERR; + } + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_nibblebill_shutdown) +{ + switch_event_unbind(&globals.node); + switch_core_remove_state_handler(&nibble_state_handler); + +#ifdef SWITCH_HAVE_ODBC + switch_odbc_handle_disconnect(globals.master_odbc); +#endif + + return SWITCH_STATUS_UNLOAD; +} + +/* 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] r11209 - freeswitch/trunk/scripts/contrib/dschreiber
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: brian Date: Wed Jan 14 21:02:06 2009 New Revision: 11209 Log: go go gadget ... Added: freeswitch/trunk/scripts/contrib/dschreiber/

1 0

[commit] r11205 - freeswitch/trunk/src/mod/applications/mod_fax
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: ctrix Date: Wed Jan 14 17:13:28 2009 New Revision: 11205 Log: Unbind the reloadxml event on module shutdown Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Wed Jan 14 17:13:28 2009 @@ -808,6 +808,8 @@ { switch_memory_pool_t *pool = globals.pool; + switch_event_unbind(&NODE); + switch_core_destroy_memory_pool(&pool); memset(&globals, 0, sizeof(globals));

1 0

[commit] r11203 - freeswitch/trunk/src
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: anthm Date: Wed Jan 14 14:46:02 2009 New Revision: 11203 Log: add extra sanity check Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Jan 14 14:46:02 2009 @@ -572,7 +572,7 @@ switch_assert(session != NULL); switch_assert(frame != NULL); - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (!switch_channel_ready(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -605,14 +605,15 @@ switch_mutex_lock(session->codec_write_mutex); - if (!(session->write_codec && session->write_codec->mutex && frame->codec)) { + if (!(session->write_codec && session->write_codec->mutex && frame->codec) || + !switch_channel_ready(session->channel) || !switch_channel_media_ready(session->channel)) { switch_mutex_unlock(session->codec_write_mutex); return SWITCH_STATUS_FALSE; } switch_mutex_lock(session->write_codec->mutex); switch_mutex_lock(frame->codec->mutex); - + if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { if (session->write_codec->implementation->codec_id == frame->codec->implementation->codec_id) {

1 0

[commit] r11202 - freeswitch/trunk/src/mod/languages/mod_managed
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: mikej Date: Wed Jan 14 14:38:50 2009 New Revision: 11202 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Wed Jan 14 14:38:50 2009 @@ -21077,7 +21077,7 @@ arg9 = (char *)jarg9; arg10 = (uint32_t)jarg10; arg11 = (char *)jarg11; - result = (switch_status_t)switch_play_and_get_digits(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11); + result = (switch_status_t)switch_play_and_get_digits(arg1,arg2,arg3,arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,(char const *)arg11); jresult = result; return jresult; }

1 0

[commit] r11201 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: brian Date: Wed Jan 14 14:29:16 2009 New Revision: 11201 Log: <action application="play_and_get_digits" data="1 3 3 3000 # ivr/ivr-please.wav ivr/ivr-not.wav \d{2}"/> You can use play and get digits in the dialplan as an application now. Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Wed Jan 14 14:29:16 2009 @@ -354,10 +354,10 @@ uint32_t max_digits, uint32_t max_tries, uint32_t timeout, - char *valid_terminators, - char *audio_file, - char *bad_input_audio_file, char *digit_buffer, uint32_t digit_buffer_length, - char *digits_regex); + const char *valid_terminators, + const char *audio_file, + const char *bad_input_audio_file, char *digit_buffer, uint32_t digit_buffer_length, + const char *digits_regex); SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session_t *session, switch_speech_handle_t *sh, Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Jan 14 14:29:16 2009 @@ -1613,7 +1613,65 @@ switch_ivr_read(session, min_digits, max_digits, prompt_audio_file, var_name, digit_buffer, sizeof(digit_buffer), timeout, valid_terminators); } +SWITCH_STANDARD_APP(play_and_get_digits_function) +{ + char *mydata; + char *argv[8] = { 0 }; + int argc; + int32_t min_digits = 0; + int32_t max_digits = 0; + int32_t max_tries = 0; + int timeout = 1000; + char digit_buffer[128] = ""; + const char *prompt_audio_file = NULL; + const char *bad_input_audio_file = NULL; + const char *valid_terminators = NULL; + const char *digits_regex = NULL; + + if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No arguments specified.\n"); + return; + } + + min_digits = atoi(argv[0]); + + if (argc > 1) { + max_digits = atoi(argv[1]); + } + + if (argc > 2) { + max_tries = atoi(argv[2]); + } + if (argc > 3) { + timeout = atoi(argv[3]); + } + + if (argc > 4) { + valid_terminators = argv[4]; + } + + if (argc > 5) { + prompt_audio_file = argv[5]; + } + + if (argc > 6) { + bad_input_audio_file = argv[6]; + } + + if (argc > 7) { + digits_regex = argv[7]; + } + + if (switch_strlen_zero(valid_terminators)) { + valid_terminators = "#"; + } + + switch_play_and_get_digits(session, min_digits, max_digits, max_tries, timeout, valid_terminators, + prompt_audio_file, bad_input_audio_file, digit_buffer, sizeof(digit_buffer), digits_regex); +} #define SAY_SYNTAX "<module_name> <say_type> <say_method> <text>" SWITCH_STANDARD_APP(say_function) @@ -2554,6 +2612,8 @@ SWITCH_ADD_APP(app_interface, "playback", "Playback File", "Playback a file to the channel", playback_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "att_xfer", "Attended Transfer", "Attended Transfer", att_xfer_function, "<channel_url>", SAF_NONE); SWITCH_ADD_APP(app_interface, "read", "Read Digits", "Read Digits", read_function, "<min> <max> <file> <var name> <timeout> <terminators>", SAF_NONE); + SWITCH_ADD_APP(app_interface, "play_and_get_digits", "Play and get Digits", "Play and get Digits", + play_and_get_digits_function, "<min> <max> <tries> <timeout> <terminators> <file> <invalid_file> <regexp>", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_record_session", "Stop Record Session", STOP_SESS_REC_DESC, stop_record_session_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "record_session", "Record Session", SESS_REC_DESC, record_session_function, "<path> [+<timeout>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "record", "Record File", "Record a file from the channels input", record_function, Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Jan 14 14:29:16 2009 @@ -1500,12 +1500,12 @@ uint32_t max_digits, uint32_t max_tries, uint32_t timeout, - char *valid_terminators, - char *prompt_audio_file, - char *bad_input_audio_file, + const char *valid_terminators, + const char *prompt_audio_file, + const char *bad_input_audio_file, char *digit_buffer, uint32_t digit_buffer_length, - char *digits_regex) + const char *digits_regex) { switch_channel_t *channel = switch_core_session_get_channel(session);

1 0

[commit] r11200 - in freeswitch/trunk/src: . mod/formats/mod_shout
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: anthm Date: Wed Jan 14 13:44:14 2009 New Revision: 11200 Log: fix buffering issue in mod_shout/core Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_ivr_play_say.c 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 Wed Jan 14 13:44:14 2009 @@ -116,6 +116,12 @@ int lame_ready; int eof; int channels; + int16_t *l; + switch_size_t llen; + int16_t *r; + switch_size_t rlen; + unsigned char *mp3buf; + switch_size_t mp3buflen; }; typedef struct shout_context shout_context_t; @@ -903,8 +909,7 @@ static switch_status_t shout_file_write(switch_file_handle_t *handle, void *data, size_t *len) { shout_context_t *context; - unsigned char mp3buf[8192] = ""; - int rlen; + int rlen = 0; int16_t *audio = data; int nsamples = *len; @@ -954,23 +959,32 @@ context->lame_ready = 1; } + if (context->mp3buflen < nsamples * 4) { + context->mp3buflen = nsamples * 4; + context->mp3buf = switch_core_alloc(context->memory_pool, context->mp3buflen); + } + if (handle->channels == 2) { - int16_t l[4096] = { 0 }; - int16_t r[4096] = { 0 }; int i, j = 0; - + + if (context->llen < nsamples) { + context->l = switch_core_alloc(context->memory_pool, nsamples * 2); + context->r = switch_core_alloc(context->memory_pool, nsamples * 2); + context->llen = context->rlen = nsamples; + } + for (i = 0; i < nsamples; i++) { - l[i] = audio[j++]; - r[i] = audio[j++]; + context->l[i] = audio[j++]; + context->r[i] = audio[j++]; } - - if ((rlen = lame_encode_buffer(context->gfp, l, r, nsamples, mp3buf, sizeof(mp3buf))) < 0) { + + if ((rlen = lame_encode_buffer(context->gfp, context->l, context->r, nsamples, context->mp3buf, context->mp3buflen)) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); return SWITCH_STATUS_FALSE; } } else if (handle->channels == 1) { - if ((rlen = lame_encode_buffer(context->gfp, audio, NULL, nsamples, mp3buf, sizeof(mp3buf))) < 0) { + if ((rlen = lame_encode_buffer(context->gfp, audio, NULL, nsamples, context->mp3buf, context->mp3buflen)) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "MP3 encode error %d!\n", rlen); return SWITCH_STATUS_FALSE; } @@ -979,7 +993,7 @@ } if (rlen) { - int ret = fwrite(mp3buf, 1, rlen, context->fp); + int ret = fwrite(context->mp3buf, 1, rlen, context->fp); if (ret < 0) { return SWITCH_STATUS_FALSE; } @@ -1445,7 +1459,7 @@ 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, "decoder")) { switch_set_string(globals.decoder, val); } else if (!strcmp(var, "volume")) { Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Wed Jan 14 13:44:14 2009 @@ -119,7 +119,7 @@ if (fh->pre_buffer_datalen) { //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Prebuffering %d bytes\n", (int)fh->pre_buffer_datalen); - switch_buffer_create_dynamic(&fh->pre_buffer, fh->pre_buffer_datalen, fh->pre_buffer_datalen / 2, 0); + switch_buffer_create_dynamic(&fh->pre_buffer, fh->pre_buffer_datalen * fh->channels, fh->pre_buffer_datalen * fh->channels / 2, 0); fh->pre_buffer_data = switch_core_alloc(fh->memory_pool, fh->pre_buffer_datalen); } @@ -248,16 +248,20 @@ if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->native_rate != fh->samplerate) { if (!fh->resampler) { if (switch_resample_create(&fh->resampler, - fh->native_rate, orig_len, fh->samplerate, (uint32_t) orig_len, fh->memory_pool) != SWITCH_STATUS_SUCCESS) { + fh->native_rate, + orig_len * fh->channels, + fh->samplerate, + (uint32_t) orig_len *fh->channels, + fh->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); return SWITCH_STATUS_GENERR; } } - fh->resampler->from_len = switch_short_to_float(data, fh->resampler->from, (int) *len); + fh->resampler->from_len = switch_short_to_float(data, fh->resampler->from, (int) *len * fh->channels); fh->resampler->to_len = switch_resample_process(fh->resampler, fh->resampler->from, fh->resampler->from_len, fh->resampler->to, fh->resampler->to_size, 0); - if (fh->resampler->to_len > orig_len) { + if (fh->resampler->to_len > orig_len * fh->channels) { if (!fh->dbuf) { fh->dbuflen = fh->resampler->to_len * 2; fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); @@ -269,7 +273,7 @@ switch_float_to_short(fh->resampler->to, data, fh->resampler->to_len); } - *len = fh->resampler->to_len; + *len = fh->resampler->to_len / fh->channels; } @@ -282,13 +286,14 @@ switch_size_t rlen, blen; switch_status_t status = SWITCH_STATUS_SUCCESS; int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE); - - switch_buffer_write(fh->pre_buffer, data, asis ? *len : *len * 2); + + switch_buffer_write(fh->pre_buffer, data, (asis ? *len : *len * 2) * fh->channels); rlen = switch_buffer_inuse(fh->pre_buffer); if (rlen >= fh->pre_buffer_datalen) { blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); if (!asis) blen /= 2; + if (fh->channels) blen /= fh->channels; if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) { *len = 0; } @@ -354,9 +359,6 @@ return SWITCH_STATUS_FALSE; } - switch_clear_flag(fh, SWITCH_FILE_OPEN); - status = fh->file_interface->file_close(fh); - if (fh->buffer) { switch_buffer_destroy(&fh->buffer); } @@ -369,6 +371,7 @@ while((rlen = switch_buffer_inuse(fh->pre_buffer))) { blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); if (asis) blen /= 2; + if (fh->channels) blen /= fh->channels; if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) { break; } @@ -378,6 +381,9 @@ switch_buffer_destroy(&fh->pre_buffer); } + switch_clear_flag(fh, SWITCH_FILE_OPEN); + status = fh->file_interface->file_close(fh); + switch_resample_destroy(&fh->resampler); UNPROTECT_INTERFACE(fh->file_interface); Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Jan 14 13:44:14 2009 @@ -420,6 +420,7 @@ } } + fh->pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN; if (switch_core_file_open(fh, file,

1 0

[commit] r11197 - freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: mikej Date: Wed Jan 14 11:57:15 2009 New Revision: 11197 Log: no need to be crass Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs Wed Jan 14 11:57:15 2009 @@ -145,14 +145,14 @@ int pos = plainEvent.Body.IndexOf("\n\n"); if (pos < plainEvent.Body.Length - 2) { - Console.WriteLine("Fucked up event"); + Console.WriteLine("Invalid event"); Console.WriteLine("Header"); Console.WriteLine(headers); Console.WriteLine("Body"); Console.WriteLine(plainEvent.Body); Console.WriteLine("=========================== EVERYTHING in _text =============================="); Console.WriteLine(_text); - throw new InvalidDataException("Fucked up event: " + _text); + throw new InvalidDataException("Invalid event: " + _text); } if (plainEvent.Body.Length < plainEvent.ContentLength) @@ -178,4 +178,4 @@ _piecesToAppend.Enqueue(text); } } -} \ No newline at end of file +}

1 0

[commit] r11196 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: silik0n Date: Wed Jan 14 11:53:46 2009 New Revision: 11196 Log: Resolve MODAPP-192 Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Wed Jan 14 11:53:46 2009 @@ -191,7 +191,7 @@ return status; } -static char SQL_LOOKUP[] = "SELECT gateways.gateway_ip, gateways.group, gateways.limit, gateways.techprofile, numbers.acctcode, numbers.translated from gateways, numbers where numbers.number = \"%s\" and numbers.gateway_id = gateways.gateway_id limit 1;"; +static char SQL_LOOKUP[] = "SELECT gateways.gateway_ip, gateways.group, gateways.limit, gateways.techprofile, numbers.acctcode, numbers.translated from gateways, numbers where numbers.number = '%s' and numbers.gateway_id = gateways.gateway_id limit 1;"; static switch_status_t route_lookup(char *dn, easyroute_results_t *results) {

1 0

[commit] r11195 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: mrene Date: Wed Jan 14 10:28:30 2009 New Revision: 11195 Log: multi-line testing Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Jan 14 10:28:30 2009 @@ -64,7 +64,7 @@ }; typedef struct limit_hash_item limit_hash_item_t; - + static char limit_sql[] = "CREATE TABLE limit_data (\n" " hostname VARCHAR(255),\n" " realm VARCHAR(255),\n" " id VARCHAR(255),\n" " uuid VARCHAR(255)\n" ");\n";

1 0