- Freeswitch-svn - 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] r11208 - freeswitch/branches/ctrix/mod_airpe
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: ctrix Date: Wed Jan 14 19:09:35 2009 New Revision: 11208 Log: An application, some events and some channel variables. Modified: freeswitch/branches/ctrix/mod_airpe/airpe_api.c freeswitch/branches/ctrix/mod_airpe/airpe_apps.c freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c freeswitch/branches/ctrix/mod_airpe/mod_airpe.c freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Modified: freeswitch/branches/ctrix/mod_airpe/airpe_api.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_api.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_api.c Wed Jan 14 19:09:35 2009 @@ -37,7 +37,7 @@ */ -#define AIRPE_MOODTEXT_SYNTAX "airpe_moodtext <clientname> <text>" +#define AIRPE_MOODTEXT_SYNTAX "airpe_moodtext <clientname> [text]" SWITCH_STANDARD_API(airpe_moodtext_command) { int argc = 0; @@ -67,11 +67,10 @@ } if ( argc == 1 ) { - stream->write_function(stream, "+OK: "); if ( airpe->mood_text ) stream->write_function(stream, airpe->mood_text); else - stream->write_function(stream, "UNKNOWN"); + stream->write_function(stream, "[UNKNOWN]"); stream->write_function(stream, "\n"); } else { @@ -91,7 +90,7 @@ return SWITCH_STATUS_SUCCESS; } -#define AIRPE_INFO_SYNTAX "airpe_status <clientname>" +#define AIRPE_INFO_SYNTAX "airpe_info <clientname>" SWITCH_STANDARD_API(airpe_info_command) { int argc = 0; @@ -161,7 +160,7 @@ return SWITCH_STATUS_SUCCESS; } -#define AIRPE_STATUS_SYNTAX "airpe_status <clientname> <status>" +#define AIRPE_STATUS_SYNTAX "airpe_status <clientname> [status]" SWITCH_STANDARD_API(airpe_status_command) { int argc = 0; @@ -197,7 +196,6 @@ if ( !cstatus ) { const char *str_status = NULL; str_status = skype_user_status_string( airpe->user_status ); - stream->write_function(stream, "+OK status is "); if ( str_status ) stream->write_function(stream, str_status); else @@ -251,13 +249,13 @@ switch_api_interface_t *api; switch_console_set_complete("add airpe_moodtext "); - SWITCH_ADD_API(api, "airpe_moodtext", "sets the mood text of an airpe client", airpe_moodtext_command, AIRPE_MOODTEXT_SYNTAX); + SWITCH_ADD_API(api, "airpe_moodtext", "gets/sets the mood text of an airpe client", airpe_moodtext_command, AIRPE_MOODTEXT_SYNTAX); switch_console_set_complete("add airpe_info "); SWITCH_ADD_API(api, "airpe_info", "shows the status of an airpe client", airpe_info_command, AIRPE_INFO_SYNTAX); switch_console_set_complete("add airpe_status "); - SWITCH_ADD_API(api, "airpe_status", "sets the status of an airpe client", airpe_status_command, AIRPE_STATUS_SYNTAX); + SWITCH_ADD_API(api, "airpe_status", "gets/sets the status of an airpe client", airpe_status_command, AIRPE_STATUS_SYNTAX); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/ctrix/mod_airpe/airpe_apps.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_apps.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_apps.c Wed Jan 14 19:09:35 2009 @@ -30,15 +30,67 @@ #include "mod_airpe.h" -SWITCH_STANDARD_APP(airpe_app_test) +#define AIRPE_SET_STATUS_SYNTAX "<client> <unknown|online|offline|skyoeme|away|na|dnd|invisible|loggedout>" +SWITCH_STANDARD_APP(airpe_set_status) { + airpe_interface_t *airpe = NULL; + const char *str_status = NULL; + char buf[SKYPE_MSG_LEN]; + char *client = NULL; + char *text = NULL; + + client = (char *) data; + if ( (text = strchr(client,' ')) ) { + *text++ = '\0'; + } + + if ( switch_strlen_zero(client) ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No client specified.\n"); + return; + } + + airpe = airpe_find_interface(client); + + if ( !airpe ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No airpe client matching name '%s' found.\n", client); + return; + } + + if ( !switch_strlen_zero(text) ) { + + if ( !strncasecmp(text, "unknown", sizeof("unknown") ) ) + str_status = skype_user_status_string(USER_STATUS_UNKNOWN); + else if ( !strncasecmp(text, "online", sizeof("online") ) ) + str_status = skype_user_status_string(USER_STATUS_ONLINE); + else if ( !strncasecmp(text, "offline", sizeof("offline") ) ) + str_status = skype_user_status_string(USER_STATUS_OFFLINE); + else if ( !strncasecmp(text, "skypeme", sizeof("skypeme") ) ) + str_status = skype_user_status_string(USER_STATUS_SKYPEME); + else if ( !strncasecmp(text, "away", sizeof("away") ) ) + str_status = skype_user_status_string(USER_STATUS_AWAY); + else if ( !strncasecmp(text, "na", sizeof("na") ) ) + str_status = skype_user_status_string(USER_STATUS_NA); + else if ( !strncasecmp(text, "dnd", sizeof("dnd") ) ) + str_status = skype_user_status_string(USER_STATUS_DND); + else if ( !strncasecmp(text, "invisible", sizeof("invisible") ) ) + str_status = skype_user_status_string(USER_STATUS_INVISIBLE); + else if ( !strncasecmp(text, "loggedout", sizeof("loggedout") ) ) + str_status = skype_user_status_string(USER_STATUS_LOGGEDOUT); + + if ( str_status ) { + snprintf(buf, SKYPE_MSG_LEN, "SET USERSTATUS %s", str_status ); + airpe_cmd_write(airpe, buf); + } + + } + } switch_status_t airpe_register_apps( switch_loadable_module_interface_t **module_interface ) { switch_application_interface_t *app_interface; - SWITCH_ADD_APP(app_interface, "airpe_test", "test text", "test text", airpe_app_test, "", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "airpe_set_status", "Sets the status of an airpe client", "Sets the status of an airpe client", airpe_set_status, AIRPE_SET_STATUS_SYNTAX, SAF_SUPPORT_NOMEDIA); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c Wed Jan 14 19:09:35 2009 @@ -373,6 +373,8 @@ else switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); + switch_channel_set_variable(channel, "airpe_client", airpe->name); + switch_channel_set_variable(channel, "airpe_user_status", skype_user_status_string(airpe->user_status) ); switch_set_flag(tech_pvt, TFLAG_INBOUND); airpe_set_call_id(airpe, callid, switch_core_session_get_uuid(new_session) ); @@ -502,6 +504,8 @@ switch_status_t airpe_manage_skype_msg( airpe_interface_t *airpe, const char *msg ) { switch_core_session_t *session = NULL; + switch_channel_t *channel = NULL; + switch_event_t *s_event = NULL; char *buf = NULL; int argc = 0; char *argv[9] = { 0 }; @@ -512,8 +516,11 @@ if ( airpe->debug ) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "airpe client %s: < %s\n", airpe->name, msg); - if ( airpe->active_session_uuid ) + if ( airpe->active_session_uuid ) { session = switch_core_session_locate(airpe->active_session_uuid); + if ( session ) + channel = switch_core_session_get_channel(session); + } buf = strdup(msg); argc = switch_separate_string(buf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -524,8 +531,6 @@ return SWITCH_STATUS_FALSE; } - - if ( !strncmp( buf, "CURRENTUSERHANDLE", strlen("CURRENTUSERHANDLE")) ) { /* The username that the client is using. */ // TODO ... if the user handle mismatches, disconnect the channel or simply disable @@ -553,9 +558,16 @@ else if ( !strncmp( buf, "USER", strlen("USER")) && argc >= 2 ) { /* Updates about the users of our list or new auth requests */ if ( !strncmp(argv[2], "RECEIVEDAUTHREQUEST", strlen("RECEIVEDAUTHREQUEST") ) ) { + if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, AIRPE_EVENT_AUTHREQUEST) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "client-name", airpe->name); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "auth_user", argv[1]); + switch_event_fire(&s_event); + } if ( airpe->auto_auth ) { snprintf(buf, sizeof(buf), "SET USER %s ISAUTHORIZED TRUE", argv[1]); airpe_cmd_write(airpe, buf); + + } } } @@ -627,6 +639,11 @@ else if ( !strncmp(cmd, "STATUS", strlen("STATUS")) && argc >=4 ) { char *callstatus = argv[3]; airpe_manage_call_status( airpe, callid, callstatus ); + if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, AIRPE_EVENT_STATUSCHANGE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "client-name", airpe->name); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "status", callstatus); + switch_event_fire(&s_event); + } } else if ( !strncmp(cmd, "CONF_ID", strlen("CONF_ID")) ) { char buf[SKYPE_MSG_LEN]; @@ -652,15 +669,11 @@ } else if ( !strncmp(cmd, "DTMF", strlen("DTMF")) ) { /* This is an incoming DTMF */ - if ( session ) { - switch_channel_t *channel; + if ( session && channel ) { switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0) }; const char *signal_ptr; int tmp; - channel = switch_core_session_get_channel(session); - assert(channel); - signal_ptr = argv[3]; if (*signal_ptr && (*signal_ptr == '*' || *signal_ptr == '#' || *signal_ptr == 'A' || *signal_ptr == 'B' || *signal_ptr == 'C' || *signal_ptr == 'D')) { @@ -670,9 +683,7 @@ dtmf.digit = switch_rfc2833_to_char(tmp); } - switch_mutex_lock(airpe->tech_pvt->flag_mutex); switch_channel_queue_dtmf(channel, &dtmf); - switch_mutex_unlock(airpe->tech_pvt->flag_mutex); } } else if ( !strncmp(cmd, "FAILUREREASON", strlen("FAILUREREASON")) && argc >=2 ) { @@ -698,6 +709,8 @@ if ( data ) { data += strlen("PARTNER_DISPNAME "); airpe_set_partner_displayname(airpe, data); + if ( channel ) + switch_channel_set_variable(channel, "airpe_partner_dispname", data); } } switch_safe_free(tmp); @@ -710,6 +723,8 @@ if ( data ) { data += strlen("PARTNER_HANDLE "); airpe_set_partner_handle(airpe, data); + if ( channel ) + switch_channel_set_variable(channel, "airpe_partner_handle", data); } switch_safe_free(tmp); } @@ -735,10 +750,13 @@ } else if ( !strncmp( buf, "ERROR", strlen("ERROR")) ) { /* If we are in the middle of a call, hangup */ + /* if ( airpe->active_call_id ) { + char buf[SKYPE_MSG_LEN] = ""; snprintf(buf, sizeof(buf), "ALTER CALL %d END HANGUP", airpe->active_call_id ); airpe_cmd_write(airpe, buf); } + */ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unmanaged message\n"); Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.c (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.c Wed Jan 14 19:09:35 2009 @@ -408,6 +408,10 @@ airpe_set_call_id(tech_pvt->airpe, 0, switch_core_session_get_uuid(*new_session) ); switch_channel_set_flag(channel, CF_OUTBOUND); switch_set_flag(tech_pvt, TFLAG_OUTBOUND); + + switch_channel_set_variable(channel, "airpe_client", tech_pvt->airpe->name); + switch_channel_set_variable(channel, "airpe_user_status", skype_user_status_string(tech_pvt->airpe->user_status) ); + switch_channel_set_state(channel, CS_INIT); return SWITCH_CAUSE_SUCCESS; } Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.h ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.h (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Wed Jan 14 19:09:35 2009 @@ -33,6 +33,9 @@ #define MODNAME "airpe" +#define AIRPE_EVENT_AUTHREQUEST "airpe::authrequest" +#define AIRPE_EVENT_STATUSCHANGE "airpe::statuschange" + #define SKYPE_MSG_LEN 1024 #define CODEC_SAMPLE_RATE 16000

1 0

[commit] r11207 - in freeswitch/branches/ctrix/mod_airpe: . config
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: ctrix Date: Wed Jan 14 18:03:50 2009 New Revision: 11207 Log: Add option to let the client auto-auth incoming requests Modified: freeswitch/branches/ctrix/mod_airpe/airpe_api.c freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c freeswitch/branches/ctrix/mod_airpe/airpe_if_x11.c freeswitch/branches/ctrix/mod_airpe/config/airpe.conf.xml freeswitch/branches/ctrix/mod_airpe/mod_airpe.c freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Modified: freeswitch/branches/ctrix/mod_airpe/airpe_api.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_api.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_api.c Wed Jan 14 18:03:50 2009 @@ -152,6 +152,11 @@ switch_snprintf(buf, sizeof(buf), "%-20s: %s\n", "Mood text", (airpe->mood_text ) ? airpe->mood_text : "Unknown" ); stream->write_function(stream, buf); + switch_snprintf(buf, sizeof(buf), "%-20s: %s\n", "Debug", (airpe->debug ) ? "Yes" : "No" ); + stream->write_function(stream, buf); + switch_snprintf(buf, sizeof(buf), "%-20s: %s\n", "Auto-auth", (airpe->auto_auth) ? "Yes" : "No" ); + stream->write_function(stream, buf); + done: return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c Wed Jan 14 18:03:50 2009 @@ -553,10 +553,10 @@ else if ( !strncmp( buf, "USER", strlen("USER")) && argc >= 2 ) { /* Updates about the users of our list or new auth requests */ if ( !strncmp(argv[2], "RECEIVEDAUTHREQUEST", strlen("RECEIVEDAUTHREQUEST") ) ) { - /* TODO add option to ignore such requests */ - char buf[SKYPE_MSG_LEN] = ""; - snprintf(buf, sizeof(buf), "SET USER %s ISAUTHORIZED TRUE", argv[1]); - airpe_cmd_write(airpe, buf); + if ( airpe->auto_auth ) { + snprintf(buf, sizeof(buf), "SET USER %s ISAUTHORIZED TRUE", argv[1]); + airpe_cmd_write(airpe, buf); + } } } else if ( !strncmp( buf, "GROUP", strlen("GROUP")) ) { @@ -583,7 +583,7 @@ else if ( !strncmp( buf, "CHAT", strlen("CHAT")) && argc >=2 ) { /* Chat status - ignored. */ if ( airpe->protocol > 6 ) { - //TODO : ALTER CHAT <chat_id> DISBAND - Doesn't seems to work on linux + /* ALTER CHAT <chat_id> DISBAND - Doesn't seems to work on linux */ char buf[SKYPE_MSG_LEN] = ""; snprintf(buf, sizeof(buf), "ALTER CHAT %s DISBAND", argv[1]); airpe_cmd_write(airpe, buf); @@ -616,13 +616,13 @@ if ( !strncmp(cmd, "DURATION", strlen("DURATION")) ) { /* Ignore the duration that is updated every second */ + /* TODO: maybe in the future we could consider this message as a keepalive signal */ if ( callid != airpe->active_call_id ) { char buf[SKYPE_MSG_LEN] = ""; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "airpe client %s: hanging up unknown call id %d\n", airpe->name, callid); snprintf(buf, sizeof(buf), "SET CALL %d STATUS FINISHED", callid); airpe_cmd_write(airpe, buf); } - //TODO: maybe we could consider this message as a keepalive signal } else if ( !strncmp(cmd, "STATUS", strlen("STATUS")) && argc >=4 ) { char *callstatus = argv[3]; @@ -734,7 +734,11 @@ /* Ignoring by now */ } else if ( !strncmp( buf, "ERROR", strlen("ERROR")) ) { - //TODO If we are in the middle of a call, hangup + /* If we are in the middle of a call, hangup */ + if ( airpe->active_call_id ) { + snprintf(buf, sizeof(buf), "ALTER CALL %d END HANGUP", airpe->active_call_id ); + airpe_cmd_write(airpe, buf); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unmanaged message\n"); Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_x11.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_x11.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_x11.c Wed Jan 14 18:03:50 2009 @@ -95,8 +95,7 @@ switch_log_printf( SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "HEY! where is my skype window gone ? Restarting skype for client...\n"); /* - - TODO AND TO USE + TODO AND TO USE - Start skype client int fid; const char *args[] = { "skype", "--actiondispatch", params, 0 }; Modified: freeswitch/branches/ctrix/mod_airpe/config/airpe.conf.xml ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/config/airpe.conf.xml (original) +++ freeswitch/branches/ctrix/mod_airpe/config/airpe.conf.xml Wed Jan 14 18:03:50 2009 @@ -19,6 +19,7 @@ <param name="context" value="default"/> <param name="destination" value="4321"/> + <param name="auto-auth" value="false"/>  Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.c (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.c Wed Jan 14 18:03:50 2009 @@ -260,7 +260,6 @@ if ( switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ) { airpe_originate(tech_pvt->airpe, tech_pvt->destination ); - // TODO if fail switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } switch_channel_set_state(channel, CS_ROUTING); @@ -509,14 +508,13 @@ switch (sig) { case SWITCH_SIG_KILL: break; - case SWITCH_SIG_BREAK: + case SWITCH_SIG_BREAK: break; - default: - //TODO Log unhandled signal - break; - } + default: + break; + } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } static switch_status_t channel_send_dtmf(switch_core_session_t * session, const switch_dtmf_t * dtmf) { @@ -686,6 +684,7 @@ char *skype_password= NULL; char *cid_name = NULL; char *cid_num = NULL; + int auto_auth = 0; int debug = 0; airpe_interface_t *newconf = NULL; @@ -701,6 +700,8 @@ if (!strcasecmp(var, "debug")) { debug = switch_true(val) ? 1 : 0; + } else if (!strcasecmp(var, "auto-auth")) { + auto_auth = switch_true(val) ? 1 : 0; } else if (!strcasecmp(var, "context")) { context = val; } else if (!strcasecmp(var, "dialplan")) { @@ -765,6 +766,7 @@ newconf->dialplan = switch_core_strdup(pool, dialplan); newconf->context = switch_core_strdup(pool, context); newconf->destination = switch_core_strdup(pool, destination); + newconf->auto_auth = auto_auth; newconf->debug = debug; if ( reload ) { Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.h ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.h (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Wed Jan 14 18:03:50 2009 @@ -139,6 +139,7 @@ char *skype_user; char *skype_password; + int auto_auth; int audio_in_port; int audio_out_port; switch_socket_t *audio_in_socket;

1 0

[commit] r11206 - in freeswitch/branches/ctrix/mod_airpe: . config
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: ctrix Date: Wed Jan 14 17:39:21 2009 New Revision: 11206 Log: Airpe: reloadxml configuration event - bindings and handler Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c freeswitch/branches/ctrix/mod_airpe/config/airpe.conf.xml freeswitch/branches/ctrix/mod_airpe/mod_airpe.c freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c Wed Jan 14 17:39:21 2009 @@ -175,6 +175,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "msg to airpe client %s: > %s\n", airpe->name, msg); status = airpe_skype_send_message(airpe->skype_window, msg); + /* Relax and calm down. Some skype clients don't like fast messages */ + switch_sleep(10000); return status; } Modified: freeswitch/branches/ctrix/mod_airpe/config/airpe.conf.xml ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/config/airpe.conf.xml (original) +++ freeswitch/branches/ctrix/mod_airpe/config/airpe.conf.xml Wed Jan 14 17:39:21 2009 @@ -12,13 +12,17 @@ <clients> <client name="airpe1">  - <param name="debug" value="1"/> + <param name="debug" value="false"/>  <param name="dialplan" value="XML"/> <param name="context" value="default"/> <param name="destination" value="4321"/> +  +  <param name="X11-display" value=":101"/> @@ -32,5 +36,4 @@ <param name="skype-password" value="password"/> </client> </clients> - </configuration> Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.c (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.c Wed Jan 14 17:39:21 2009 @@ -630,7 +630,7 @@ CONFIGURATION *****************************************************************************/ -static switch_status_t load_config(void) { +static switch_status_t load_config( int reload ) { switch_xml_t cfg, xml, global_settings, @@ -695,11 +695,6 @@ continue; } - if ( (newconf = switch_core_hash_find(globals.interfaces_hash, name)) ) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Duplicated client %s. Skipping\n", name); - continue; - } - for (param = switch_xml_child(client, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -746,43 +741,62 @@ if ( !destination ) destination = globals.destination; - newconf = (airpe_interface_t *) switch_core_alloc( pool, sizeof(airpe_interface_t) ); + if ( reload ) { + newconf = airpe_find_interface(name); + } + else { + if ( (newconf = switch_core_hash_find(globals.interfaces_hash, name)) ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Duplicated client %s. Skipping\n", name); + continue; + } + } + + if ( !newconf ) { + newconf = (airpe_interface_t *) switch_core_alloc( pool, sizeof(airpe_interface_t) ); + if ( newconf ) + memset(newconf, 0, sizeof(airpe_interface_t)); + } + if ( newconf ) { switch_status_t status; - memset(newconf, 0, sizeof(airpe_interface_t)); - newconf->name = switch_core_strdup(pool, name); newconf->dialplan = switch_core_strdup(pool, dialplan); newconf->context = switch_core_strdup(pool, context); newconf->destination = switch_core_strdup(pool, destination); + newconf->debug = debug; + + if ( reload ) { + /* We won't update any other value on reload. */ + newconf->should_reload = 0; + continue; + } + newconf->skype_user = switch_core_strdup(pool, skype_user); newconf->skype_password = switch_core_strdup(pool, skype_password); newconf->X11_display = switch_core_strdup(pool, X11_display); newconf->audio_in_port = 0; newconf->audio_in_port = 0; - newconf->debug = debug; - newconf->skype_window = skype_window_alloc(pool); if ( newconf->skype_window ) { status = airpe_start_client(newconf); - if ( status == SWITCH_STATUS_SUCCESS ) { switch_core_hash_insert(globals.interfaces_hash, name, newconf); } else { - // LOG OUR ERROR + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Airpe: cannot start client %s.\n", newconf->name); } } else { - // LOG OUR ERROR + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Airpe: cannot alloc client %s.\n", newconf->name); } + } else { - //TODO LOG ERROR ABOUT CREATING INTERFACE + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Airpe: cannot alloc client %s.\n", newconf->name); } } @@ -792,11 +806,44 @@ return SWITCH_STATUS_SUCCESS; } +static void reloadxml_event_handler(switch_event_t *event) +{ + airpe_interface_t *airpe; + switch_hash_index_t *hi; + void *val; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Reloading airpe configuration.\n"); + + /* First, mark all of them to be reloaded */ + for (hi = switch_hash_first(NULL, globals.interfaces_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + airpe = ( airpe_interface_t *) val; + airpe->should_reload = 1; + } + + /* Update the data of each client */ + load_config(1); + + /* Find eventual clients not updated and stop them */ + for (hi = switch_hash_first(NULL, globals.interfaces_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + airpe = ( airpe_interface_t *) val; + if ( airpe->should_reload ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Stopping airpe client %s.\n", airpe->name); + switch_core_hash_delete(globals.interfaces_hash, airpe->name); + airpe_stop_client(airpe); + } + } + +} + /***************************************************************************** MODULE INITIALIZATION FUNCTIONS *****************************************************************************/ +static switch_event_node_t *EVENT_NODE = NULL; + static switch_state_handler_table_t airpe_state_handlers = { /*.on_init */ channel_on_init, /*.on_routing */ channel_on_routing, @@ -829,7 +876,7 @@ switch_core_hash_init(&globals.interfaces_hash, pool); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, pool); - load_config(); + load_config(0); *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -839,6 +886,11 @@ airpe_endpoint_interface->io_routines = &airpe_io_routines; airpe_endpoint_interface->state_handler = &airpe_state_handlers; + if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, reloadxml_event_handler, NULL, &EVENT_NODE) != SWITCH_STATUS_SUCCESS)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind our reloadxml handler!\n"); + /* Not such severe to prevent loading */ + } + airpe_register_api( &*module_interface ); airpe_register_apps( &*module_interface ); @@ -855,6 +907,8 @@ pool = airpe_module_pool; + switch_event_unbind(&EVENT_NODE); + for (hi = switch_hash_first(NULL, globals.interfaces_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); airpe = ( airpe_interface_t *) val; Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.h ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.h (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Wed Jan 14 17:39:21 2009 @@ -154,6 +154,7 @@ CALL_STATUS call_status; CONN_STATUS conn_status; + int should_reload; char *skype_version; char *mood_text; int active_call_id;

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] r11204 - freeswitch/branches/ctrix/mod_airpe
by FreeSWITCH SVN 14 Jan '09

14 Jan '09

Author: ctrix Date: Wed Jan 14 15:05:23 2009 New Revision: 11204 Log: Reworked all the call logic. Big cleanups of unused code. Should be almost working 100%! Modified: freeswitch/branches/ctrix/mod_airpe/airpe_api.c freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c freeswitch/branches/ctrix/mod_airpe/mod_airpe.c freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Modified: freeswitch/branches/ctrix/mod_airpe/airpe_api.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_api.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_api.c Wed Jan 14 15:05:23 2009 @@ -30,6 +30,13 @@ #include "mod_airpe.h" +/* + TODO + block / authorize users + add / remove users from contact list +*/ + + #define AIRPE_MOODTEXT_SYNTAX "airpe_moodtext <clientname> <text>" SWITCH_STANDARD_API(airpe_moodtext_command) { Modified: freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c (original) +++ freeswitch/branches/ctrix/mod_airpe/airpe_if_common.c Wed Jan 14 15:05:23 2009 @@ -146,10 +146,36 @@ return SWITCH_STATUS_SUCCESS; } +void airpe_clear_call_id(airpe_interface_t *airpe) { + + airpe->active_call_id = 0; + switch_safe_free(airpe->active_session_uuid); + airpe->active_session_uuid = NULL; +} + +switch_status_t airpe_set_call_id(airpe_interface_t *airpe, int sk_id, char *fs_uuid) { + assert(airpe); + + airpe->active_call_id = sk_id; + + if ( fs_uuid ) { + switch_safe_free(airpe->active_session_uuid); + airpe->active_session_uuid = strdup(fs_uuid); + } + + return SWITCH_STATUS_SUCCESS; +} + +/* ************************************************************************* */ + switch_status_t airpe_cmd_write(airpe_interface_t *airpe, char *msg) { + switch_status_t status; + if ( airpe->debug ) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "msg to airpe client %s: %s\n", airpe->name, msg); - return airpe_skype_send_message(airpe->skype_window, msg); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "msg to airpe client %s: > %s\n", airpe->name, msg); + + status = airpe_skype_send_message(airpe->skype_window, msg); + return status; } switch_status_t airpe_originate(airpe_interface_t *airpe, char *dest) { @@ -161,7 +187,7 @@ airpe_cmd_write(p, "SET AGC OFF"); airpe_cmd_write(p, "SET AEC OFF"); */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "airpe client %s: Originating to %s\n", airpe->name, dest); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "airpe client %s: Originating to client %s\n", airpe->name, dest); snprintf(msg, sizeof(msg), "CALL %s", dest); @@ -182,17 +208,14 @@ return SWITCH_STATUS_FALSE; } - - /***************************************************************************** SKYPE AUDIO *****************************************************************************/ -switch_status_t airpe_hangup( private_object_t *pvt ) { +switch_status_t airpe_call_shutdown( private_object_t *pvt ) { airpe_interface_t *airpe; assert(pvt); - assert(pvt->session); assert(pvt->airpe); airpe = pvt->airpe; @@ -225,10 +248,14 @@ assert(pvt); assert(pvt->session); assert(pvt->airpe); - + + if ( !switch_test_flag(pvt, TFLAG_IO) ) + return SWITCH_STATUS_SUCCESS; + airpe = pvt->airpe; pool = switch_core_session_get_pool(pvt->session); + if ( !airpe->audio_in_active_socket ) { rv = switch_socket_accept(&inbound_socket, airpe->audio_in_socket, pool); if ( rv == SWITCH_STATUS_SUCCESS ) { @@ -262,6 +289,9 @@ airpe = pvt->airpe; pool = switch_core_session_get_pool(pvt->session); + if ( !switch_test_flag(pvt, TFLAG_IO) ) + return SWITCH_STATUS_SUCCESS; + if ( !airpe->audio_out_active_socket ) { rv = switch_socket_accept(&inbound_socket, airpe->audio_out_socket, pool); if ( rv == SWITCH_STATUS_SUCCESS ) { @@ -269,7 +299,7 @@ switch_sleep(100000); } else { - return SWITCH_STATUS_FALSE; + return SWITCH_STATUS_SUCCESS; } } @@ -281,9 +311,6 @@ if ( (rv==SWITCH_STATUS_SUCCESS) ) { pvt->read_frame.datalen = mlen; } -// if ( mlen == 0 ) -// return SWITCH_STATUS_SUCCESS; - return rv; } @@ -320,7 +347,7 @@ } tech_pvt->airpe = airpe; - switch_snprintf(chan_name, sizeof(chan_name), MODNAME"/%s", airpe->name); + switch_snprintf(chan_name, sizeof(chan_name), MODNAME"/%s/%s", airpe->name, airpe->destination); switch_channel_set_name(channel, chan_name); tech_pvt->caller_profile = switch_caller_profile_new( switch_core_session_get_pool(new_session), @@ -346,11 +373,12 @@ switch_set_flag(tech_pvt, TFLAG_INBOUND); - airpe->active_call_id = callid; + airpe_set_call_id(airpe, callid, switch_core_session_get_uuid(new_session) ); + switch_channel_set_state(channel, CS_INIT); if ( switch_core_session_thread_launch(new_session) != SWITCH_STATUS_SUCCESS ) { - airpe->active_call_id = 0; + airpe_clear_call_id(airpe); switch_core_session_destroy(&new_session); return SWITCH_STATUS_FALSE; } @@ -363,8 +391,23 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; + if ( airpe->active_session_uuid ) { + session = switch_core_session_locate(airpe->active_session_uuid); + if ( session ) + channel = switch_core_session_get_channel(session); + } + +/* +ADEBUG("MANAGING: %s - %d - %d - INB: %d - OUTB %d\n", + (airpe->active_session_uuid) ? airpe->active_session_uuid : "NO SESSION UUID", + (session) ? 1 : 0, + (channel) ? 1 : 0, + (airpe->tech_pvt) ? switch_test_flag(airpe->tech_pvt, TFLAG_INBOUND) : -1, + (airpe->tech_pvt) ? switch_test_flag(airpe->tech_pvt, TFLAG_OUTBOUND): -1 +); +*/ + if ( airpe->active_call_id && airpe->active_call_id != callid ) { -ADEBUG("CASE 1 - different call\n"); if ( !strncmp(status, "UNPLACED", strlen("UNPLACED")) ) { snprintf(buf, sizeof(buf), "SET CALL %d STATUS FINISHED", callid); airpe_cmd_write(airpe, buf); @@ -375,102 +418,88 @@ } else if ( airpe->active_call_id && airpe->active_call_id == callid ) { -ADEBUG("CASE 2 - my call\n"); - if ( airpe->tech_pvt ) { - assert(airpe->tech_pvt); - session = airpe->tech_pvt->session; - assert(session); - - channel = switch_core_session_get_channel(session); - assert(channel); - } - if ( !strncmp(status, "ROUTING", strlen("ROUTING")) ) { } else if ( !strncmp(status, "RINGING", strlen("RINGING")) ) { - //if ( switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ) { - //switch_channel_set_state(channel, CS_RINGING); - switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); - switch_channel_mark_ring_ready(channel); - //} - - snprintf(buf, sizeof(buf), "ALTER CALL %d SET_INPUT PORT=\"%d\"", callid, airpe->audio_in_port); - airpe_cmd_write(airpe, buf); - snprintf(buf, sizeof(buf), "ALTER CALL %d SET_OUTPUT PORT=\"%d\"", callid, airpe->audio_out_port); - airpe_cmd_write(airpe, buf); - - - - switch_channel_set_state(channel, CS_ROUTING); - - } - else if ( !strncmp(status, "INPROGRESS", strlen("INPROGRESS")) ) { - snprintf(buf, sizeof(buf), "ALTER CALL %d STOP_VIDEO_SEND", callid ); - airpe_cmd_write(airpe, buf); - snprintf(buf, sizeof(buf), "ALTER CALL %d STOP_VIDEO_RECEIVE", callid ); - airpe_cmd_write(airpe, buf); - - if ( channel ) { - switch_channel_mark_answered(channel); + if ( session && channel ) { + switch_channel_mark_ring_ready(channel); } else { if ( airpe_manage_incoming_call(airpe, callid) != SWITCH_STATUS_SUCCESS ) { snprintf(buf, sizeof(buf), "ALTER CALL %d END HANGUP", callid ); airpe_cmd_write(airpe, buf); - airpe->active_call_id = 0; + airpe_clear_call_id(airpe); } } } + else if ( !strncmp(status, "INPROGRESS", strlen("INPROGRESS")) ) { + + if ( channel && switch_test_flag(airpe->tech_pvt, TFLAG_OUTBOUND) ) { + snprintf(buf, sizeof(buf), "ALTER CALL %d SET_INPUT PORT=\"%d\"", callid, airpe->audio_in_port); + airpe_cmd_write(airpe, buf); + airpe_cmd_write(airpe, "PING"); + snprintf(buf, sizeof(buf), "ALTER CALL %d SET_OUTPUT PORT=\"%d\"", callid, airpe->audio_out_port); + airpe_cmd_write(airpe, buf); + airpe_cmd_write(airpe, "PING"); + switch_set_flag(airpe->tech_pvt, TFLAG_IO); + + snprintf(buf, sizeof(buf), "ALTER CALL %d STOP_VIDEO_SEND", callid ); + airpe_cmd_write(airpe, buf); + snprintf(buf, sizeof(buf), "ALTER CALL %d STOP_VIDEO_RECEIVE", callid ); + airpe_cmd_write(airpe, buf); + + switch_channel_answer(channel); + } + + } else if ( !strncmp(status, "FINISHED", strlen("FINISHED")) ) { if ( channel ) switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - airpe->active_call_id = 0; + airpe_clear_call_id(airpe); } else if ( !strncmp(status, "FAILED", strlen("FAILED")) ) { if ( channel ) switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - airpe->active_call_id = 0; + airpe_clear_call_id(airpe); } else if ( !strncmp(status, "CANCELLED", strlen("CANCELLED")) ) { if ( channel ) switch_channel_hangup(channel, SWITCH_CAUSE_ORIGINATOR_CANCEL); - airpe->active_call_id = 0; + airpe_clear_call_id(airpe); } else if ( !strncmp(status, "REFUSED", strlen("REFUSED")) ) { if ( channel ) switch_channel_hangup(channel, SWITCH_CAUSE_CALL_REJECTED); - airpe->active_call_id = 0; + airpe_clear_call_id(airpe); } else if ( !strncmp(status, "MISSED", strlen("MISSED")) ) { if ( channel ) switch_channel_hangup(channel, SWITCH_CAUSE_NO_ANSWER); - airpe->active_call_id = 0; + airpe_clear_call_id(airpe); } else if ( !strncmp(status, "UNPLACED", strlen("UNPLACED")) ) { } else { -ADEBUG("Unmanaged status \n"); + ADEBUG("Unmanaged status \n"); } } else { -ADEBUG("CASE 3 - no calls online\n"); - if ( !strncmp(status, "UNPLACED", strlen("UNPLACED")) ) { - airpe->active_call_id = callid; - } - else if ( !strncmp(status, "RINGING", strlen("RINGING")) ) { - airpe->active_call_id = callid; - snprintf(buf, sizeof(buf), "ALTER CALL %d ANSWER", callid ); - airpe_cmd_write(airpe, buf); + if ( !strncmp(status, "UNPLACED", strlen("UNPLACED")) ) { + airpe_set_call_id(airpe, callid, NULL); } else { ADEBUG("--- (%d/%d) Unmanaged status %s\n", airpe->active_call_id, callid, status); } } + if ( session ) + switch_core_session_rwunlock(session); + return SWITCH_STATUS_SUCCESS; } switch_status_t airpe_manage_skype_msg( airpe_interface_t *airpe, const char *msg ) { + switch_core_session_t *session = NULL; char *buf = NULL; int argc = 0; char *argv[9] = { 0 }; @@ -479,13 +508,16 @@ assert(msg); if ( airpe->debug ) - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "airpe client %s: %s\n", airpe->name, msg); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "airpe client %s: < %s\n", airpe->name, msg); + + if ( airpe->active_session_uuid ) + session = switch_core_session_locate(airpe->active_session_uuid); buf = strdup(msg); argc = switch_separate_string(buf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - if ( argc == 0 ) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "airpe client %s: %s - Message without arguments? uh?\n", airpe->name, msg); + if ( argc == 0 ) { + /* Empty message. Shit happens (TM) */ free(buf); return SWITCH_STATUS_FALSE; } @@ -516,8 +548,14 @@ /* The connection status of the client (ex: ONLINE) */ airpe->conn_status = skype_conn_status( argv[1] ); } - else if ( !strncmp( buf, "USER", strlen("USER")) ) { - /* Updates about the users of our list - ignored */ + else if ( !strncmp( buf, "USER", strlen("USER")) && argc >= 2 ) { + /* Updates about the users of our list or new auth requests */ + if ( !strncmp(argv[2], "RECEIVEDAUTHREQUEST", strlen("RECEIVEDAUTHREQUEST") ) ) { + /* TODO add option to ignore such requests */ + char buf[SKYPE_MSG_LEN] = ""; + snprintf(buf, sizeof(buf), "SET USER %s ISAUTHORIZED TRUE", argv[1]); + airpe_cmd_write(airpe, buf); + } } else if ( !strncmp( buf, "GROUP", strlen("GROUP")) ) { /* Updates about the groups of our list - ignored */ @@ -531,7 +569,6 @@ else if ( !strncmp( buf, "AUTOAWAY", strlen("AUTOAWAY")) ) { /* Autoaway - ignored */ } -//TODO: RECEIVEDAUTHREQUEST - Add a config option to authorize or forget about it. else if ( !strncmp( buf, "MUTE", strlen("MUTE")) && argc >= 2 ) { if ( !strncmp(argv[1], "ON", 2) ) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "airpe client %s: I don't like to be muted...\n", airpe->name); @@ -598,11 +635,10 @@ snprintf(buf, sizeof(buf), "GET CALL %d PARTNER_DISPNAME", callid); airpe_cmd_write(airpe, buf); - snprintf(buf, sizeof(buf), "GET CALL %d PARTNER_HANDLE", callid); airpe_cmd_write(airpe, buf); - airpe_cmd_write(airpe, "PING"); + airpe_set_call_id(airpe, callid, NULL); } else { snprintf(buf, sizeof(buf), "ALTER CALL %d END HANGUP", callid ); @@ -614,30 +650,28 @@ } else if ( !strncmp(cmd, "DTMF", strlen("DTMF")) ) { /* This is an incoming DTMF */ - switch_core_session_t *session; - switch_channel_t *channel; - switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0) }; - const char *signal_ptr; - int tmp; - - assert(airpe->tech_pvt); - session = airpe->tech_pvt->session; - assert(session); - channel = switch_core_session_get_channel(session); - assert(channel); - - signal_ptr = argv[3]; + if ( session ) { + switch_channel_t *channel; + switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0) }; + const char *signal_ptr; + int tmp; + + channel = switch_core_session_get_channel(session); + assert(channel); + + signal_ptr = argv[3]; + + if (*signal_ptr && (*signal_ptr == '*' || *signal_ptr == '#' || *signal_ptr == 'A' || *signal_ptr == 'B' || *signal_ptr == 'C' || *signal_ptr == 'D')) { + dtmf.digit = *signal_ptr; + } else { + tmp = atoi(signal_ptr); + dtmf.digit = switch_rfc2833_to_char(tmp); + } - if (*signal_ptr && (*signal_ptr == '*' || *signal_ptr == '#' || *signal_ptr == 'A' || *signal_ptr == 'B' || *signal_ptr == 'C' || *signal_ptr == 'D')) { - dtmf.digit = *signal_ptr; - } else { - tmp = atoi(signal_ptr); - dtmf.digit = switch_rfc2833_to_char(tmp); + switch_mutex_lock(airpe->tech_pvt->flag_mutex); + switch_channel_queue_dtmf(channel, &dtmf); + switch_mutex_unlock(airpe->tech_pvt->flag_mutex); } - - switch_mutex_lock(airpe->tech_pvt->flag_mutex); - switch_channel_queue_dtmf(channel, &dtmf); - switch_mutex_unlock(airpe->tech_pvt->flag_mutex); } else if ( !strncmp(cmd, "FAILUREREASON", strlen("FAILUREREASON")) && argc >=2 ) { airpe->last_fail_reason = atoi(argv[1]); @@ -706,6 +740,9 @@ switch_safe_free(buf); + if ( session ) + switch_core_session_rwunlock(session); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.c ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.c (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.c Wed Jan 14 15:05:23 2009 @@ -196,7 +196,6 @@ airpe_audio_sockets_create(airpe); switch_threadattr_create(&attr_skype, airpe_module_pool); - //switch_threadattr_detach_set(attr_skype, 1); switch_threadattr_stacksize_set(attr_skype, SWITCH_THREAD_STACKSIZE); switch_thread_create(&airpe->airpe_thread_skype, @@ -230,6 +229,7 @@ airpe_set_mood_text(airpe, NULL); airpe_set_partner_displayname(airpe, NULL); airpe_set_partner_handle(airpe, NULL); + airpe_set_call_id(airpe, 0, NULL); return SWITCH_STATUS_SUCCESS; } @@ -263,21 +263,12 @@ // TODO if fail switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } - if ( switch_test_flag(tech_pvt, TFLAG_INBOUND) ) { - char buf[SKYPE_MSG_LEN]; - snprintf(buf, sizeof(buf), "ALTER CALL %d SET_INPUT PORT=\"%d\"", tech_pvt->airpe->active_call_id, tech_pvt->airpe->audio_in_port); - airpe_cmd_write(tech_pvt->airpe, buf); - snprintf(buf, sizeof(buf), "ALTER CALL %d SET_OUTPUT PORT=\"%d\"", tech_pvt->airpe->active_call_id, tech_pvt->airpe->audio_out_port); - airpe_cmd_write(tech_pvt->airpe, buf); - - switch_channel_set_state(channel, CS_ROUTING); - } + switch_channel_set_state(channel, CS_ROUTING); return SWITCH_STATUS_SUCCESS; } static switch_status_t channel_on_routing(switch_core_session_t * session) { - char buf[SKYPE_MSG_LEN]; switch_channel_t *channel = NULL; private_object_t *tech_pvt = NULL; @@ -287,11 +278,6 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt); - if ( switch_test_flag(tech_pvt, TFLAG_INBOUND) ) { - snprintf(buf, sizeof(buf), "ALTER CALL %d ANSWER", tech_pvt->airpe->active_call_id); - airpe_cmd_write(tech_pvt->airpe, buf); - } - return SWITCH_STATUS_SUCCESS; } @@ -313,7 +299,6 @@ switch_channel_t *channel = NULL; private_object_t *tech_pvt = NULL; airpe_interface_t *airpe = NULL; - char msg[SKYPE_MSG_LEN]; channel = switch_core_session_get_channel(session); assert(channel); @@ -325,13 +310,11 @@ assert(airpe); if ( airpe->active_call_id ) { - snprintf(msg, sizeof(msg), "ALTER CALL %d HANGUP", airpe->active_call_id); - airpe_cmd_write(airpe, msg); -// airpe->active_call_id = 0; -// airpe->tech_pvt = NULL; + char buf[SKYPE_MSG_LEN]; + snprintf(buf, sizeof(buf), "ALTER CALL %d HANGUP", airpe->active_call_id); + airpe_cmd_write(airpe, buf); } - - airpe_hangup( tech_pvt ); + airpe_call_shutdown( tech_pvt ); if (tech_pvt->read_codec.implementation) { switch_core_codec_destroy(&tech_pvt->read_codec); @@ -351,6 +334,7 @@ /***************************************************************************** CHANNEL IO INTERFACE / ROUTINES *****************************************************************************/ + static switch_call_cause_t channel_outgoing_channel( switch_core_session_t *session, switch_event_t *var_event, @@ -422,9 +406,9 @@ 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); + airpe_set_call_id(tech_pvt->airpe, 0, switch_core_session_get_uuid(*new_session) ); + switch_channel_set_flag(channel, CF_OUTBOUND); + switch_set_flag(tech_pvt, TFLAG_OUTBOUND); switch_channel_set_state(channel, CS_INIT); return SWITCH_CAUSE_SUCCESS; } @@ -453,7 +437,10 @@ *frame = NULL; if ( airpe_audio_read(tech_pvt) != SWITCH_STATUS_SUCCESS) { - ADEBUG("airpe_audio_read ERROR\n"); +/* + if ( tech_pvt->airpe->debug ) + ADEBUG("airpe_audio_read ERROR\n"); +*/ return SWITCH_STATUS_FALSE; } @@ -492,12 +479,19 @@ assert(tech_pvt); if ( !tech_pvt->airpe ) { + ADEBUG("airpe_audio_write ERROR: no client\n"); return SWITCH_STATUS_FALSE; } airpe = tech_pvt->airpe; rv = airpe_audio_write(tech_pvt, frame); + + if ( rv != SWITCH_STATUS_SUCCESS ) { + ADEBUG("airpe_audio_write ERROR\n"); + return SWITCH_STATUS_FALSE; + } + return rv; } @@ -546,6 +540,7 @@ { switch_channel_t *channel; private_object_t *tech_pvt; + airpe_interface_t *airpe; channel = switch_core_session_get_channel(session); assert(channel); @@ -553,30 +548,57 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt); + airpe = tech_pvt->airpe; + assert(airpe); + switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_ANSWER: - ADEBUG("received message indicate answer...\n"); /* - //switch_answer_channel(session); - char buf[SKYPE_MSG_LEN]; - snprintf(buf, sizeof(buf), "ALTER CALL %d ANSWER", tech_pvt->airpe->active_call_id ); - airpe_cmd_write(tech_pvt->airpe, buf); + if ( airpe->debug ) + ADEBUG("received message indicate answer...\n"); */ + if ( switch_test_flag(tech_pvt, TFLAG_INBOUND) ) { + char buf[SKYPE_MSG_LEN]; + snprintf(buf, sizeof(buf), "ALTER CALL %d ANSWER\n", tech_pvt->airpe->active_call_id ); + airpe_cmd_write(tech_pvt->airpe, buf); + snprintf(buf, sizeof(buf), "ALTER CALL %d SET_INPUT PORT=\"%d\"", tech_pvt->airpe->active_call_id, tech_pvt->airpe->audio_in_port); + airpe_cmd_write(tech_pvt->airpe, buf); + snprintf(buf, sizeof(buf), "ALTER CALL %d SET_OUTPUT PORT=\"%d\"", tech_pvt->airpe->active_call_id, tech_pvt->airpe->audio_out_port); + airpe_cmd_write(tech_pvt->airpe, buf); + switch_set_flag(tech_pvt, TFLAG_IO); + } + break; +/* + case SWITCH_MESSAGE_INDICATE_PROGRESS: + if ( airpe->debug ) + ADEBUG("received message indicate progress...\n"); + break; + case SWITCH_MESSAGE_INDICATE_BRIDGE: + if ( airpe->debug ) + ADEBUG("received message indicate bridge...\n"); break; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: - ADEBUG("received message indicate unbridge...\n"); + if ( airpe->debug ) + ADEBUG("received message indicate unbridge...\n"); break; case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY: - ADEBUG("received message indicate transcode necessary...\n"); + if ( airpe->debug ) + ADEBUG("received message indicate transcode necessary...\n"); break; case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC: - ADEBUG("received message indicate audio sync...\n"); + if ( airpe->debug ) + ADEBUG("received message indicate audio sync...\n"); break; case SWITCH_MESSAGE_INDICATE_TRANSFER: - ADEBUG("received message indicate transfer...\n"); + if ( airpe->debug ) + ADEBUG("received message indicate transfer...\n"); break; +*/ default: - ADEBUG("Unmanaged received message... %d\n", msg->message_id); +/* + if ( airpe->debug ) + ADEBUG("Unmanaged received message... %d\n", msg->message_id); +*/ break; } @@ -596,7 +618,6 @@ assert(tech_pvt); body = switch_event_get_body(event); - if (!body) { body = ""; } Modified: freeswitch/branches/ctrix/mod_airpe/mod_airpe.h ============================================================================== --- freeswitch/branches/ctrix/mod_airpe/mod_airpe.h (original) +++ freeswitch/branches/ctrix/mod_airpe/mod_airpe.h Wed Jan 14 15:05:23 2009 @@ -112,15 +112,15 @@ typedef enum { TFLAG_INBOUND = (1 << 1), TFLAG_OUTBOUND = (1 << 2), + TFLAG_IO = (1 << 3), /* - TFLAG_IO = (1 << 0), - TFLAG_DTMF = (1 << 3), TFLAG_VOICE = (1 << 4), - TFLAG_HANGUP = (1 << 5), - TFLAG_LINEAR = (1 << 6), - TFLAG_CODEC = (1 << 7), - TFLAG_BREAK = (1 << 8), - TFLAG_ANSWER = (1 << 9) + TFLAG_DTMF = (1 << 5), + TFLAG_HANGUP = (1 << 6), + TFLAG_LINEAR = (1 << 7), + TFLAG_CODEC = (1 << 8), + TFLAG_BREAK = (1 << 9), + TFLAG_ANSWER = (1 <<10) */ } TFLAGS; @@ -157,6 +157,7 @@ char *skype_version; char *mood_text; int active_call_id; + char *active_session_uuid; int last_fail_reason; int running; private_object_t *tech_pvt; @@ -202,8 +203,9 @@ switch_status_t airpe_set_mood_text(airpe_interface_t *airpe, char *string); switch_status_t airpe_set_partner_displayname(airpe_interface_t *airpe, char *string); switch_status_t airpe_set_partner_handle(airpe_interface_t *airpe, char *string); +switch_status_t airpe_set_call_id(airpe_interface_t *airpe, int sk_id, char *fs_uuid); -switch_status_t airpe_hangup( private_object_t *pvt ); +switch_status_t airpe_call_shutdown( private_object_t *pvt ); switch_status_t airpe_audio_read( private_object_t *pvt ); switch_status_t airpe_audio_write( private_object_t *pvt, switch_frame_t *frame );

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