- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10476 - in freeswitch/trunk/scripts/contrib/intralanman/C: . mod_lcr
by FreeSWITCH SVN 20 Nov '08

20 Nov '08

Author: intralanman Date: Thu Nov 20 09:17:01 2008 New Revision: 10476 Log: initial checkin of my mod_lcr... will stay here until it gets the seal of approval for being stable from the core devs and the community (patches still gladly accepted;-)) Added: freeswitch/trunk/scripts/contrib/intralanman/C/ freeswitch/trunk/scripts/contrib/intralanman/C/mod_lcr/ freeswitch/trunk/scripts/contrib/intralanman/C/mod_lcr/Makefile freeswitch/trunk/scripts/contrib/intralanman/C/mod_lcr/mod_lcr.c Added: freeswitch/trunk/scripts/contrib/intralanman/C/mod_lcr/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/intralanman/C/mod_lcr/Makefile Thu Nov 20 09:17:01 2008 @@ -0,0 +1,3 @@ +BASE=../../../.. +LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;` +include $(BASE)/build/modmake.rules Added: freeswitch/trunk/scripts/contrib/intralanman/C/mod_lcr/mod_lcr.c ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/intralanman/C/mod_lcr/mod_lcr.c Thu Nov 20 09:17:01 2008 @@ -0,0 +1,539 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Raymond Chandler <intralanman(a)gmail.com> + * + * mod_lcr.c -- Least Cost Routing Module + * + */ + +#include <switch.h> +#include <switch_odbc.h> + + +#define LCR_SYNTAX "lcr <digits>" + +/* SQL Query places */ +#define LCR_DIGITS_PLACE 0 +#define LCR_CARRIER_PLACE 1 +#define LCR_RATE_PLACE 2 +#define LCR_GATEWAY_PLACE 3 +#define LCR_IP_ADDRESS_PLACE 4 +#define LCR_PORT_PLACE 5 +#define LCR_LSTRIP_PLACE 6 +#define LCR_TSTRIP_PLACE 7 +#define LCR_PREFIX_PLACE 8 +#define LCR_SUFFIX_PLACE 9 + + +#define LCR_DIALSTRING_PLACE 3 +#define LCR_HEADERS_COUNT 4 +char headers[LCR_HEADERS_COUNT][32] = { + "Digit Match", + "Carrier", + "Rate", + "Dialstring", +}; + +struct odbc_obj { + switch_odbc_handle_t *handle; + SQLHSTMT stmt; + SQLCHAR *colbuf; + int32_t cblen; + SQLCHAR *code; + int32_t codelen; +}; + +struct lcr_obj { + char *carrier_name; + char *gateway_name; + char *term_host; + char *port; + char *digit_str; + char *prefix; + char *suffix; + char *dialstring; + float rate; + size_t lstrip; + size_t tstrip; + size_t digit_len; + struct lcr_obj *next; +}; + +struct max_obj { + size_t carrier_name; + size_t gateway_name; + size_t digit_str; + size_t rate; + size_t dialstring; +}; + +typedef struct odbc_obj odbc_obj_t; +typedef odbc_obj_t *odbc_handle; + +typedef struct lcr_obj lcr_obj_t; +typedef lcr_obj_t *lcr_route; + +typedef struct max_obj max_obj_t; +typedef max_obj_t *max_len; + +struct callback_obj { + lcr_route head; + int matches; + char *lookup_number; +}; +typedef struct callback_obj callback_t; + +static struct { + switch_memory_pool_t *pool; + char *dbname; + char *odbc_dsn; + switch_mutex_t *mutex; + switch_odbc_handle_t *master_odbc; + void *filler1; +} globals; + + +SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown); +SWITCH_MODULE_DEFINITION(mod_lcr, mod_lcr_load, mod_lcr_shutdown, NULL); + +static char *get_bridge_data(const char *dialed_number, lcr_route cur_route) { + size_t lstrip; + size_t tstrip; + char *data = NULL; + char *destination_number = NULL; + + destination_number = strdup(dialed_number); + + tstrip = ((cur_route->digit_len - cur_route->tstrip) + 1); + lstrip = cur_route->lstrip; + + if (strlen(destination_number) > tstrip && cur_route->tstrip > 0) { + destination_number[tstrip] = '\0'; + } + if (strlen(destination_number) > lstrip && cur_route->lstrip > 0) { + destination_number += lstrip; + } + + if (strlen(cur_route->gateway_name) > 0) { + data = switch_mprintf("sofia/gateway/%s/%s%s%s", cur_route->gateway_name + , cur_route->prefix, destination_number, cur_route->suffix + ); + } else { + char port[8]; + switch_snprintf(port, sizeof(port), ":%s", cur_route->port); + data = switch_mprintf("sofia/${use_profile}/%s@%s%s" + , destination_number, cur_route->term_host, (strlen(cur_route->port) > 0 ? port : "") + ); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Returning Dialstring %s\n", data); + switch_safe_free(destination_number); + return data; +} + +void init_max_lens(max_len maxes) { + maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); + maxes->carrier_name = (headers[LCR_CARRIER_PLACE] == NULL ? 0 : strlen(headers[LCR_CARRIER_PLACE])); + maxes->gateway_name = (headers[LCR_GATEWAY_PLACE] == NULL ? 0 : strlen(headers[LCR_GATEWAY_PLACE])); + maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); + maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); + maxes->rate = 8; +} + +switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number) { + lcr_route current = NULL; + init_max_lens(maxes); + if (routes == NULL ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "no routes\n"); + return SWITCH_STATUS_FALSE; + } + if (maxes == NULL ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "no maxes\n"); + return SWITCH_STATUS_FALSE; + } + + if (routes != NULL && maxes != NULL) { + for (current = routes; current; current = current->next) { + size_t this_len; + if (current->gateway_name != NULL) { + this_len = strlen(current->gateway_name); + if (this_len > maxes->gateway_name) { + maxes->gateway_name = this_len; + } + } + if (current->carrier_name != NULL) { + this_len = strlen(current->carrier_name); + if (this_len > maxes->carrier_name) { + maxes->carrier_name = this_len; + } + } + if (current->dialstring != NULL) { + this_len = strlen(current->dialstring); + if (this_len > maxes->dialstring) { + maxes->dialstring = this_len; + } + } + if (current->digit_str != NULL) { + if (current->digit_len > maxes->digit_str) { + maxes->digit_str = current->digit_len; + } + } + } + } + return SWITCH_STATUS_SUCCESS; +} + +static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) { + if (globals.odbc_dsn) { + switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata); + return SWITCH_TRUE; + } else { + return SWITCH_FALSE; + } +} + +int route_add_callback(void *pArg, int argc, char **argv, char **columnNames) { + lcr_route additional = NULL; + lcr_route current = NULL; + callback_t *cbt = (callback_t *) pArg; + + cbt->matches++; + + switch_zmalloc(additional, sizeof(lcr_obj_t)); + + additional->digit_len = strlen(argv[LCR_DIGITS_PLACE]); + additional->digit_str = switch_safe_strdup(argv[LCR_DIGITS_PLACE]); + additional->suffix = switch_safe_strdup(argv[LCR_SUFFIX_PLACE]); + additional->prefix = switch_safe_strdup(argv[LCR_PREFIX_PLACE]); + additional->carrier_name = switch_safe_strdup(argv[LCR_CARRIER_PLACE]); + additional->rate = (float)atof(argv[LCR_RATE_PLACE]); + additional->gateway_name = switch_safe_strdup(argv[LCR_GATEWAY_PLACE]); + additional->term_host = switch_safe_strdup(argv[LCR_IP_ADDRESS_PLACE]); + additional->port = switch_safe_strdup(argv[LCR_PORT_PLACE]); + additional->lstrip = atoi(argv[LCR_LSTRIP_PLACE]); + additional->tstrip = atoi(argv[LCR_TSTRIP_PLACE]); + additional->dialstring = get_bridge_data(cbt->lookup_number, additional); + + if (cbt->head != NULL) { + for (current = cbt->head; current; current = current->next) { + + if (switch_strlen_zero(additional->gateway_name) && switch_strlen_zero(additional->term_host) && switch_strlen_zero(additional->port) ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING + , "WTF?!? There's no way to dial this Gateway: %s IP:Port %s:%s\n" + , additional->gateway_name, additional->term_host, additional->port + ); + break; + } + + if (!strcmp(current->gateway_name, additional->gateway_name)) { + if (!strcmp(current->term_host, additional->term_host) && !strcmp(current->port, additional->port)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG + , "Ignoring Duplicate route for termination point (%s:%s)\n" + , additional->term_host, additional->port + ); + switch_safe_free(additional); + break; + } + } + + if (current->next == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "adding route to end of list\n"); + current->next = additional; + break; + } + + } + } else { + additional->next = cbt->head; + cbt->head = additional; + } + + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t lcr_do_lookup(char *digits, callback_t *cb_struct) { + /* instantiate the object/struct we defined earlier */ + switch_stream_handle_t sql_stream = { 0 }; + size_t n, digit_len = strlen(digits); + char *digits_copy; + + if (switch_strlen_zero(digits)) { + return SWITCH_FALSE; + } + + digits_copy = strdup(digits); + + SWITCH_STANDARD_STREAM(sql_stream); + + /* set up the query to be executed */ + sql_stream.write_function(&sql_stream, + "SELECT l.digits, c.Carrier_Name, l.rate, cg.gateway, cg.term_host, cg.port, l.lead_strip, l.trail_strip, l.prefix, l.suffix " + ); + sql_stream.write_function(&sql_stream, "FROM lcr l JOIN carriers c ON l.carrier_id=c.id JOIN carrier_gateway cg ON c.id=cg.carrier_id "); + for (n = digit_len; n > 0; n--) { + digits_copy[n] = '\0'; + sql_stream.write_function(&sql_stream, "%s digits='%s' ", (n==digit_len ? "WHERE" : "OR"), digits_copy); + } + sql_stream.write_function(&sql_stream, "ORDER BY digits DESC, rate;"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s\n", (char *)sql_stream.data); + lcr_execute_sql_callback((char *)sql_stream.data, route_add_callback, cb_struct); + switch_safe_free(sql_stream.data); + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t lcr_load_config() { + char *cf = "lcr.conf"; + switch_xml_t cfg, xml, settings, param; + switch_status_t status = SWITCH_STATUS_SUCCESS; + char *odbc_user = NULL; + char *odbc_pass = NULL; + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = NULL; + char *val = NULL; + var = (char *) switch_xml_attr_soft(param, "name"); + val = (char *) switch_xml_attr_soft(param, "value"); + if (!strcasecmp(var, "odbc-dsn") && !switch_strlen_zero(val)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "odbc_dsn is %s\n", val); + globals.odbc_dsn = switch_core_strdup(globals.pool, val); + if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { + *odbc_user++ = '\0'; + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; + } + } + } + } + } + if (globals.odbc_dsn) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO + , "dsn is \"%s\", user is \"%s\", and password is \"%s\"\n" + , globals.odbc_dsn, odbc_user, odbc_pass + ); + if (!(globals.master_odbc = switch_odbc_handle_new(globals.odbc_dsn, odbc_user, odbc_pass))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + status = SWITCH_STATUS_FALSE; + goto done; + } + if (switch_odbc_handle_connect(globals.master_odbc) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + status = SWITCH_STATUS_FALSE; + goto done; + } + } + done: + switch_xml_free(xml); + return status; +} + +static void destroy_list(lcr_route *head) { + lcr_route cur = NULL, top = *head; + while (top) { + cur = top; + top = top->next; + switch_safe_free(cur->digit_str); + switch_safe_free(cur->suffix); + switch_safe_free(cur->prefix); + switch_safe_free(cur->carrier_name); + switch_safe_free(cur->gateway_name); + switch_safe_free(cur); + } + *head = NULL; +} + +SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt) { + switch_caller_extension_t *extension = NULL; + switch_channel_t *channel = switch_core_session_get_channel(session); + callback_t routes = { 0 }; + lcr_route cur_route = { 0 }; + char *bridge_data = NULL;; + + if (!caller_profile) { + caller_profile = switch_channel_get_caller_profile(channel); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s\n", caller_profile->destination_number); + routes.lookup_number = caller_profile->destination_number; + if (lcr_do_lookup(caller_profile->destination_number, &routes) == SWITCH_STATUS_SUCCESS) { + if ((extension = switch_caller_extension_new(session, caller_profile->destination_number, caller_profile->destination_number)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + destroy_list(&routes.head); + return NULL; + } + + switch_channel_set_variable(channel, SWITCH_CONTINUE_ON_FAILURE_VARIABLE, "true"); + switch_channel_set_variable(channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE, "true"); + for (cur_route = routes.head; cur_route; cur_route = cur_route->next) { + //bridge_data = get_bridge_data(caller_profile->destination_number, cur_route); + switch_caller_extension_add_application(session, extension, "bridge", cur_route->dialstring); + switch_safe_free(bridge_data); + } + destroy_list(&routes.head); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "LCR lookup failed for %s\n", caller_profile->destination_number); + } + switch_safe_free(bridge_data); + + return extension; +} + +void str_repeat(size_t how_many, char *what, switch_stream_handle_t *str_stream) { + size_t i; + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "repeating %d of '%s'\n", how_many, what); + if (how_many > 0) { + for (i=0; i<how_many; i++) { + str_stream->write_function(str_stream, "%s", what); + } + } +} + +SWITCH_STANDARD_API(dialplan_lcr_function) { + char *argv[4] = { 0 }; + int argc; + char *mydata = NULL; + char *dialstring = NULL; + char *destination_number = NULL; + lcr_route current = NULL; + max_obj_t maximum_lengths = { 0 }; + callback_t cb_struct = { 0 }; + //switch_malloc(maximum_lengths, sizeof(max_obj_t)); + + if (switch_strlen_zero(cmd)) { + goto usage; + } + mydata = switch_safe_strdup(cmd); + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + destination_number = strdup(argv[0]); + cb_struct.lookup_number = destination_number; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO + , "data passed to lcr is [%s]\n", cmd + ); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO + , "lcr lookup returned [%d]\n" + , lcr_do_lookup(destination_number, &cb_struct) + ); + if (cb_struct.head != NULL) { + process_max_lengths(&maximum_lengths, cb_struct.head, destination_number); + + stream->write_function(stream, " | %s", headers[LCR_DIGITS_PLACE]); + str_repeat((maximum_lengths.digit_str - strlen(headers[LCR_DIGITS_PLACE])), " ", stream); + + stream->write_function(stream, " | %s", headers[LCR_CARRIER_PLACE]); + str_repeat((maximum_lengths.carrier_name - strlen(headers[LCR_CARRIER_PLACE])), " ", stream); + + stream->write_function(stream, " | %s", headers[LCR_RATE_PLACE]); + str_repeat((maximum_lengths.rate - strlen(headers[LCR_RATE_PLACE])), " ", stream); + + stream->write_function(stream, " | %s", headers[LCR_DIALSTRING_PLACE]); + str_repeat((maximum_lengths.dialstring - strlen(headers[LCR_DIALSTRING_PLACE])), " ", stream); + + stream->write_function(stream, " |\n"); + + + current = cb_struct.head; + while (current) { + char srate[10]; + dialstring = get_bridge_data(destination_number, current); + switch_snprintf(srate, sizeof(srate), "%0.5f", current->rate); + + + stream->write_function(stream, " | %s", current->digit_str); + str_repeat((maximum_lengths.digit_str - current->digit_len), " ", stream); + + stream->write_function(stream, " | %s", current->carrier_name ); + str_repeat((maximum_lengths.carrier_name - strlen(current->carrier_name)), " ", stream); + + stream->write_function(stream, " | %s", srate ); + str_repeat((maximum_lengths.rate - strlen(srate)), " ", stream); + + stream->write_function(stream, " | %s", dialstring); + str_repeat((maximum_lengths.dialstring - strlen(dialstring)), " ", stream); + + stream->write_function(stream, " |\n"); + + switch_safe_free(dialstring); + current = current->next; + + } + + destroy_list(&cb_struct.head); + switch_safe_free(dialstring); + } else { + stream->write_function(stream, "No Routes To Display\n"); + } + } + + switch_safe_free(mydata); + return SWITCH_STATUS_SUCCESS; + usage: + stream->write_function(stream, "USAGE: %s\n", LCR_SYNTAX); + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) { + switch_api_interface_t *dialplan_lcr_api_interface; + switch_dialplan_interface_t *dp_interface; + + *module_interface = switch_loadable_module_create_module_interface(pool, modname); +#ifndef SWITCH_HAVE_ODBC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You must have ODBC support in FreeSWITCH to use this module\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "\t./configure --enable-core-odbc-support\n"); + return SWITCH_STATUS_FALSE; +#endif + globals.pool = pool; + if (lcr_load_config() != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load lcr config file\n"); + return SWITCH_STATUS_FALSE; + } + if (switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to initialize mutex\n"); + } + SWITCH_ADD_API(dialplan_lcr_api_interface, "lcr", "Least Cost Routing Module", dialplan_lcr_function, LCR_SYNTAX); + SWITCH_ADD_DIALPLAN(dp_interface, "lcr", lcr_dialplan_hunt); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) { + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r10475 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 20 Nov '08

20 Nov '08

Author: gmaruzz Date: Thu Nov 20 07:33:09 2008 New Revision: 10475 Log: skypiax: moved the launch of the audio server thread to the start of the call. The audio srv thread need to be made to die when the call ends Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Nov 20 07:33:09 2008 @@ -583,17 +583,6 @@ /* let's start the serial monitoring thread too, so we can have serial signaling */ -if(1) -{ - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; - - switch_threadattr_create(&thd_attr, module_pool); - switch_threadattr_detach_set(thd_attr, 1); - switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, skypiax_do_tcp_srv_thread, p, module_pool); -} - /* if (ast_pthread_create(&p->tcp_srv_thread, NULL, skypiax_do_tcp_srv_thread, p) < 0) { ERRORA("Unable to start tcp_srv_thread thread.\n", SKYPIAX_P_LOG); @@ -1836,44 +1825,67 @@ id); //FIXME if (p->owner) - if (1) { - char msg_to_skype[1024]; - if (!p->tcp_cli_thread) { -if(1) -{ - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; - switch_threadattr_create(&thd_attr, module_pool); - switch_threadattr_detach_set(thd_attr, 1); - switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, skypiax_do_tcp_cli_thread, p, module_pool); - DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); -} + if (1) { + char msg_to_skype[1024]; + + + + if (!p->tcp_srv_thread) { + if(1) + { + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + switch_threadattr_create(&thd_attr, module_pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, skypiax_do_tcp_srv_thread, p, module_pool); + DEBUGA_SKYPE("started tcp_srv_thread thread.\n", SKYPIAX_P_LOG); + } + } + + + + + + + if (!p->tcp_cli_thread) { + if(1) + { + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + switch_threadattr_create(&thd_attr, module_pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, skypiax_do_tcp_cli_thread, p, module_pool); + DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); + } #ifdef NOTDEF - if (ast_pthread_create - (&p->tcp_cli_thread, NULL, skypiax_do_tcp_cli_thread, p) < 0) { - ERRORA("Unable to start tcp_cli_thread thread.\n", SKYPIAX_P_LOG); - if (option_debug > 100) { - DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); - } - return -1; - } else { - DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); - } + if (ast_pthread_create + (&p->tcp_cli_thread, NULL, skypiax_do_tcp_cli_thread, p) < 0) { + ERRORA("Unable to start tcp_cli_thread thread.\n", SKYPIAX_P_LOG); + if (option_debug > 100) { + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + } + return -1; + } else { + DEBUGA_SKYPE("started tcp_cli_thread thread.\n", SKYPIAX_P_LOG); + } #endif //NOTDEF - } + } - usleep(100000); - sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"5556\"", id); - skypiax_skype_write(p, msg_to_skype); - usleep(100000); - sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"5558\"", id); - skypiax_skype_write(p, msg_to_skype); - usleep(100000); - } + usleep(100000); + sprintf(msg_to_skype, "ALTER CALL %s SET_OUTPUT PORT=\"5556\"", id); + skypiax_skype_write(p, msg_to_skype); + usleep(100000); + sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"5558\"", id); + skypiax_skype_write(p, msg_to_skype); + usleep(100000); + } p->skype_callflow = SKYPIAX_STATE_UP;

1 0

[commit] r10474 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 20 Nov '08

20 Nov '08

Author: gmaruzz Date: Thu Nov 20 07:17:01 2008 New Revision: 10474 Log: skypiax: cosmetics Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Nov 20 07:17:01 2008 @@ -57,27 +57,27 @@ /*********************************/ -#define AST_CAUSE_NORMAL 1 +#define SKYPIAX_CAUSE_NORMAL 1 /*********************************/ -#define AST_FRAME_DTMF 1 +#define SKYPIAX_FRAME_DTMF 1 /*********************************/ -#define AST_CONTROL_RINGING 1 -#define AST_CONTROL_ANSWER 2 +#define SKYPIAX_CONTROL_RINGING 1 +#define SKYPIAX_CONTROL_ANSWER 2 /*********************************/ -#define AST_STATE_DOWN 1 -#define AST_STATE_RING 2 -#define AST_STATE_DIALING 3 -#define AST_STATE_BUSY 4 -#define AST_STATE_UP 5 -#define AST_STATE_RINGING 6 -#define AST_STATE_PRERING 7 +#define SKYPIAX_STATE_DOWN 1 +#define SKYPIAX_STATE_RING 2 +#define SKYPIAX_STATE_DIALING 3 +#define SKYPIAX_STATE_BUSY 4 +#define SKYPIAX_STATE_UP 5 +#define SKYPIAX_STATE_RINGING 6 +#define SKYPIAX_STATE_PRERING 7 /*********************************/ /* call flow from the device */ -#define CALLFLOW_CALL_IDLE AST_STATE_DOWN -#define CALLFLOW_INCOMING_RING AST_STATE_RING -#define CALLFLOW_CALL_DIALING AST_STATE_DIALING -#define CALLFLOW_CALL_LINEBUSY AST_STATE_BUSY +#define CALLFLOW_CALL_IDLE SKYPIAX_STATE_DOWN +#define CALLFLOW_INCOMING_RING SKYPIAX_STATE_RING +#define CALLFLOW_CALL_DIALING SKYPIAX_STATE_DIALING +#define CALLFLOW_CALL_LINEBUSY SKYPIAX_STATE_BUSY #define CALLFLOW_CALL_ACTIVE 300 #define CALLFLOW_INCOMING_HANGUP 100 #define CALLFLOW_CALL_RELEASED 101 @@ -98,7 +98,7 @@ #define CALLFLOW_STATUS_UNPLACED 116 #define CALLFLOW_STATUS_ROUTING 117 #define CALLFLOW_STATUS_EARLYMEDIA 118 -#define AST_STATE_HANGUP_REQUESTED 200 +#define SKYPIAX_STATE_HANGUP_REQUESTED 200 //FIXME CALLFLOW_INCOMING_CALLID to be removed #define CALLFLOW_INCOMING_CALLID 1019 @@ -161,8 +161,8 @@ switch_mutex_t *mutex; } globals; -struct skypiax_config { - char span_id[80]; +struct skypiax_interface { + char interface_id[80]; char name[80]; char dialplan[80]; char context[80]; @@ -212,9 +212,9 @@ void *tech_pvt; }; -typedef struct skypiax_config skypiax_config_t; +typedef struct skypiax_interface skypiax_interface_t; -static skypiax_config_t SKYPIAX_CONFIGS[SKYPIAX_MAX_INTERFACES]; +static skypiax_interface_t SKYPIAX_INTERFACES[SKYPIAX_MAX_INTERFACES]; struct private_object { @@ -227,7 +227,7 @@ switch_caller_profile_t *caller_profile; switch_mutex_t *mutex; switch_mutex_t *flag_mutex; - skypiax_config_t *p; + skypiax_interface_t *p; //switch_thread_cond_t *cond; }; @@ -394,7 +394,7 @@ #define GG 160 static void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t *thread, void *obj) { - struct skypiax_config *p = obj; + struct skypiax_interface *p = obj; short in[GG]; short out[GG / 2]; int s, fd, len, sent; @@ -484,7 +484,7 @@ static void *SWITCH_THREAD_FUNC skypiax_do_tcp_cli_thread(switch_thread_t *thread, void *obj) //void *skypiax_do_tcp_cli_thread(void *data) { - struct skypiax_config *p = obj; + struct skypiax_interface *p = obj; int s, fd, len; short in[NN / 2]; short out[NN]; @@ -526,7 +526,7 @@ sin_size = sizeof(remote_addr); while ((fd = accept(s, (struct sockaddr *) &remote_addr, &sin_size)) > 0) { ERRORA("ACCEPTED\n", SKYPIAX_P_LOG); - //while (1 && p->owner && p->owner->_state == AST_STATE_UP) FIXME FIXME FIXME + //while (1 && p->owner && p->owner->_state == SKYPIAX_STATE_UP) FIXME FIXME FIXME while (1) { got = read(p->audioskypepipe[0], in, (NN / 2) * sizeof(short)); @@ -565,7 +565,7 @@ } -int skypiax_skypeaudio_init(struct skypiax_config *p) +int skypiax_skypeaudio_init(struct skypiax_interface *p) { int c; /* build the pipe that will be polled on by pbx */ @@ -622,7 +622,7 @@ } static switch_status_t skypiax_skypeaudio_read(private_t *tech_pvt) { - struct skypiax_config *p; + struct skypiax_interface *p; short buf[640]; int samples; @@ -653,21 +653,21 @@ #ifdef NOTDEF //cicopet -struct ast_frame *skypiax_skypeaudio_read(struct skypiax_config *p) +struct ast_frame *skypiax_skypeaudio_read(struct skypiax_interface *p) { static struct ast_frame f; - static short __buf[SKYPIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2]; + static short __buf[SKYPIAX_FRAME_SIZE + SKYPIAX_FRIENDLY_OFFSET / 2]; short *buf; int samples; if (option_debug > 100) { DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); } - memset(__buf, '\0', (SKYPIAX_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2)); + memset(__buf, '\0', (SKYPIAX_FRAME_SIZE + SKYPIAX_FRIENDLY_OFFSET / 2)); - buf = __buf + AST_FRIENDLY_OFFSET / 2; + buf = __buf + SKYPIAX_FRIENDLY_OFFSET / 2; - f.frametype = AST_FRAME_NULL; + f.frametype = SKYPIAX_FRAME_NULL; f.subclass = 0; f.samples = 0; f.datalen = 0; @@ -686,12 +686,12 @@ } else { //DEBUGA_SOUND("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); /* A real frame */ - f.frametype = AST_FRAME_VOICE; - f.subclass = AST_FORMAT_SLINEAR; + f.frametype = SKYPIAX_FRAME_VOICE; + f.subclass = SKYPIAX_FORMAT_SLINEAR; f.samples = SKYPIAX_FRAME_SIZE; f.datalen = SKYPIAX_FRAME_SIZE * 2; f.data = buf; - f.offset = AST_FRIENDLY_OFFSET; + f.offset = SKYPIAX_FRIENDLY_OFFSET; f.src = skypiax_type; f.mallocd = 0; } @@ -704,9 +704,9 @@ #endif //NOTDEF #endif /* SKYPE_AUDIO */ -static void tech_init(private_t *tech_pvt, switch_core_session_t *session, skypiax_config_t *p) +static void tech_init(private_t *tech_pvt, switch_core_session_t *session, skypiax_interface_t *p) { - //struct skypiax_config *p = NULL; + //struct skypiax_interface *p = NULL; DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); tech_pvt->read_frame.data = tech_pvt->databuf; @@ -888,12 +888,12 @@ } else { //DEBUGA_SOUND("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); /* A real frame */ - f.frametype = AST_FRAME_VOICE; - f.subclass = AST_FORMAT_SLINEAR; + f.frametype = SKYPIAX_FRAME_VOICE; + f.subclass = SKYPIAX_FORMAT_SLINEAR; f.samples = SKYPIAX_FRAME_SIZE; f.datalen = SKYPIAX_FRAME_SIZE * 2; f.data = buf; - f.offset = AST_FRIENDLY_OFFSET; + f.offset = SKYPIAX_FRIENDLY_OFFSET; f.src = skypiax_type; f.mallocd = 0; } @@ -941,7 +941,7 @@ private_t *tech_pvt = NULL; //switch_frame_t *pframe; int sent; - struct skypiax_config *p=NULL; + struct skypiax_interface *p=NULL; //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL WRITE FRAME\n"); @@ -976,7 +976,7 @@ { private_t *tech_pvt; switch_channel_t *channel = NULL; - struct skypiax_config *p; + struct skypiax_interface *p; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -996,7 +996,7 @@ { switch_channel_t *channel; private_t *tech_pvt; - struct skypiax_config *p; + struct skypiax_interface *p; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -1038,7 +1038,7 @@ switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { - tech_pvt->p = SKYPIAX_CONFIGS[2]; //FIXME + tech_pvt->p = SKYPIAX_INTERFACES[2]; //FIXME channel = switch_core_session_get_channel(*new_session); tech_init(tech_pvt, *new_session, NULL); } else { @@ -1121,7 +1121,7 @@ int X11_errors_handler(Display * dpy, XErrorEvent * err) { (void) dpy; - struct skypiax_config *p = NULL; + struct skypiax_interface *p = NULL; xerror = err->error_code; DEBUGA_SKYPE("Received error code %d from X Server\n", SKYPIAX_P_LOG, xerror); @@ -1147,7 +1147,7 @@ Window w_P; Display *disp; Window handle_P; - struct skypiax_config *p = NULL; + struct skypiax_interface *p = NULL; w_P = AsteriskHandlesAst->skype_win; disp = AsteriskHandlesAst->disp; @@ -1199,7 +1199,7 @@ unsigned long bytes_after_ret; unsigned char *prop; int status; - struct skypiax_config *p = NULL; + struct skypiax_interface *p = NULL; X11_errors_trap(); //XLockDisplay(disp); @@ -1228,7 +1228,7 @@ int *dispptr; int disp; - struct skypiax_config *p = NULL; + struct skypiax_interface *p = NULL; dispptr = data; disp = *dispptr; @@ -1247,7 +1247,7 @@ static void *SWITCH_THREAD_FUNC do_skype_thread(switch_thread_t *thread, void *obj) { - struct skypiax_config *p; + struct skypiax_interface *p; struct AsteriskHandles *AsteriskHandlesAst; char buf[SKYPE_X11_BUF_SIZE]; Display *disp = NULL; @@ -1317,7 +1317,7 @@ ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG); //p->skype = 0; - //p->skype_thread = AST_PTHREADT_NULL; + //p->skype_thread = SKYPIAX_PTHREADT_NULL; DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); return NULL; } @@ -1328,7 +1328,7 @@ ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG); //p->skype = 0; - //p->skype_thread = AST_PTHREADT_NULL; + //p->skype_thread = SKYPIAX_PTHREADT_NULL; DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); return NULL; } @@ -1380,11 +1380,11 @@ ("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypiax\n", SKYPIAX_P_LOG); //p->skype = 0; - //p->skype_thread = AST_PTHREADT_NULL; + //p->skype_thread = SKYPIAX_PTHREADT_NULL; return NULL; } //p->skype = 0; - //p->skype_thread = AST_PTHREADT_NULL; + //p->skype_thread = SKYPIAX_PTHREADT_NULL; //pthread_cleanup_pop(1); //DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); return NULL; @@ -1399,7 +1399,7 @@ #if 1 #define WANT_SKYPE_X11 -int skypiax_skype_write(struct skypiax_config *p, char *msg_to_skype) +int skypiax_skype_write(struct skypiax_interface *p, char *msg_to_skype) { #ifdef __CYGWIN__ static char acInputRow[1024]; @@ -1424,7 +1424,7 @@ ("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypiax (Asterisk), then restart Skype from the menu, then launch Skypiax and try again.\n", SKYPIAX_P_LOG); p->skype = 0; - p->skype_thread = AST_PTHREADT_NULL; + p->skype_thread = SKYPIAX_PTHREADT_NULL; if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -1447,7 +1447,7 @@ ("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypiax (Asterisk), then restart Skype from the menu, then launch Skypiax and try again.\n", SKYPIAX_P_LOG); //p->skype = 0; - //p->skype_thread = AST_PTHREADT_NULL; + //p->skype_thread = SKYPIAX_PTHREADT_NULL; if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -1465,7 +1465,7 @@ #endif //0 -int skypiax_skype_read(struct skypiax_config *p) +int skypiax_skype_read(struct skypiax_interface *p) { char read_from_pipe[4096]; @@ -1528,16 +1528,16 @@ DEBUGA_SKYPE("skype_call now is DOWN\n", SKYPIAX_P_LOG); p->skype_call_id[0] = '\0'; - if (p->interface_state != AST_STATE_HANGUP_REQUESTED) { + if (p->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; //FIXME if(p->owner) - //FIXME p->owner->hangupcause = AST_CAUSE_NORMAL; + //FIXME p->owner->hangupcause = SKYPIAX_CAUSE_NORMAL; return CALLFLOW_INCOMING_HANGUP; } else { - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; } } @@ -1577,17 +1577,17 @@ DEBUGA_SKYPE("skype_call now is DOWN\n", SKYPIAX_P_LOG); p->skype_call_id[0] = '\0'; - if (p->interface_state != AST_STATE_HANGUP_REQUESTED) { + if (p->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; //FIXME if(p->owner){ - //FIXME p->owner->hangupcause = AST_CAUSE_NORMAL; + //FIXME p->owner->hangupcause = SKYPIAX_CAUSE_NORMAL; //FIXME } return CALLFLOW_INCOMING_HANGUP; } else { - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; } } if (!strcasecmp(messaggio, "CALL")) { @@ -1624,13 +1624,13 @@ if (!strcasecmp(prop, "CONF_ID") && !strcasecmp(value, "0")) { DEBUGA_SKYPE("the skype_call %s is NOT a conference call\n", SKYPIAX_P_LOG, id); - if (p->interface_state == AST_STATE_DOWN) - p->interface_state = AST_STATE_PRERING; + if (p->interface_state == SKYPIAX_STATE_DOWN) + p->interface_state = SKYPIAX_STATE_PRERING; } if (!strcasecmp(prop, "CONF_ID") && strcasecmp(value, "0")) { DEBUGA_SKYPE("the skype_call %s is a conference call\n", SKYPIAX_P_LOG, id); - if (p->interface_state == AST_STATE_DOWN) - p->interface_state = AST_STATE_PRERING; + if (p->interface_state == SKYPIAX_STATE_DOWN) + p->interface_state = SKYPIAX_STATE_PRERING; } if (!strcasecmp(prop, "DTMF")) { @@ -1638,7 +1638,7 @@ private_t *tech_pvt = NULL; switch_channel_t *channel = NULL; - //FIXME struct ast_frame f2 = { AST_FRAME_DTMF, value[0], }; + //FIXME struct ast_frame f2 = { SKYPIAX_FRAME_DTMF, value[0], }; DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPIAX_P_LOG, id, value); tech_pvt = p->tech_pvt; @@ -1683,14 +1683,14 @@ if (!strcasecmp(value, "RINGING")) { char msg_to_skype[1024]; - if (p->interface_state != AST_STATE_DIALING) { + if (p->interface_state != SKYPIAX_STATE_DIALING) { /* we are not calling out */ //FIXME if (!p->owner) if (1) { /* we are not inside an active call */ p->skype_callflow = CALLFLOW_STATUS_RINGING; - p->interface_state = AST_STATE_RING; + p->interface_state = SKYPIAX_STATE_RING; /* no owner, no active call, let's answer */ skypiax_skype_write(p, "SET AGC OFF"); usleep(10000); @@ -1721,16 +1721,16 @@ } else { /* we are calling out */ p->skype_callflow = CALLFLOW_STATUS_RINGING; - p->interface_state = AST_STATE_RINGING; - //FIXME ast_queue_control(p->owner, AST_CONTROL_RINGING); + p->interface_state = SKYPIAX_STATE_RINGING; + //FIXME ast_queue_control(p->owner, SKYPIAX_CONTROL_RINGING); strncpy(p->skype_call_id, id, sizeof(p->skype_call_id) - 1); DEBUGA_SKYPE("Our remote party in skype_call %s is RINGING\n", SKYPIAX_P_LOG, id); } } else if (!strcasecmp(value, "EARLYMEDIA")) { p->skype_callflow = CALLFLOW_STATUS_EARLYMEDIA; - p->interface_state = AST_STATE_DIALING; - //FIXME ast_queue_control(p->owner, AST_CONTROL_RINGING); + p->interface_state = SKYPIAX_STATE_DIALING; + //FIXME ast_queue_control(p->owner, SKYPIAX_CONTROL_RINGING); DEBUGA_SKYPE("Our remote party in skype_call %s is EARLYMEDIA\n", SKYPIAX_P_LOG, id); } else if (!strcasecmp(value, "MISSED")) { @@ -1743,16 +1743,16 @@ DEBUGA_SKYPE("skype_call %s now is DOWN\n", SKYPIAX_P_LOG, id); p->skype_call_id[0] = '\0'; - if (p->interface_state != AST_STATE_HANGUP_REQUESTED) { + if (p->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; //FIXME if(p->owner) - //FIXME p->owner->hangupcause = AST_CAUSE_NORMAL; + //FIXME p->owner->hangupcause = SKYPIAX_CAUSE_NORMAL; return CALLFLOW_INCOMING_HANGUP; } else { - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; } } else if (!strcasecmp(value, "CANCELLED")) { @@ -1763,16 +1763,16 @@ SKYPIAX_P_LOG, id); p->skype_call_id[0] = '\0'; - if (p->interface_state != AST_STATE_HANGUP_REQUESTED) { + if (p->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; //FIXME if(p->owner) - //FIXME p->owner->hangupcause = AST_CAUSE_NORMAL; + //FIXME p->owner->hangupcause = SKYPIAX_CAUSE_NORMAL; return CALLFLOW_INCOMING_HANGUP; } else { - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; } } else if (!strcasecmp(value, "FAILED")) { p->skype_callflow = CALLFLOW_STATUS_FAILED; @@ -1782,12 +1782,12 @@ SKYPIAX_P_LOG, id); p->skype_call_id[0] = '\0'; strncpy(p->skype_call_id, id, sizeof(p->skype_call_id) - 1); - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } //FIXME if(p->owner) - //FIXME p->owner->hangupcause = AST_CAUSE_NORMAL; + //FIXME p->owner->hangupcause = SKYPIAX_CAUSE_NORMAL; return CALLFLOW_INCOMING_HANGUP; } else if (!strcasecmp(value, "REFUSED")) { if (!strcasecmp(id, p->skype_call_id)) { @@ -1798,13 +1798,13 @@ ("we tried to call Skype on skype_call %s and Skype has now REFUSED\n", SKYPIAX_P_LOG, id); strncpy(p->skype_call_id, id, sizeof(p->skype_call_id) - 1); - p->interface_state = AST_STATE_DOWN; + p->interface_state = SKYPIAX_STATE_DOWN; p->skype_call_id[0] = '\0'; if (option_debug > 100) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } //FIXME if(p->owner) - //FIXME p->owner->hangupcause = AST_CAUSE_NORMAL; + //FIXME p->owner->hangupcause = SKYPIAX_CAUSE_NORMAL; return CALLFLOW_INCOMING_HANGUP; } else { /* we're here because were us that refused an incoming call */ @@ -1813,26 +1813,26 @@ } } else if (!strcasecmp(value, "ROUTING")) { p->skype_callflow = CALLFLOW_STATUS_ROUTING; - p->interface_state = AST_STATE_DIALING; + p->interface_state = SKYPIAX_STATE_DIALING; strncpy(p->skype_call_id, id, sizeof(p->skype_call_id) - 1); DEBUGA_SKYPE("skype_call: %s is now ROUTING\n", SKYPIAX_P_LOG, id); } else if (!strcasecmp(value, "UNPLACED")) { p->skype_callflow = CALLFLOW_STATUS_UNPLACED; - p->interface_state = AST_STATE_DIALING; + p->interface_state = SKYPIAX_STATE_DIALING; strncpy(p->skype_call_id, id, sizeof(p->skype_call_id) - 1); DEBUGA_SKYPE("skype_call: %s is now UNPLACED\n", SKYPIAX_P_LOG, id); } else if (!strcasecmp(value, "INPROGRESS")) { p->skype_callflow = CALLFLOW_STATUS_INPROGRESS; strncpy(p->skype_call_id, id, sizeof(p->skype_call_id) - 1); - p->interface_state = AST_STATE_UP; + p->interface_state = SKYPIAX_STATE_UP; if (option_debug > 1) DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPIAX_P_LOG, id); //FIXME if (p->owner) { - //FIXME ast_queue_control(p->owner, AST_CONTROL_ANSWER); + //FIXME ast_queue_control(p->owner, SKYPIAX_CONTROL_ANSWER); //FIXME } if (option_debug > 1) - DEBUGA_SKYPE("skype_call: %s AST_CONTROL_ANSWER sent\n", SKYPIAX_P_LOG, + DEBUGA_SKYPE("skype_call: %s SKYPIAX_CONTROL_ANSWER sent\n", SKYPIAX_P_LOG, id); //FIXME if (p->owner) @@ -1875,7 +1875,7 @@ usleep(100000); } - p->skype_callflow = AST_STATE_UP; + p->skype_callflow = SKYPIAX_STATE_UP; /**************************/ @@ -2010,7 +2010,7 @@ return 0; } -int skypiax_skype_call(struct skypiax_config *p, char *idest, int timeout, switch_core_session_t *session) +int skypiax_skype_call(struct skypiax_interface *p, char *idest, int timeout, switch_core_session_t *session) { char rdest[80]; @@ -2050,9 +2050,9 @@ //p->skype_call_ongoing = 1; //if (p->owner) { - //ast_setstate(p->owner, AST_STATE_RINGING); + //ast_setstate(p->owner, SKYPIAX_STATE_RINGING); //} - //FIXME ast_queue_control(p->owner, AST_CONTROL_RINGING); + //FIXME ast_queue_control(p->owner, SKYPIAX_CONTROL_RINGING); return 0; } @@ -2067,7 +2067,7 @@ switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { - tech_pvt->p = &SKYPIAX_CONFIGS[2]; //FIXME + tech_pvt->p = &SKYPIAX_INTERFACES[2]; //FIXME channel = switch_core_session_get_channel(*new_session); tech_init(tech_pvt, *new_session, NULL); } else { @@ -2111,7 +2111,7 @@ static void *SWITCH_THREAD_FUNC skypiax_do_controldev_thread(switch_thread_t *thread, void *obj) //void *skypiax_do_controldev_thread(void *data) { - struct skypiax_config *p = obj; + struct skypiax_interface *p = obj; int res; DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -2128,7 +2128,7 @@ DEBUGA_SKYPE("skype call ended\n", SKYPIAX_P_LOG); if (p->owner) { pthread_testcancel(); - ast_queue_control(p->owner, AST_CONTROL_HANGUP); + ast_queue_control(p->owner, SKYPIAX_CONTROL_HANGUP); } } #endif @@ -2147,21 +2147,21 @@ static switch_status_t load_config(void) { char *cf = "skypiax.conf"; - switch_xml_t cfg, xml, settings, param, spans, myspan; + switch_xml_t cfg, xml, global_settings, param, interfaces, myinterface; - memset(&globals, 0, sizeof(globals)); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); return SWITCH_STATUS_TERM; } - if ((settings = switch_xml_child(cfg, "settings"))) { - for (param = switch_xml_child(settings, "param"); param; param = param->next) { + if ((global_settings = switch_xml_child(cfg, "global_settings"))) { + for (param = switch_xml_child(global_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, "debug")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "globals.debug=%d\n", globals.debug); globals.debug = atoi(val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "globals.debug=%d\n", globals.debug); } else if (!strcasecmp(var, "hold-music")) { @@ -2194,12 +2194,12 @@ } } - if ((spans = switch_xml_child(cfg, "analog_spans"))) { + if ((interfaces = switch_xml_child(cfg, "per_interface_settings"))) { int i=0; - for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) { - char *id = (char *) switch_xml_attr(myspan, "id"); - char *name = (char *) switch_xml_attr(myspan, "name"); + for (myinterface = switch_xml_child(interfaces, "interface"); myinterface; myinterface = myinterface->next) { + char *id = (char *) switch_xml_attr(myinterface, "id"); + char *name = (char *) switch_xml_attr(myinterface, "name"); char *context = "default"; char *dialplan = "XML"; char *tonegroup = NULL; @@ -2212,9 +2212,9 @@ char *enable_callerid = "true"; char *X11_display = NULL; - uint32_t span_id = 0, to = 0, max = 0; + uint32_t interface_id = 0, to = 0, max = 0; - for (param = switch_xml_child(myspan, "param"); param; param = param->next) { + for (param = switch_xml_child(myinterface, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -2245,25 +2245,25 @@ } if (!X11_display) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing REQUIRED param 'X11_display'\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "interface missing REQUIRED param 'X11_display'\n"); continue; } if (!id) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing REQUIRED param 'id'\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "interface missing REQUIRED param 'id'\n"); continue; } if (switch_is_number(id)) { - span_id = atoi(id); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "span_id=%d\n", span_id); + interface_id = atoi(id); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "interface_id=%d\n", interface_id); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span param 'id' MUST be a number, now id='%s'\n", id); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "interface param 'id' MUST be a number, now id='%s'\n", id); continue; } if (!name) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "span missing param 'name', not nice, but works\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "interface missing param 'name', not nice, but works\n"); } if (!tonegroup) { @@ -2281,25 +2281,25 @@ if (name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "name=%s\n", name); } - if(span_id && span_id < SKYPIAX_MAX_INTERFACES ) { - struct skypiax_config newconf; + if(interface_id && interface_id < SKYPIAX_MAX_INTERFACES ) { + struct skypiax_interface newconf; memset(&newconf, '\0', sizeof(newconf)); - SKYPIAX_CONFIGS[span_id]=newconf; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CONFIGURING span_id=%d\n", span_id); - switch_set_string(SKYPIAX_CONFIGS[span_id].span_id, id); + SKYPIAX_INTERFACES[interface_id]=newconf; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CONFIGURING interface_id=%d\n", interface_id); + switch_set_string(SKYPIAX_INTERFACES[interface_id].interface_id, id); if (name) { - switch_set_string(SKYPIAX_CONFIGS[span_id].name, name); + switch_set_string(SKYPIAX_INTERFACES[interface_id].name, name); } else { - switch_set_string(SKYPIAX_CONFIGS[span_id].name, "N/A"); + switch_set_string(SKYPIAX_INTERFACES[interface_id].name, "N/A"); } - switch_set_string(SKYPIAX_CONFIGS[span_id].X11_display, X11_display); - switch_set_string(SKYPIAX_CONFIGS[span_id].context, context); - switch_set_string(SKYPIAX_CONFIGS[span_id].dialplan, dialplan); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "span_id=%d SKYPIAX_CONFIGS[span_id].X11_display=%s\n", span_id, SKYPIAX_CONFIGS[span_id].X11_display); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "span_id=%d SKYPIAX_CONFIGS[span_id].name=%s\n", span_id, SKYPIAX_CONFIGS[span_id].name); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "span_id=%d SKYPIAX_CONFIGS[span_id].context=%s\n", span_id, SKYPIAX_CONFIGS[span_id].context); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "span_id=%d SKYPIAX_CONFIGS[span_id].dialplan=%s\n", span_id, SKYPIAX_CONFIGS[span_id].dialplan); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "STARTING span_id=%d\n", span_id); + switch_set_string(SKYPIAX_INTERFACES[interface_id].X11_display, X11_display); + switch_set_string(SKYPIAX_INTERFACES[interface_id].context, context); + switch_set_string(SKYPIAX_INTERFACES[interface_id].dialplan, dialplan); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "interface_id=%d SKYPIAX_INTERFACES[interface_id].X11_display=%s\n", interface_id, SKYPIAX_INTERFACES[interface_id].X11_display); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "interface_id=%d SKYPIAX_INTERFACES[interface_id].name=%s\n", interface_id, SKYPIAX_INTERFACES[interface_id].name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "interface_id=%d SKYPIAX_INTERFACES[interface_id].context=%s\n", interface_id, SKYPIAX_INTERFACES[interface_id].context); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "interface_id=%d SKYPIAX_INTERFACES[interface_id].dialplan=%s\n", interface_id, SKYPIAX_INTERFACES[interface_id].dialplan); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "STARTING interface_id=%d\n", interface_id); if(1) @@ -2310,7 +2310,7 @@ switch_threadattr_create(&thd_attr, module_pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, do_skype_thread, &SKYPIAX_CONFIGS[span_id], module_pool); + switch_thread_create(&thread, thd_attr, do_skype_thread, &SKYPIAX_INTERFACES[interface_id], module_pool); } usleep(100000); @@ -2322,31 +2322,31 @@ switch_threadattr_create(&thd_attr, module_pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, skypiax_do_controldev_thread, &SKYPIAX_CONFIGS[span_id], module_pool); + switch_thread_create(&thread, thd_attr, skypiax_do_controldev_thread, &SKYPIAX_INTERFACES[interface_id], module_pool); } usleep(1000000); -skypiax_skypeaudio_init(&SKYPIAX_CONFIGS[span_id]); +skypiax_skypeaudio_init(&SKYPIAX_INTERFACES[interface_id]); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "STARTED span_id=%d\n", span_id); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "STARTED interface_id=%d\n", interface_id); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span id %d is higher than SKYPIAX_MAX_INTERFACES (%d)\n", span_id, SKYPIAX_MAX_INTERFACES); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "interface id %d is higher than SKYPIAX_MAX_INTERFACES (%d)\n", interface_id, SKYPIAX_MAX_INTERFACES); continue; } } for(i=0; i < SKYPIAX_MAX_INTERFACES; i++) { - if(strlen(SKYPIAX_CONFIGS[i].name)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_CONFIGS[i].span_id=%s\n", i, SKYPIAX_CONFIGS[i].span_id); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_CONFIGS[i].X11_display=%s\n", i, SKYPIAX_CONFIGS[i].X11_display); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_CONFIGS[i].name=%s\n", i, SKYPIAX_CONFIGS[i].name); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_CONFIGS[i].context=%s\n", i, SKYPIAX_CONFIGS[i].context); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_CONFIGS[i].dialplan=%s\n", i, SKYPIAX_CONFIGS[i].dialplan); + if(strlen(SKYPIAX_INTERFACES[i].name)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_INTERFACES[%d].interface_id=%s\n", i, i, SKYPIAX_INTERFACES[i].interface_id); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_INTERFACES[%d].X11_display=%s\n", i, i, SKYPIAX_INTERFACES[i].X11_display); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_INTERFACES[%d].name=%s\n", i, i, SKYPIAX_INTERFACES[i].name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_INTERFACES[%d].context=%s\n", i, i, SKYPIAX_INTERFACES[i].context); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "i=%d SKYPIAX_INTERFACES[%d].dialplan=%s\n", i, i, SKYPIAX_INTERFACES[i].dialplan); } } } @@ -2358,10 +2358,13 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load) { - struct skypiax_config *p = NULL; + struct skypiax_interface *p = NULL; module_pool = pool; + memset(&globals, '\0', sizeof(globals)); + memset(SKYPIAX_INTERFACES, '\0', sizeof(SKYPIAX_INTERFACES)); + #ifndef _WINDOWS_ //FIXME if (!XInitThreads()) { ERRORA("Not initialized XInitThreads!\n", SKYPIAX_P_LOG); @@ -2412,7 +2415,7 @@ { switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; - skypiax_config_t *p; + skypiax_interface_t *p; char msg_to_skype[256]; channel = switch_core_session_get_channel(session);

1 0

[commit] r10473 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 20 Nov '08

20 Nov '08

Author: anthm Date: Wed Nov 19 22:56:27 2008 New Revision: 10473 Log: better the other way Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Nov 19 22:56:27 2008 @@ -3508,7 +3508,7 @@ /* Emaculent conception of session object into the script if one is available */ if (!(session && new_js_session(cx, javascript_global_object, session, &jss, "session", flags))) { - switch_snprintf(buf, sizeof(buf), "~var session = new Object();"); + switch_snprintf(buf, sizeof(buf), "~var session = false;"); eval_some_js(buf, cx, javascript_global_object, &rval); return; }

1 0

[commit] r10472 - in freeswitch/trunk/src: . include mod/languages/mod_spidermonkey
by FreeSWITCH SVN 20 Nov '08

20 Nov '08

Author: anthm Date: Wed Nov 19 21:27:59 2008 New Revision: 10472 Log: cleaning up stupid mess (lesson in regressions for Math`) Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core_rwlock.c freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Nov 19 21:27:59 2008 @@ -321,6 +321,22 @@ #ifdef SWITCH_DEBUG_RWLOCKS +SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock_hangup(_In_ switch_core_session_t *session, const char *file, const char *func, int line); +#endif + +/*! + \brief Acquire a read lock on the session + \param session the session to acquire from + \return success if it is safe to read from the session +*/ +#ifdef SWITCH_DEBUG_RWLOCKS +#define switch_core_session_read_lock(session) switch_core_session_perform_read_lock_hangup(session, __FILE__, __SWITCH_FUNC__, __LINE__) +#else +SWITCH_DECLARE(switch_status_t) switch_core_session_read_lock_hangup(_In_ switch_core_session_t *session); +#endif + + +#ifdef SWITCH_DEBUG_RWLOCKS SWITCH_DECLARE(void) switch_core_session_perform_write_lock(_In_ switch_core_session_t *session, const char *file, const char *func, int line); #endif Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Nov 19 21:27:59 2008 @@ -2727,7 +2727,7 @@ (*jss)->stack_depth = 0; if ((JS_SetPrivate(cx, session_obj, *jss) && JS_DefineProperties(cx, session_obj, session_props) && JS_DefineFunctions(cx, session_obj, session_methods))) { - if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { + if (switch_core_session_read_lock_hangup(session) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Failure.\n"); free(*jss); return NULL; @@ -3508,8 +3508,9 @@ /* Emaculent conception of session object into the script if one is available */ if (!(session && new_js_session(cx, javascript_global_object, session, &jss, "session", flags))) { - switch_snprintf(buf, sizeof(buf), "~var session = false;"); + switch_snprintf(buf, sizeof(buf), "~var session = new Object();"); eval_some_js(buf, cx, javascript_global_object, &rval); + return; } if (ro) { new_request(cx, javascript_global_object, ro); Modified: freeswitch/trunk/src/switch_core_rwlock.c ============================================================================== --- freeswitch/trunk/src/switch_core_rwlock.c (original) +++ freeswitch/trunk/src/switch_core_rwlock.c Wed Nov 19 21:27:59 2008 @@ -63,6 +63,34 @@ return status; } + +#ifdef SWITCH_DEBUG_RWLOCKS +SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock_hangup(switch_core_session_t *session, const char *file, const char *func, int line) +#else +SWITCH_DECLARE(switch_status_t) switch_core_session_read_lock_hangup(switch_core_session_t *session) +#endif +{ + switch_status_t status = SWITCH_STATUS_FALSE; + + if (session->rwlock) { + if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_get_state(session->channel) >= CS_DONE) { + status = SWITCH_STATUS_FALSE; +#ifdef SWITCH_DEBUG_RWLOCKS + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock FAIL\n", + switch_channel_get_name(session->channel)); +#endif + } else { + status = (switch_status_t) switch_thread_rwlock_tryrdlock(session->rwlock); +#ifdef SWITCH_DEBUG_RWLOCKS + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock ACQUIRED\n", + switch_channel_get_name(session->channel)); +#endif + } + } + + return status; +} + #ifdef SWITCH_DEBUG_RWLOCKS SWITCH_DECLARE(void) switch_core_session_perform_write_lock(switch_core_session_t *session, const char *file, const char *func, int line) { Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Wed Nov 19 21:27:59 2008 @@ -421,9 +421,10 @@ switch_channel_get_variables(session->channel, &stream.param_event); expanded = switch_channel_expand_variables(session->channel, arg); - switch_api_execute(cmd, expanded, use_session, &stream); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, expanded, switch_str_nil((char *) stream.data)); + switch_api_execute(cmd, expanded, use_session, &stream); if (expanded != arg) { switch_safe_free(expanded); }

1 0

[commit] r10471 - in freeswitch/trunk/src: include mod/applications/mod_commands mod/endpoints/mod_sofia
by FreeSWITCH SVN 20 Nov '08

20 Nov '08

Author: anthm Date: Wed Nov 19 21:07:59 2008 New Revision: 10471 Log: wait for reply of refer Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Nov 19 21:07:59 2008 @@ -92,6 +92,7 @@ const char *_file; const char *_func; int _line; + }; /*! \brief A generic object to pass as a thread's session object to allow mutiple arguements and a pool */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Nov 19 21:07:59 2008 @@ -676,7 +676,9 @@ } switch_text_channel_t; typedef enum { - SCSMF_DYNAMIC = (1 << 0) + SCSMF_DYNAMIC = (1 << 0), + SCSMF_FREE_STRING_REPLY = (1 << 1), + SCSMF_FREE_POINTER_REPLY = (1 << 2), } switch_core_session_message_flag_enum_t; typedef uint32_t switch_core_session_message_flag_t; Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Nov 19 21:07:59 2008 @@ -1259,6 +1259,45 @@ return SWITCH_STATUS_SUCCESS; } + + +#define UUID_DEFLECT_SYNTAX "<uuid> <uri>" +SWITCH_STANDARD_API(uuid_deflect) +{ + switch_core_session_t *tsession = NULL; + char *uuid = NULL, *text = NULL; + + if (!switch_strlen_zero(cmd) && (uuid = strdup(cmd))) { + if ((text = strchr(uuid, ' '))) { + *text++ = '\0'; + } + } + + if (switch_strlen_zero(uuid) || switch_strlen_zero(text)) { + stream->write_function(stream, "-USAGE: %s\n", UUID_DEFLECT_SYNTAX); + } else { + if ((tsession = switch_core_session_locate(uuid))) { + switch_core_session_message_t msg = { 0 }; + + /* Tell the channel to deflect the call */ + msg.from = __FILE__; + msg.string_arg = text; + msg.message_id = SWITCH_MESSAGE_INDICATE_DEFLECT; + switch_core_session_receive_message(tsession, &msg); + stream->write_function(stream, "+OK:%s\n", msg.string_reply); + if (switch_set_flag((&msg), SCSMF_FREE_STRING_REPLY)) { + free(msg.string_reply); + } + switch_core_session_rwunlock(tsession); + } else { + stream->write_function(stream, "-ERR No Such Channel %s!\n", uuid); + } + } + + switch_safe_free(uuid); + return SWITCH_STATUS_SUCCESS; +} + #define SCHED_TRANSFER_SYNTAX "[+]<time> <uuid> <extension> [<dialplan>] [<context>]" SWITCH_STANDARD_API(sched_transfer_function) { @@ -3091,6 +3130,7 @@ SWITCH_ADD_API(commands_api_interface, "regex", "Eval a regex", regex_function, "<data>|<pattern>[|<subst string>]"); SWITCH_ADD_API(commands_api_interface, "acl", "compare an ip to an acl list", acl_function, "<ip> <list_name>"); SWITCH_ADD_API(commands_api_interface, "uuid_chat", "Send a chat message", uuid_chat, UUID_CHAT_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_deflect", "Send a deflect", uuid_deflect, UUID_DEFLECT_SYNTAX); SWITCH_ADD_API(commands_api_interface, "find_user_xml", "find a user", find_user_function, "<key> <user> <domain>"); SWITCH_ADD_API(commands_api_interface, "user_exists", "find a user", user_exists_function, "<key> <user> <domain>"); SWITCH_ADD_API(commands_api_interface, "xml_locate", "find some xml", xml_locate_function, "[root | <section> <tag> <tag_attr_name> <tag_attr_val>]"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Nov 19 21:07:59 2008 @@ -1120,6 +1120,7 @@ case SWITCH_MESSAGE_INDICATE_DEFLECT: { char ref_to[128] = ""; + const char *var; if (!strstr(msg->string_arg, "sip:")) { const char *format = strchr(tech_pvt->profile->sipip, ':') ? "sip:%s@[%s]" : "sip:%s@%s"; @@ -1128,6 +1129,16 @@ switch_set_string(ref_to, msg->string_arg); } nua_refer(tech_pvt->nh, SIPTAG_REFER_TO_STR(ref_to), SIPTAG_REFERRED_BY_STR(tech_pvt->contact_url), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); + sofia_wait_for_reply(tech_pvt, 9999, 300); + switch_mutex_lock(tech_pvt->sofia_mutex); + + if ((var = switch_channel_get_variable(tech_pvt->channel, "sip_refer_reply"))) { + msg->string_reply = strdup(var); + switch_set_flag(msg, SCSMF_FREE_STRING_REPLY); + } else { + msg->string_reply = "no reply"; + } } break; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Nov 19 21:07:59 2008 @@ -513,6 +513,7 @@ switch_size_t last_ts; uint32_t check_frames; uint32_t mismatch_count; + nua_event_t want_event; }; struct callback_t { @@ -717,3 +718,4 @@ void sofia_glue_toggle_hold(private_object_t *tech_pvt, int sendonly); const char * sofia_state_string(int state); switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force); +void sofia_wait_for_reply(struct private_object *tech_pvt, nua_event_t event, uint32_t timeout); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Nov 19 21:07:59 2008 @@ -83,6 +83,7 @@ nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]) { switch_channel_t *channel = NULL; + private_object_t *tech_pvt = NULL; /* make sure we have a proper event */ if (!sip || !sip->sip_event) { @@ -94,14 +95,35 @@ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); return; } + + if (session) { + channel = switch_core_session_get_channel(session); + switch_assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + } + + if (!strcasecmp(sip->sip_event->o_type, "refer")) { + if (session && channel && tech_pvt) { + if (sip->sip_payload && sip->sip_payload->pl_data) { + if (!switch_stristr("100", sip->sip_payload->pl_data)) { + switch_channel_set_variable(channel, "sip_refer_reply", sip->sip_payload->pl_data); + if (tech_pvt->want_event == 9999) { + tech_pvt->want_event = 0; + } + } + } + } + nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); + } + /* make sure we have a proper "talk" event */ if (!session || strcasecmp(sip->sip_event->o_type, "talk")) { goto error; } - channel = switch_core_session_get_channel(session); - switch_assert(channel != NULL); + if (!switch_channel_test_flag(channel, CF_OUTBOUND)) { switch_channel_answer(channel); switch_channel_set_variable(channel, "auto_answer_destination", switch_channel_get_variable(channel, "destination_number")); @@ -109,6 +131,7 @@ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); return; } + error: nua_respond(nh, 481, "Subscription Does Not Exist", NUTAG_WITH_THIS(nua), TAG_END()); @@ -160,6 +183,18 @@ { } +void sofia_wait_for_reply(struct private_object *tech_pvt, nua_event_t event, uint32_t timeout) +{ + time_t exp = switch_timestamp(NULL) + timeout; + + tech_pvt->want_event = event; + + while(switch_channel_ready(tech_pvt->channel) && tech_pvt->want_event && switch_timestamp(NULL) < exp) { + switch_yield(100000); + } + +} + void sofia_event_callback(nua_event_t event, int status, char const *phrase, @@ -336,6 +371,10 @@ done: + if (tech_pvt && tech_pvt->want_event && event == tech_pvt->want_event) { + tech_pvt->want_event = 0; + } + switch (event) { case nua_i_subscribe: break; @@ -586,6 +625,7 @@ TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("include-session-description")), TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("presence.winfo")), TAG_IF(profile->pres_type, NUTAG_ALLOW_EVENTS("message-summary")), + NUTAG_ALLOW_EVENTS("refer"), SIPTAG_SUPPORTED_STR(supported), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set params for %s\n", profile->name); @@ -2940,6 +2980,7 @@ } /*---------------------------------------*/ + void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]) { /* Incoming refer */

1 0

[commit] r10470 - freeswitch/trunk/src/mod/applications/mod_enum
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 17:54:37 2008 New Revision: 10470 Log: rupa (again) Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Wed Nov 19 17:54:37 2008 @@ -652,7 +652,7 @@ rbl -= l; } - switch_snprintf(vbuf, sizeof(vbuf), "%d", cnt); + switch_snprintf(vbuf, sizeof(vbuf), "%d", cnt - 1); switch_channel_set_variable(channel, "enum_route_count", vbuf); *(rbuf + strlen(rbuf) - 1) = '\0'; switch_channel_set_variable(channel, "enum_auto_route", rbuf);

1 0

[commit] r10469 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 17:27:17 2008 New Revision: 10469 Log: fix for FSCORE-221 Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Nov 19 17:27:17 2008 @@ -489,7 +489,29 @@ message->_line = 0; - switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); + switch (message->message_id) { + case SWITCH_MESSAGE_REDIRECT_AUDIO: + case SWITCH_MESSAGE_INDICATE_ANSWER: + case SWITCH_MESSAGE_INDICATE_PROGRESS: + case SWITCH_MESSAGE_INDICATE_BRIDGE: + case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + case SWITCH_MESSAGE_INDICATE_TRANSFER: + case SWITCH_MESSAGE_INDICATE_RINGING: + case SWITCH_MESSAGE_INDICATE_MEDIA: + case SWITCH_MESSAGE_INDICATE_NOMEDIA: + case SWITCH_MESSAGE_INDICATE_HOLD: + case SWITCH_MESSAGE_INDICATE_UNHOLD: + case SWITCH_MESSAGE_INDICATE_REDIRECT: + case SWITCH_MESSAGE_INDICATE_RESPOND: + case SWITCH_MESSAGE_INDICATE_BROADCAST: + case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT: + case SWITCH_MESSAGE_INDICATE_DEFLECT: + switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); + break; + default: + break; + } + switch_core_session_rwunlock(session); return status;

1 0

[commit] r10468 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 17:24:17 2008 New Revision: 10468 Log: update Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Nov 19 17:24:17 2008 @@ -122,6 +122,7 @@ #define SWITCH_HOLDING_UUID_VARIABLE "holding_uuid" #define SWITCH_API_BRIDGE_END_VARIABLE "api_after_bridge" #define SWITCH_API_HANGUP_HOOK_VARIABLE "api_hangup_hook" +#define SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE "session_in_hangup_hook" #define SWITCH_PROCESS_CDR_VARIABLE "process_cdr" #define SWITCH_BRIDGE_CHANNEL_VARIABLE "bridge_channel" #define SWITCH_CHANNEL_NAME_VARIABLE "channel_name" Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Wed Nov 19 17:24:17 2008 @@ -385,7 +385,8 @@ { const char *var = switch_channel_get_variable(session->channel, SWITCH_PROCESS_CDR_VARIABLE); const char *hook_var; - + switch_core_session_t *use_session = NULL; + if (!switch_strlen_zero(var)) { if (!strcasecmp(var, "a_only")) { if (switch_channel_get_originator_caller_profile(session->channel)) { @@ -401,21 +402,31 @@ } STATE_MACRO(hangup, "HANGUP"); - + hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE); + if (switch_true(switch_channel_get_variable(session->channel, SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE))) { + use_session = session; + } if (!switch_strlen_zero(hook_var)) { switch_stream_handle_t stream = { 0 }; char *cmd = switch_core_session_strdup(session, hook_var); char *arg = NULL; + char *expanded = NULL; + if ((arg = strchr(cmd, ' '))) { *arg++ = '\0'; } SWITCH_STANDARD_STREAM(stream); switch_channel_get_variables(session->channel, &stream.param_event); - switch_api_execute(cmd, arg, session, &stream); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, arg, + expanded = switch_channel_expand_variables(session->channel, arg); + + switch_api_execute(cmd, expanded, use_session, &stream); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, expanded, switch_str_nil((char *) stream.data)); + if (expanded != arg) { + switch_safe_free(expanded); + } switch_safe_free(stream.data); } }

1 0

[commit] r10467 - in freeswitch/trunk/src: . mod/languages/mod_spidermonkey
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 16:55:50 2008 New Revision: 10467 Log: fine, have session in hangup hook apps, don't call me if it segs Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Nov 19 16:55:50 2008 @@ -1773,7 +1773,6 @@ struct js_session *jss = JS_GetPrivate(cx, obj); switch_channel_t *channel; - METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); if (argc > 1) { @@ -2056,8 +2055,6 @@ /*Always a pessimist... sheesh! */ *rval = BOOLEAN_TO_JSVAL(JS_FALSE); - METHOD_SANITY_CHECK(); - if (switch_ivr_generate_xml_cdr(jss->session, &cdr) == SWITCH_STATUS_SUCCESS) { char *xml_text; if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Wed Nov 19 16:55:50 2008 @@ -413,7 +413,7 @@ } SWITCH_STANDARD_STREAM(stream); switch_channel_get_variables(session->channel, &stream.param_event); - switch_api_execute(cmd, arg, NULL, &stream); + switch_api_execute(cmd, arg, session, &stream); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, arg, switch_str_nil((char *) stream.data)); switch_safe_free(stream.data);

1 0