- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12796 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: gmaruzz Date: Thu Mar 26 14:37:10 2009 New Revision: 12796 Log: skypiax: added SWITCH_API_COMMANDS: list || console || skype_API_msg Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Thu Mar 26 14:37:10 2009 @@ -39,6 +39,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown); SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL); +SWITCH_STANDARD_API(sk_function); +#define SK_SYNTAX "list || console || skype_API_msg" static struct { int debug; @@ -59,6 +61,7 @@ char hold_music[256]; private_t SKYPIAX_INTERFACES[SKYPIAX_MAX_INTERFACES]; switch_mutex_t *mutex; + private_t *sk_console; } globals; switch_endpoint_interface_t *skypiax_endpoint_interface; @@ -1021,6 +1024,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load) { skypiax_module_pool = pool; + switch_api_interface_t *commands_api_interface; memset(&globals, '\0', sizeof(globals)); @@ -1038,9 +1042,12 @@ skypiax_endpoint_interface->io_routines = &skypiax_io_routines; skypiax_endpoint_interface->state_handler = &skypiax_state_handlers; - if (running) + if (running){ + + SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax commands", sk_function, SK_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; + } else return SWITCH_STATUS_FALSE; } @@ -1335,6 +1342,83 @@ return NULL; } +SWITCH_STANDARD_API(sk_function) +{ + char *mycmd = NULL, *argv[10] = { 0 }; + int argc = 0; + + if(globals.sk_console) + stream->write_function(stream,"sk console is: |||%s|||\n", globals.sk_console->name); + else + stream->write_function(stream,"sk console is NOT yet assigned\n"); + + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (!argc) { + stream->write_function(stream, "%s", SK_SYNTAX); + goto end; + } + + if (!strcasecmp(argv[0], "list")) { + int i; + for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) { + if (strlen(globals.SKYPIAX_INTERFACES[i].name)) { + if (strlen(globals.SKYPIAX_INTERFACES[i].session_uuid_str)) { + stream->write_function(stream,"globals.SKYPIAX_INTERFACES[%d].name=\t|||%s||| is \tBUSY, session_uuid_str=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name, globals.SKYPIAX_INTERFACES[i].session_uuid_str); + } else { + stream->write_function(stream,"globals.SKYPIAX_INTERFACES[%d].name=\t|||%s||| is \tIDLE\n", i, globals.SKYPIAX_INTERFACES[i].name); + } + } + } + } else if (!strcasecmp(argv[0], "console")) { + int i; + int found =0; + + if (argc == 2) { + for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) { + /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */ + if (strlen(globals.SKYPIAX_INTERFACES[i].name) + && + (strncmp + (globals.SKYPIAX_INTERFACES[i].name, argv[1], + strlen(argv[1])) == 0)) { + globals.sk_console=&globals.SKYPIAX_INTERFACES[i]; + stream->write_function(stream,"sk console is now: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name); + stream->write_function(stream,"sk console is: |||%s|||\n", globals.sk_console->name); + found = 1; + break; + } + + } + if(!found) + stream->write_function(stream,"ERROR: A Skypiax interface with name='%s' was not found\n", argv[1]); + } else { + + stream->write_function(stream, "-ERR Usage: sk console interface_name\n"); + goto end; + } + + + } else if (!strcasecmp(argv[0], "ciapalino")) { + + } else { + if(globals.sk_console) + skypiax_signaling_write(globals.sk_console, (char *)cmd); + else + stream->write_function(stream,"sk console is NOT yet assigned\n"); + } +end: + switch_safe_free(mycmd); + + return SWITCH_STATUS_SUCCESS; +} + + + + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r12795 - freeswitch/trunk/scripts/contrib/jtregunna
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: jtregunna Date: Thu Mar 26 14:12:45 2009 New Revision: 12795 Log: Added a simple TTS weather reporting agent. Primitive at the moment, no searching capabilities, location is fixed to Waterloo, Ontario, Canada. TODO: Create an ASR, and have it search major city centers in North America, maybe the world if I can find an easy way of doing that. Added: freeswitch/trunk/scripts/contrib/jtregunna/weather.js Added: freeswitch/trunk/scripts/contrib/jtregunna/weather.js ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jtregunna/weather.js Thu Mar 26 14:12:45 2009 @@ -0,0 +1,123 @@ +/* + * Weather application + * Copyright (c) 2009, Jeremy Tregunna, All Rights Reserved. + * Redistributable under any terms you like! + * + * Uses the Yahoo! Weather forecasting engine. http://weather.yahoo.com/ + * + * Makes use of mod_flite, should be easy to adapt to any other TTS engine. + */ +var yweather = new Namespace("http://xml.weather.yahoo.com/ns/rss/1.0"); + +var rssFile = "/usr/local/freeswitch/rss/weather.rss"; +var currentConditions = "Unknown"; +var highTemperature = lowTemperature = currentTemperature = "0"; +var doc = null; + +// XXX: Big and nasty, but the values Yahoo! Weather's RSS feed gives out for "text" attributes on yweather:condition +// really don't fit in well with any method of saying things. That is, "You can expect <foo> conditions" works for +// most cases, but falls down or reads weird, when things like "tornado conditions" are inserted into <foo>. If you +// don't mind that awkwardness, you can get rid of the conditions object, and just change the code in sayWeather() +// replacing occurences of @code with @text, of course, first removing the conditions[...] that surround fc.@code. +var conditions = new Object(); +conditions[0] = "a tornado"; +conditions[1] = "tropical storm conditions"; +conditions[2] = "hurricane conditions"; +conditions[3] = "severe thunderstorms"; +conditions[4] = "thunderstorms"; +conditions[5] = "mixture of rain and snow"; +conditions[6] = "mixture of rain and sleet"; +conditions[7] = "mixture of snow and sleet"; +conditions[8] = "freezing drizzle"; +conditions[9] = "some drizzle"; +conditions[10] = "freezing rain"; +conditions[11] = "rain showers"; +conditions[12] = "light rain showers"; +conditions[13] = "snow flurries"; +conditions[14] = "light snow"; +conditions[15] = "blowing snow"; +conditions[16] = "snow"; +conditions[17] = "periods of hail"; +conditions[18] = "sleet"; +conditions[19] = "dusty conditions"; +conditions[20] = "foggy conditions"; +conditions[21] = "hazy conditions"; +conditions[22] = "smokey conditions"; +conditions[23] = "high winds"; +conditions[24] = "windy"; +conditions[25] = "cold conditions"; +conditions[26] = "overcast conditions"; +conditions[27] = "mostly cloudy conditions"; // Night time +conditions[28] = "mostly cloudy conditions"; // Day time +conditions[29] = "partly cloudy conditions"; // Night time +conditions[30] = "partly cloudy conditions"; // Day time +conditions[31] = "clear conditions"; // Night time +conditions[32] = "sunny conditions"; // Day time +conditions[33] = "fair conditions"; // Night time +conditions[34] = "fair conditions"; // Day time +conditions[35] = "periods of mixed rain and hail"; +conditions[36] = "hot conditions"; +conditions[37] = "isolated thunderstorms"; +conditions[38] = "scattered thunderstorms"; +conditions[39] = "scattered thunderstorms"; +conditions[40] = "scattered showers"; +conditions[41] = "heavy snow"; +conditions[42] = "scattered snow flurries"; +conditions[43] = "heavy snow"; +conditions[44] = "partly cloudy conditions"; +conditions[45] = "thundershowers"; +conditions[46] = "snow flurries"; +conditions[47] = "isolated thunderstorms"; +conditions[3200] = "conditions are not available at this time"; + +/********** Say something **********/ +say = function(something) { + session.speak("flite", "rms", something); +} + +/********** Load the XML **********/ +loadXML = function(url) { + fetchURLFile(url, rssFile); + var fd = new FileIO(rssFile, "r"); + fd.read(3072); + // Need to strip out the <?xml ...?> tag otherwise we get a syntax error, silly E4X + doc = new XML(fd.data().replace(/^<\?xml\s+version\s*=\s*(["'])[^\1]+\1[^?]*\?>/, "")); +} + +/********** Say the weather **********/ +sayWeather = function() { + var currentCondition = doc.channel.item.yweather::condition.@text; + var currentTemperature = doc.channel.item.yweather::condition.@temp; + var firstLoop = true; + var forecast = "The current conditions are: "; + forecast += conditions[doc.channel.item.yweather::condition.@code]; + forecast += " and it is " + currentTemperature + " degree" + ((currentTemperature != 1) ? "s" : "") + " out.\n"; + for each(var fc in doc.channel.item.yweather::forecast) { + // XXX: Figure out why day.replace("Sun", "Sunday") et. al., doesn't actually replace the date when used here + // but when using the "js" spidermonkey executable, it does. + var day = fc.@day; + if (day == "Sun") + day = "Sunday"; + else if (day == "Mon") + day = "Monday"; + else if (day == "Tue") + day = "Tuesday"; + else if (day == "Wed") + day = "Wednesday"; + else if (day == "Thu") + day = "Thursday"; + else if (day == "Fri") + day = "Friday"; + else if (day == "Sat") + day = "Saturday"; + forecast += day + "'s forecast calls for " + conditions[fc.@code] + ", with a daytime high of "; + forecast += fc.@high + " degree" + ((fc.@high != 1) ? "s" : "") + " and a low of " + fc.@low + " degree" + ((fc.@low != 1) ? "s" : "") + ".\n"; + } + say(forecast); +} + +if (session.ready()) { + session.answer(); + loadXML("http://weather.yahooapis.com/forecastrss?p=CAXX0531&u=c"); + sayWeather(); +}

1 0

[commit] r12794 - freeswitch/trunk/scripts/contrib/jtregunna
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: intralanman Date: Thu Mar 26 14:00:00 2009 New Revision: 12794 Log: adding contrib dir for jer Added: freeswitch/trunk/scripts/contrib/jtregunna/

1 0

[commit] r12793 - freeswitch/trunk/libs/esl/php
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: mikej Date: Thu Mar 26 12:02:30 2009 New Revision: 12793 Log: work around broken php-config that only takes one option at a time Modified: freeswitch/trunk/libs/esl/php/Makefile Modified: freeswitch/trunk/libs/esl/php/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/php/Makefile (original) +++ freeswitch/trunk/libs/esl/php/Makefile Thu Mar 26 12:02:30 2009 @@ -1,5 +1,7 @@ LOCAL_CFLAGS=$(shell php-config --includes) -LOCAL_LDFLAGS=$(shell php-config --ldflags --libs) +PHP_LDFLAGS=$(shell php-config --ldflags) +PHP_LIBS=$(shell php-config --libs) +LOCAL_LDFLAGS=$(PHP_LDFLAGS) $(PHP_LIBS) WRAP_GCC_WARNING_SILENCE=-Wno-unused-label -Wno-unused-function all: ESL.so

1 0

[commit] r12792 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: anthm Date: Thu Mar 26 11:06:25 2009 New Revision: 12792 Log: MODENDP-207 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.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 Thu Mar 26 11:06:25 2009 @@ -210,7 +210,8 @@ if ((sql = switch_mprintf( "select proto,sip_user,sip_host,sub_to_user,sub_to_host,event,contact,call_id,full_from," "full_via,expires,user_agent,accept,profile_name" - ",-1,'unavailable','unavailable' from sip_subscriptions where event='presence'"))) { + ",-1,'unavailable','unavailable' from sip_subscriptions where event='presence' and hostname='%q'", + mod_sofia_globals.hostname))) { switch_mutex_lock(mod_sofia_globals.hash_mutex); for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Mar 26 11:06:25 2009 @@ -597,8 +597,11 @@ if (now) { - switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name" - " from sip_registrations where status like '%%AUTO-NAT%%' or status like '%%UDP-NAT%%'"); + switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid," + "expires,user_agent,server_user,server_host,profile_name" + " from sip_registrations where (status like '%%AUTO-NAT%%' " + "or status like '%%UDP-NAT%%') and hostname='%s'", mod_sofia_globals.hostname); + sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_nat_callback, profile); }

1 0

[commit] r12791 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: anthm Date: Thu Mar 26 10:07:44 2009 New Revision: 12791 Log: fire events on bridge in fifo Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Thu Mar 26 10:07:44 2009 @@ -1255,6 +1255,18 @@ switch_core_media_bug_resume(other_session); switch_process_import(session, other_channel, "fifo_caller_consumer_import"); switch_process_import(other_session, channel, "fifo_consumer_caller_import"); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Name", argv[0]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Action", "bridge-consumer"); + switch_event_fire(&event); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, FIFO_EVENT) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(other_channel, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Name", argv[0]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FIFO-Action", "bridge-caller"); + switch_event_fire(&event); + } switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session); switch_core_media_bug_pause(session); switch_core_media_bug_pause(other_session);

1 0

[commit] r12790 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: gmaruzz Date: Thu Mar 26 05:29:28 2009 New Revision: 12790 Log: skypiax: fixed transferred call to skype user busy in another call: was transferring using the interface name, not the skype_user. Fixed as per Jira: MODSKYPIAX-28 Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Thu Mar 26 05:29:28 2009 @@ -245,11 +245,11 @@ if (available_skypiax_interface) { /* there is a skypiax interface idle, let's transfer the call to it */ DEBUGA_SKYPE - ("Let's transfer the skype_call %s to %s interface, because we are already in a skypiax call(%s)\n", + ("Let's transfer the skype_call %s to %s interface (with skype_user: %s), because we are already in a skypiax call(%s)\n", SKYPIAX_P_LOG, tech_pvt->skype_call_id, - available_skypiax_interface->name, id); + available_skypiax_interface->name, available_skypiax_interface->skype_user, id); sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id, - available_skypiax_interface->name); + available_skypiax_interface->skype_user); } else { /* no skypiax interfaces idle, let's refuse the call */ DEBUGA_SKYPE

1 0

[commit] r12789 - freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: nmartin Date: Wed Mar 25 22:38:22 2009 New Revision: 12789 Log: for some reason, Address Book started adding "-" between numbers added replace function to clean up phone numbers before passing to FS Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt ============================================================================== Binary files. No diff available.

1 0

[commit] r12788 - freeswitch/trunk/build/config
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: mikej Date: Wed Mar 25 21:45:04 2009 New Revision: 12788 Log: fix odbc detection to not try to use odbc when no headers are installed Modified: freeswitch/trunk/build/config/odbc.m4 Modified: freeswitch/trunk/build/config/odbc.m4 ============================================================================== --- freeswitch/trunk/build/config/odbc.m4 (original) +++ freeswitch/trunk/build/config/odbc.m4 Wed Mar 25 21:45:04 2009 @@ -135,7 +135,7 @@ fi AC_MSG_CHECKING(whether to include odbc) - if test "X$ac_cv_odbc_where_lib" = "X" -a "X$ac_cv_odbc_where_inc" = "X"; then + if test "X$ac_cv_odbc_where_lib" = "X" -o "X$ac_cv_odbc_where_inc" = "X"; then ac_cv_found_odbc=no AC_MSG_RESULT(no) else

1 0

[commit] r12787 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 25 Mar '09

25 Mar '09

Author: anthm Date: Wed Mar 25 16:01:53 2009 New Revision: 12787 Log: add lock caller_control Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Mar 25 16:01:53 2009 @@ -93,7 +93,8 @@ CALLER_CONTROL_HANGUP, CALLER_CONTROL_MENU, CALLER_CONTROL_DIAL, - CALLER_CONTROL_EVENT + CALLER_CONTROL_EVENT, + CALLER_CONTROL_LOCK } caller_control_t; /* forward declaration for conference_obj and caller_control */ @@ -1280,6 +1281,42 @@ } } + +static void conference_loop_fn_lock_toggle(conference_member_t *member, caller_control_action_t *action) +{ + switch_event_t *event; + + if (member == NULL) + return; + + if (!switch_test_flag(member->conference, CFLAG_LOCKED)) { + if (member->conference->is_locked_sound) { + conference_play_file(member->conference, member->conference->is_locked_sound, CONF_DEFAULT_LEADIN, NULL, 0); + } + + switch_set_flag_locked(member->conference, CFLAG_LOCKED); + if (test_eflag(member->conference, EFLAG_LOCK) && + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_data(member->conference, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "lock"); + switch_event_fire(&event); + } + } else { + if (member->conference->is_unlocked_sound) { + conference_play_file(member->conference, member->conference->is_unlocked_sound, CONF_DEFAULT_LEADIN, NULL, 0); + } + + switch_clear_flag_locked(member->conference, CFLAG_LOCKED); + if (test_eflag(member->conference, EFLAG_UNLOCK) && + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_data(member->conference, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "unlock"); + switch_event_fire(&event); + } + } + +} + static void conference_loop_fn_deafmute_toggle(conference_member_t *member, caller_control_action_t *action) { if (member == NULL) @@ -1755,7 +1792,8 @@ {"vol listen zero", "5", CALLER_CONTROL_VOL_LISTEN_ZERO, conference_loop_fn_volume_listen_zero}, {"vol listen dn", "4", CALLER_CONTROL_VOL_LISTEN_DN, conference_loop_fn_volume_listen_dn}, {"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup}, - {"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event} + {"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event}, + {"lock", NULL, CALLER_CONTROL_LOCK, conference_loop_fn_lock_toggle} }; #define CCFNTBL_QTY (sizeof(ccfntbl)/sizeof(ccfntbl[0]))

1 0