March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

27 Mar '09

Author: anthm Date: Thu Mar 26 19:27:07 2009 New Revision: 12801 Log: reduce exponential mwi notifies Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Mar 26 19:27:07 2009 @@ -477,6 +477,8 @@ sofia_presence_handle_sip_i_publish(nua, profile, nh, sofia_private, sip, tags); break; case nua_i_register: + //nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(sip->sip_contact), NUTAG_WITH_THIS(nua), TAG_END()); + //nua_handle_destroy(nh); sofia_reg_handle_sip_i_register(nua, profile, nh, sofia_private, sip, tags); break; case nua_i_state: 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 19:27:07 2009 @@ -283,6 +283,8 @@ switch_event_header_t *hp; struct mwi_helper h = { 0 }; char *pname = NULL; + const char *call_id; + const char *sub_call_id; switch_assert(event != NULL); @@ -296,6 +298,9 @@ return; } + call_id = switch_event_get_header(event, "call-id"); + sub_call_id = switch_event_get_header(event, "sub-call-id"); + dup_account = strdup(account); switch_assert(dup_account != NULL); sofia_glue_get_user_host(dup_account, &user, &host); @@ -339,30 +344,39 @@ stream.write_function(&stream, "\r\n"); - 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" - ",'%q','%q' from sip_subscriptions where event='message-summary' " - "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", - stream.data, host, user, host, host); - - switch_assert(sql != NULL); - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); - - switch_safe_free(sql); - - sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", - stream.data, user, host); - + sql = NULL; + if (sub_call_id) { + 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" + ",'%q','%q' from sip_subscriptions where event='message-summary' " + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%' and call_id='%q')", + stream.data, host, user, host, host, sub_call_id); + } else if (!call_id) { + 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" + ",'%q','%q' from sip_subscriptions where event='message-summary' " + "and sub_to_user='%q' and (sub_to_host='%q' or presence_hosts like '%%%q%%')", + stream.data, host, user, host, host); + } + + if (sql) { + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, &h); + switch_safe_free(sql); + + } else if (call_id) { + sql = switch_mprintf("select sip_user,sip_host,contact,profile_name,'%q' " + "from sip_registrations where sip_user='%q' and sip_host='%q' and call_id='%q'", + stream.data, user, host, call_id); + switch_assert(sql != NULL); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback2, &h); + } - switch_assert(sql != NULL); - sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback2, &h); switch_safe_free(sql); - switch_safe_free(stream.data); - switch_safe_free(dup_account); + if (profile) { sofia_glue_release_profile(profile); } @@ -791,6 +805,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", user, host); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", profile->name); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "VM-sub-call-id", argv[7]); switch_event_fire(&event); } return 0; 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 19:27:07 2009 @@ -1137,6 +1137,7 @@ if (switch_event_create(&s_event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, reg_host); switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", profile->name); + switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "VM-Call-ID", call_id); } } else { if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r12800 - freeswitch/trunk/scripts/contrib/swk/php/amfphp
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: silik0n Date: Thu Mar 26 18:06:23 2009 New Revision: 12800 Log: fix some errors on generic DB handler Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Thu Mar 26 18:06:23 2009 @@ -274,7 +274,8 @@ public function getDirDomainbyName($domain_name){ $query = sprintf("select * from domains where name = '%s'", $domain_name); - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results[0]; } @@ -336,7 +337,8 @@ /* Directory User Methods */ public function getDirUsersByDomainUidByUsername($domain_uid, $user_name){ $query = sprintf("select * from users where domains_uid = '%s' and username = '%s'", $domain_uid, $user_name); - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results[0]; } @@ -360,6 +362,13 @@ return $results; } + public function addDirDomainUser($domains_uid, $username, $mailbox, $cidr, $enabled) { + $dbh = $this->getDbh(); + $query = sprintf('insert into users (domains_uid, username, mailbox, cidr, enabled) values (%s, "%s", "%s", "%s", %s)', + $domain_uid, $username, $mailbox, $cidr, $enabled); + return $dbh->exec($query); + } + public function addDirDomainUserParam($users_uid, $name, $value) { $dbh = $this->getDbh(); $query = sprintf('insert into user_params (users_uid, name, value) values (%s, "%s", "%s")', $users_uid, $name, $value); @@ -415,7 +424,8 @@ public function getDirGroupsByDomianUidByUserUid($domain_uid, $user_uid){ $query = sprintf("select a.uid as groupUid, a.name as groupName, b.uid as usersUid from groups as a, group_members as b where a.uid = b.groups_uid and b.domains_uid = %s and b.users_uid = %s", $domain_uid, $user_uid) ; - $stmt = $this->dbh->query($query); + $dbh = $this->getDbh(); + $stmt = $dbh->query($query); $results = $stmt->fetchAll(); return $results; }

1 0

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

26 Mar '09

Author: gmaruzz Date: Thu Mar 26 17:02:32 2009 New Revision: 12799 Log: skypiax: added another SWITCH_API_COMMANDS to send skype_api command to the named client: skypiax interface_name 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 17:02:32 2009 @@ -41,6 +41,8 @@ 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" +SWITCH_STANDARD_API(skypiax_function); +#define SKYPIAX_SYNTAX "interface_name skype_API_msg" static struct { int debug; @@ -1044,7 +1046,8 @@ if (running){ - SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax commands", sk_function, SK_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax console commands", sk_function, SK_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "skypiax", "Skypiax interface commands", skypiax_function, SKYPIAX_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } @@ -1416,6 +1419,62 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_STANDARD_API(skypiax_function) +{ + char *mycmd = NULL, *argv[10] = { 0 }; + int argc = 0; + private_t *tech_pvt=NULL; + + + 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, "ERROR, usage: %s", SKYPIAX_SYNTAX); + goto end; + } + + if (argc < 2) { + stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX); + goto end; + } + + if (argv[0]) { + int i; + int found =0; + + 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[0], + strlen(argv[0])) == 0)) { + tech_pvt=&globals.SKYPIAX_INTERFACES[i]; + stream->write_function(stream,"Using interface: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name); + found = 1; + break; + } + + } + if(!found){ + stream->write_function(stream,"ERROR: A Skypiax interface with name='%s' was not found\n", argv[0]); + switch_safe_free(mycmd); + + return SWITCH_STATUS_SUCCESS; + } else { + skypiax_signaling_write(tech_pvt, (char *)&cmd[ strlen(argv[0]) + 1 ] ); + } + } else { + stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX); + } +end: + switch_safe_free(mycmd); + + return SWITCH_STATUS_SUCCESS; +} +

1 0

[commit] r12798 - freeswitch/trunk/scripts/contrib/swk/php/amfphp
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: silik0n Date: Thu Mar 26 17:01:48 2009 New Revision: 12798 Log: the start of merging the xml_curl fork to the amf fork Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Thu Mar 26 17:01:48 2009 @@ -272,6 +272,13 @@ return $results; } + public function getDirDomainbyName($domain_name){ + $query = sprintf("select * from domains where name = '%s'", $domain_name); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results[0]; + } + public function getDirDomain($domains_uid){ $dbh = $this->getDbh(); $query = sprintf("select * from domain_params where domains_uid = $domains_uid"); @@ -327,6 +334,13 @@ /* Directory User Methods */ + public function getDirUsersByDomainUidByUsername($domain_uid, $user_name){ + $query = sprintf("select * from users where domains_uid = '%s' and username = '%s'", $domain_uid, $user_name); + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results[0]; + } + public function getDirUser($user_uid){ $dbh = $this->getDbh(); $query = sprintf("select * from user_params where users_uid = $user_uid"); @@ -399,6 +413,13 @@ return $results; } + public function getDirGroupsByDomianUidByUserUid($domain_uid, $user_uid){ + $query = sprintf("select a.uid as groupUid, a.name as groupName, b.uid as usersUid from groups as a, group_members as b where a.uid = b.groups_uid and b.domains_uid = %s and b.users_uid = %s", $domain_uid, $user_uid) ; + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + public function getDirGroup($groups_uid){ $dbh = $this->getDbh(); $query = sprintf("select a.uid as groupMemberUid, a.users_uid as usersUid, b.username as usersUsername from group_members as a, users as b where a.groups_uid = $groups_uid and a.users_uid = b.uid") ;

1 0

[commit] r12797 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Mar '09

26 Mar '09

Author: anthm Date: Thu Mar 26 15:08:30 2009 New Revision: 12797 Log: update Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Mar 26 15:08:30 2009 @@ -1590,6 +1590,8 @@ static void *SWITCH_THREAD_FUNC system_thread(switch_thread_t *thread, void *obj) { struct system_thread_handle *sth = (struct system_thread_handle *)obj; + +#if 0 // if we are a luser we can never turn this back down, didn't we already set the stack size? #if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) struct rlimit rlim; @@ -1599,9 +1601,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setting stack size failed! (%s)\n", strerror(errno)); } #endif +#endif sth->ret = system(sth->cmd); +#if 0 #if defined(HAVE_SETRLIMIT) && !defined(__FreeBSD__) rlim.rlim_cur = SWITCH_THREAD_STACKSIZE; rlim.rlim_max = SWITCH_SYSTEM_THREAD_STACKSIZE; @@ -1610,6 +1614,7 @@ } #endif +#endif switch_mutex_lock(sth->mutex); switch_thread_cond_signal(sth->cond);

1 0

[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] 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