- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10653 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by FreeSWITCH SVN 08 Dec '08

08 Dec '08

Author: anthm Date: Mon Dec 8 10:42:37 2008 New Revision: 10653 Log: add a mechanism to tell if a file played from sendmsg over event socket for the guy on the mailing list Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Dec 8 10:42:37 2008 @@ -110,6 +110,9 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_CURRENT_APPLICATION_VARIABLE "current_application" +#define SWITCH_CURRENT_APPLICATION_DATA_VARIABLE "current_application_data" +#define SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE "current_application_response" #define SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE "enable_heartbeat_events" #define SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE "bypass_media_after_bridge" #define SWITCH_READ_RESULT_VARIABLE "read_result" 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 Mon Dec 8 10:42:37 2008 @@ -1646,12 +1646,27 @@ { switch_input_args_t args = { 0 }; switch_channel_t *channel = switch_core_session_get_channel(session); + switch_status_t status; args.input_callback = on_dtmf; switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); - switch_ivr_play_file(session, NULL, data, &args); + status = switch_ivr_play_file(session, NULL, data, &args); + + switch (status) { + case SWITCH_STATUS_SUCCESS: + case SWITCH_STATUS_BREAK: + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "FILE PLAYED"); + break; + case SWITCH_STATUS_NOTFOUND: + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "FILE NOT FOUND"); + break; + default: + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, "PLAYBACK ERROR"); + break; + } + } SWITCH_STANDARD_APP(gentones_function) Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Dec 8 10:42:37 2008 @@ -1306,9 +1306,10 @@ } } - switch_channel_set_variable(channel, "current_application", application_interface->interface_name); - switch_channel_set_variable(channel, "current_application_data", arg); - + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_VARIABLE, application_interface->interface_name); + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, arg); + switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, NULL); + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", application_interface->interface_name); @@ -1325,9 +1326,11 @@ application_interface->application_function(session, arg); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE) == SWITCH_STATUS_SUCCESS) { + const char *resp = switch_channel_get_variable(session->channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE); switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", application_interface->interface_name); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", arg); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Response", resp ? resp : "_none_"); switch_event_fire(&event); }

1 0

[commit] r10652 - freeswitch/trunk/src
by FreeSWITCH SVN 08 Dec '08

08 Dec '08

Author: anthm Date: Mon Dec 8 10:30:08 2008 New Revision: 10652 Log: remove min session heartbeat 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 Mon Dec 8 10:30:08 2008 @@ -896,7 +896,7 @@ { switch_assert(session != NULL); - if (seconds < 10) { + if (!seconds) { seconds = 60; }

1 0

[commit] r10651 - in freeswitch/trunk/src/mod: endpoints/mod_sofia event_handlers/mod_event_socket
by FreeSWITCH SVN 08 Dec '08

08 Dec '08

Author: anthm Date: Mon Dec 8 10:28:01 2008 New Revision: 10651 Log: difference between invalid uuid and no uuid Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Dec 8 10:28:01 2008 @@ -1533,10 +1533,6 @@ switch_assert(sql != NULL); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); - if (exp_raw >= 180) { - exp_raw -= 120; - } - sstr = switch_mprintf("active;expires=%ld", exp_raw); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Dec 8 10:28:01 2008 @@ -1228,7 +1228,8 @@ } else if (listener->session && !strncasecmp(cmd, "sendmsg", 7)) { char *uuid = cmd + 8; switch_core_session_t *session = NULL; - + switch_bool_t uuid_supplied = SWITCH_FALSE; + if (uuid) { while (*uuid == ' ') { uuid++; @@ -1245,7 +1246,11 @@ uuid = switch_event_get_header(*event, "session-id"); } - if (uuid && (session = switch_core_session_locate(uuid))) { + if (uuid) { + uuid_supplied = SWITCH_TRUE; + } + + if (uuid_supplied && (session = switch_core_session_locate(uuid))) { if ((status = switch_core_session_queue_private_event(session, event)) == SWITCH_STATUS_SUCCESS) { switch_snprintf(reply, reply_len, "+OK"); } else { @@ -1254,10 +1259,14 @@ switch_core_session_rwunlock(session); } else { if (switch_test_flag(listener, LFLAG_ASYNC)) { - if ((status = switch_core_session_queue_private_event(listener->session, event)) == SWITCH_STATUS_SUCCESS) { - switch_snprintf(reply, reply_len, "+OK"); + if (!uuid_supplied) { + switch_snprintf(reply, reply_len, "-ERR invalid session id [%s]", switch_str_nil(uuid)); } else { - switch_snprintf(reply, reply_len, "-ERR memory error"); + if ((status = switch_core_session_queue_private_event(listener->session, event)) == SWITCH_STATUS_SUCCESS) { + switch_snprintf(reply, reply_len, "+OK"); + } else { + switch_snprintf(reply, reply_len, "-ERR memory error"); + } } } else { switch_ivr_parse_event(listener->session, *event);

1 0

[commit] r10650 - in freeswitch/trunk/scripts/contrib/intralanman/C/lcr: . mod_lcr
by FreeSWITCH SVN 08 Dec '08

08 Dec '08

Author: intralanman Date: Mon Dec 8 00:33:39 2008 New Revision: 10650 Log: update to allow secondary order by Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/lcr.conf.xml freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/lcr.conf.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/C/lcr/lcr.conf.xml (original) +++ freeswitch/trunk/scripts/contrib/intralanman/C/lcr/lcr.conf.xml Mon Dec 8 00:33:39 2008 @@ -6,15 +6,15 @@ <profiles> <profile name="default"> <param name="id" value="0"/> - <param name="order_by" value="rate"/> + <param name="order_by" value="rate,quality,reliability"/> </profile> - <profile name="quality"> + <profile name="qual_rel"> <param name="id" value="1"/> - <param name="order_by" value="quality"/> + <param name="order_by" value="quality,reliability"/> </profile> - <profile name="reliability"> + <profile name="rel_qual"> <param name="id" value="2"/> - <param name="order_by" value="reliability"/> + <param name="order_by" value="reliability,quality"/> </profile> </profiles> </configuration> Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c Mon Dec 8 00:33:39 2008 @@ -339,7 +339,7 @@ if(profile->id > 0) { sql_stream.write_function(&sql_stream, "AND lcr_profile=%d ", profile->id); } - sql_stream.write_function(&sql_stream, "ORDER BY digits DESC, %s", profile->order_by); + sql_stream.write_function(&sql_stream, "ORDER BY digits DESC%s", profile->order_by); if(db_random) { sql_stream.write_function(&sql_stream, ", %s", db_random); } @@ -392,16 +392,19 @@ /* define default profile */ profile = switch_core_alloc(globals.pool, sizeof(*profile)); profile->name = "global_default"; - profile->order_by = "rate"; + profile->order_by = ", rate"; globals.default_profile = profile; switch_core_hash_init(&globals.profile_hash, globals.pool); if((x_profiles = switch_xml_child(cfg, "profiles"))) { for (x_profile = switch_xml_child(x_profiles, "profile"); x_profile; x_profile = x_profile->next) { char *name = (char *) switch_xml_attr_soft(x_profile, "name"); - char *order_by = NULL; + switch_stream_handle_t order_by = { 0 }; char *id_s = NULL; + int argc, x = 0; + char *argv[4] = { 0 }; + SWITCH_STANDARD_STREAM(order_by); for (param = switch_xml_child(x_profile, "param"); param; param = param->next) { char *var, *val; @@ -409,12 +412,30 @@ val = (char *) switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "order_by") && !switch_strlen_zero(val)) { - if (!strcasecmp(val, "quality")) { - order_by = "quality DESC"; - } else if(!strcasecmp(val, "reliability")) { - order_by = "reliability DESC"; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "param val is %s\n", val); + if ((argc = switch_separate_string(val, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { + for (x=0; x<argc; x++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "arg #%d/%d is %s\n", x, argc, argv[x]); + if(!switch_strlen_zero(argv[x])) { + if (!strcasecmp(argv[x], "quality")) { + order_by.write_function(&order_by, ", quality DESC"); + } else if(!strcasecmp(argv[x], "reliability")) { + order_by.write_function(&order_by, ", reliability DESC"); + } else { + order_by.write_function(&order_by, ", %s", argv[x]); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "arg #%d is empty\n", x); + } + } } else { - order_by = val; + if (!strcasecmp(val, "quality")) { + order_by.write_function(&order_by, ", quality DESC"); + } else if(!strcasecmp(val, "reliability")) { + order_by.write_function(&order_by, ", reliability DESC"); + } else { + order_by.write_function(&order_by, ", %s", val); + } } } else if (!strcasecmp(var, "id") && !switch_strlen_zero(val)) { id_s = val; @@ -427,11 +448,12 @@ profile = switch_core_alloc(globals.pool, sizeof(*profile)); profile->name = switch_core_strdup(globals.pool, name); - if(!switch_strlen_zero(order_by)) { - profile->order_by = switch_core_strdup(globals.pool, order_by); + if(!switch_strlen_zero((char *)order_by.data)) { + profile->order_by = switch_core_strdup(globals.pool, (char *)order_by.data); + switch_safe_free(order_by.data); } else { /* default to rate */ - profile->order_by = "rate"; + profile->order_by = ", rate"; } if(!switch_strlen_zero(id_s)) { profile->id = atoi(id_s);

1 0

[commit] r10649 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by FreeSWITCH SVN 07 Dec '08

07 Dec '08

Author: mikej Date: Sun Dec 7 18:09:26 2008 New Revision: 10649 Log: cepstral osx build try Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Sun Dec 7 18:09:26 2008 @@ -1,6 +1,6 @@ LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm" ; fi ; -LOCAL_INSERT_CFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; fi ; +LOCAL_INSERT_CFLAGS=if test $$osarch = "Darwin" ; then echo "-I/Library/Frameworks/swift.framework/Versions/5/Headers/" ; else echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; fi ; LOCAL_CFLAGS=-w include ../../../../build/modmake.rules Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Sun Dec 7 18:09:26 2008 @@ -38,11 +38,7 @@ #ifdef __ICC #pragma warning (disable:188) #endif -#ifdef MACOSX -#include <swift/swift.h> -#else #include <swift.h> -#endif #include <switch.h> #define MY_BUF_LEN 1024 * 32

1 0

[commit] r10648 - in freeswitch/trunk/scripts/contrib/intralanman/C/lcr: . mod_lcr
by FreeSWITCH SVN 07 Dec '08

07 Dec '08

Author: intralanman Date: Sun Dec 7 17:36:33 2008 New Revision: 10648 Log: add support for ordering by rate, quality, or reliability... more to come Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/lcr.conf.xml freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/lcr.conf.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/C/lcr/lcr.conf.xml (original) +++ freeswitch/trunk/scripts/contrib/intralanman/C/lcr/lcr.conf.xml Sun Dec 7 17:36:33 2008 @@ -1,6 +1,20 @@ -<configuration name="lcr.conf" description="LIMIT Configuration"> +<configuration name="lcr.conf" description="LCR Configuration"> <settings> -  - <param name="odbc-dsn" value="freeswitch-pgsql:freeswitch:Fr33Sw1tch"/> + <param name="odbc-dsn" value="freeswitch-mysql:freeswitch:Fr33Sw1tch"/> + </settings> + <profiles> + <profile name="default"> + <param name="id" value="0"/> + <param name="order_by" value="rate"/> + </profile> + <profile name="quality"> + <param name="id" value="1"/> + <param name="order_by" value="quality"/> + </profile> + <profile name="reliability"> + <param name="id" value="2"/> + <param name="order_by" value="reliability"/> + </profile> + </profiles> </configuration> Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c Sun Dec 7 17:36:33 2008 @@ -101,6 +101,13 @@ typedef struct max_obj max_obj_t; typedef max_obj_t *max_len; +struct profile_obj { + char *name; + uint16_t id; + char *order_by; +}; +typedef struct profile_obj profile_t; + struct callback_obj { lcr_route head; int matches; @@ -114,6 +121,8 @@ char *odbc_dsn; switch_mutex_t *mutex; switch_odbc_handle_t *master_odbc; + switch_hash_t *profile_hash; + profile_t *default_profile; void *filler1; } globals; @@ -293,16 +302,25 @@ return SWITCH_STATUS_SUCCESS; } -switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits, uint16_t lcr_profile) { +switch_status_t lcr_do_lookup(callback_t *cb_struct, char *digits, char* profile_name) { /* instantiate the object/struct we defined earlier */ switch_stream_handle_t sql_stream = { 0 }; size_t n, digit_len = strlen(digits); char *digits_copy; + profile_t *profile; switch_bool_t lookup_status; if (switch_strlen_zero(digits)) { return SWITCH_FALSE; } + + /* locate the profile */ + if(switch_strlen_zero(profile_name)) { + profile = globals.default_profile; + } else if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); + return SWITCH_STATUS_FALSE; + } digits_copy = strdup(digits); @@ -318,10 +336,10 @@ sql_stream.write_function(&sql_stream, "%s%s", (n==digit_len ? "" : ", "), digits_copy); } sql_stream.write_function(&sql_stream, ") AND CURRENT_TIMESTAMP BETWEEN date_start AND date_end "); - if(lcr_profile > 0) { - sql_stream.write_function(&sql_stream, "AND lcr_profile=%d ", lcr_profile); + if(profile->id > 0) { + sql_stream.write_function(&sql_stream, "AND lcr_profile=%d ", profile->id); } - sql_stream.write_function(&sql_stream, "ORDER BY digits DESC, rate"); + sql_stream.write_function(&sql_stream, "ORDER BY digits DESC, %s", profile->order_by); if(db_random) { sql_stream.write_function(&sql_stream, ", %s", db_random); } @@ -341,10 +359,11 @@ static switch_status_t lcr_load_config() { char *cf = "lcr.conf"; - switch_xml_t cfg, xml, settings, param; + switch_xml_t cfg, xml, settings, param, x_profile, x_profiles; switch_status_t status = SWITCH_STATUS_SUCCESS; char *odbc_user = NULL; char *odbc_pass = NULL; + profile_t *profile = 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); @@ -369,6 +388,65 @@ } } } + + /* define default profile */ + profile = switch_core_alloc(globals.pool, sizeof(*profile)); + profile->name = "global_default"; + profile->order_by = "rate"; + globals.default_profile = profile; + + switch_core_hash_init(&globals.profile_hash, globals.pool); + if((x_profiles = switch_xml_child(cfg, "profiles"))) { + for (x_profile = switch_xml_child(x_profiles, "profile"); x_profile; x_profile = x_profile->next) { + char *name = (char *) switch_xml_attr_soft(x_profile, "name"); + char *order_by = NULL; + char *id_s = NULL; + + for (param = switch_xml_child(x_profile, "param"); param; param = param->next) { + char *var, *val; + + var = (char *) switch_xml_attr_soft(param, "name"); + val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "order_by") && !switch_strlen_zero(val)) { + if (!strcasecmp(val, "quality")) { + order_by = "quality DESC"; + } else if(!strcasecmp(val, "reliability")) { + order_by = "reliability DESC"; + } else { + order_by = val; + } + } else if (!strcasecmp(var, "id") && !switch_strlen_zero(val)) { + id_s = val; + } + } + + if(switch_strlen_zero(name)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No name specified.\n"); + } else { + profile = switch_core_alloc(globals.pool, sizeof(*profile)); + profile->name = switch_core_strdup(globals.pool, name); + + if(!switch_strlen_zero(order_by)) { + profile->order_by = switch_core_strdup(globals.pool, order_by); + } else { + /* default to rate */ + profile->order_by = "rate"; + } + if(!switch_strlen_zero(id_s)) { + profile->id = atoi(id_s); + } + + switch_core_hash_insert(globals.profile_hash, profile->name, profile); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loaded lcr profile %s.\n", profile->name); + } + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No lcr profiles defined.\n"); + } + + + if (globals.odbc_dsn) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO , "dsn is \"%s\", user is \"%s\", and password is \"%s\"\n" @@ -414,7 +492,7 @@ callback_t routes = { 0 }; lcr_route cur_route = { 0 }; char *bridge_data = NULL; - uint16_t lcr_profile = 0; + char *lcr_profile = NULL; if (!caller_profile) { caller_profile = switch_channel_get_caller_profile(channel); @@ -467,7 +545,7 @@ char *rbp = rbuf; switch_size_t l = 0, rbl = sizeof(rbuf); uint32_t cnt = 1; - uint16_t lcr_profile = 0; + char *lcr_profile = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); char *last_delim = "|"; callback_t routes = { 0 }; @@ -480,13 +558,7 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { dest = argv[0]; if(argc > 1) { - if((uint16_t)atoi(argv[1]) > 0 && (uint16_t)atoi(argv[1]) < 0xFFFF) { - lcr_profile = (uint16_t)atoi(argv[1]); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "lcr profile MUST be an integer NOT '%s'\n", argv[1] - ); - } + lcr_profile = argv[1]; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s\n", dest); @@ -518,7 +590,7 @@ char *mydata = NULL; char *dialstring = NULL; char *destination_number = NULL; - uint16_t lcr_profile = 0; + char *lcr_profile = NULL; lcr_route current = NULL; max_obj_t maximum_lengths = { 0 }; callback_t cb_struct = { 0 }; @@ -534,14 +606,7 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destination_number = strdup(argv[0]); if(argc > 1) { - if((uint16_t)atoi(argv[1]) > 0 && (uint16_t)atoi(argv[1]) < 0xFFFF) { - lcr_profile = (uint16_t)atoi(argv[1]); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR - , "lcr profile MUST be an integer, NOT '%s'\n", argv[1] - ); - goto usage; - } + lcr_profile = argv[1]; } cb_struct.lookup_number = destination_number; @@ -635,6 +700,7 @@ #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");

1 0

[commit] r10647 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by FreeSWITCH SVN 07 Dec '08

07 Dec '08

Author: mikej Date: Sun Dec 7 17:25:19 2008 New Revision: 10647 Log: add framework to cflags Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Sun Dec 7 17:25:19 2008 @@ -1,6 +1,6 @@ LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm" ; fi ; -LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; +LOCAL_INSERT_CFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; fi ; LOCAL_CFLAGS=-w include ../../../../build/modmake.rules

1 0

[commit] r10646 - freeswitch/trunk/libs/libdingaling/src
by FreeSWITCH SVN 07 Dec '08

07 Dec '08

Author: anthm Date: Sun Dec 7 17:11:34 2008 New Revision: 10646 Log: LIBDING-10 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Sun Dec 7 17:11:34 2008 @@ -1177,7 +1177,7 @@ } break; case IKS_NODE_NORMAL: - if (node && strcmp("stream:features", iks_name_nons(node)) == 0) { + if (node && strcmp("stream:features", iks_name(node)) == 0) { handle->features = iks_stream_features(node); if (ldl_test_flag(handle, LDL_FLAG_TLS) && !iks_is_secure(handle->parser)) break;

1 0

[commit] r10645 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 Dec '08

07 Dec '08

Author: brian Date: Sun Dec 7 16:19:37 2008 New Revision: 10645 Log: bugs me Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sun Dec 7 16:19:37 2008 @@ -856,7 +856,7 @@ " <rpid:activities>\r\n" " <rpid:%s/>\n" " </rpid:activities>\n" - " <dm:note>%s</dm:note>" + " <dm:note>%s</dm:note>\n" " </dm:person>\n" "</presence>", id, open, prpid, status); }

1 0

[commit] r10644 - freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr
by FreeSWITCH SVN 07 Dec '08

07 Dec '08

Author: intralanman Date: Sun Dec 7 15:10:32 2008 New Revision: 10644 Log: add rupa's patch for detecting rand on diff db's Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/scripts/contrib/intralanman/C/lcr/mod_lcr/mod_lcr.c Sun Dec 7 15:10:32 2008 @@ -57,6 +57,9 @@ "Dialstring", }; +/* sql for random function */ +char *db_random = NULL; + struct odbc_obj { switch_odbc_handle_t *handle; SQLHSTMT stmt; @@ -198,10 +201,34 @@ return SWITCH_STATUS_SUCCESS; } +/* try each type of random until we suceed */ +static switch_bool_t set_db_random() { + char *sql = NULL; + if (globals.odbc_dsn) { + sql = "SELECT * FROM lcr ORDER BY rand() LIMIT 1"; + if(switch_odbc_handle_exec(globals.master_odbc, sql, NULL) + == SWITCH_ODBC_SUCCESS) { + db_random = "rand()"; + return SWITCH_TRUE; + } + sql = "SELECT * FROM lcr ORDER BY random() LIMIT 1"; + if(switch_odbc_handle_exec(globals.master_odbc, sql, NULL) + == SWITCH_ODBC_SUCCESS) { + db_random = "random()"; + return SWITCH_TRUE; + } + } + return SWITCH_FALSE; +} + 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; + if(switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata) + == SWITCH_ODBC_FAIL) { + return SWITCH_FALSE; + } else { + return SWITCH_TRUE; + } } return SWITCH_FALSE; } @@ -271,6 +298,7 @@ switch_stream_handle_t sql_stream = { 0 }; size_t n, digit_len = strlen(digits); char *digits_copy; + switch_bool_t lookup_status; if (switch_strlen_zero(digits)) { return SWITCH_FALSE; @@ -293,14 +321,22 @@ if(lcr_profile > 0) { sql_stream.write_function(&sql_stream, "AND lcr_profile=%d ", lcr_profile); } - sql_stream.write_function(&sql_stream, "ORDER BY digits DESC, rate, rand();"); + sql_stream.write_function(&sql_stream, "ORDER BY digits DESC, rate"); + if(db_random) { + sql_stream.write_function(&sql_stream, ", %s", db_random); + } + sql_stream.write_function(&sql_stream, ";"); 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); + lookup_status = lcr_execute_sql_callback((char *)sql_stream.data, route_add_callback, cb_struct); switch_safe_free(sql_stream.data); - return SWITCH_STATUS_SUCCESS; + if(lookup_status) { + return SWITCH_STATUS_SUCCESS; + } else { + return SWITCH_STATUS_GENERR; + } } static switch_status_t lcr_load_config() { @@ -486,6 +522,7 @@ lcr_route current = NULL; max_obj_t maximum_lengths = { 0 }; callback_t cb_struct = { 0 }; + switch_status_t lookup_status = SWITCH_STATUS_SUCCESS; //switch_malloc(maximum_lengths, sizeof(max_obj_t)); if (switch_strlen_zero(cmd)) { @@ -511,9 +548,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO , "data passed to lcr is [%s]\n", cmd ); + lookup_status = lcr_do_lookup(&cb_struct, destination_number, lcr_profile); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO , "lcr lookup returned [%d]\n" - , lcr_do_lookup(&cb_struct, destination_number, lcr_profile) + , lookup_status ); if (cb_struct.head != NULL) { size_t len; @@ -568,7 +606,11 @@ destroy_list(&cb_struct.head); switch_safe_free(dialstring); } else { - stream->write_function(stream, "No Routes To Display\n"); + if(lookup_status == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "No Routes To Display\n"); + } else { + stream->write_function(stream, "Error looking up routes\n"); + } } } @@ -601,6 +643,12 @@ 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"); } + + if(set_db_random() == SWITCH_TRUE) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Database RANDOM function set to %s\n", db_random); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to determine database RANDOM function\n"); + }; SWITCH_ADD_API(dialplan_lcr_api_interface, "lcr", "Least Cost Routing Module", dialplan_lcr_function, LCR_SYNTAX); SWITCH_ADD_APP(app_interface, "lcr", "Perform an LCR lookup", "Perform an LCR lookup",

1 0