April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13072 - freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory
by FreeSWITCH SVN 17 Apr '09

17 Apr '09

Author: nmartin Date: Thu Apr 16 23:14:48 2009 New Revision: 13072 Log: New and improved Dial By Name Directory, includes an actual helpful README, example usage, and a generic phrase macro that uses stock FreeSWITCH IVR prompts. Refactored about 60 lines of code out of the original aadir.js, added comments and debugging. Added: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/ freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.xml Added: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/README Thu Apr 16 23:14:48 2009 @@ -0,0 +1,64 @@ +Dial By Name Directory +Nik Martin +For support, contact me at freeswitch(a)servercorps.com + +======================= +Nostly From the Original Code: +Original Code Author: John Wehle +Date: November 6, 2008 +Copyright (c) 2008 Feith Systems and Software, Inc. +All Rights Reserved +======================= + + +If the prior author's claimed copyright is infringed by the one I claim we'll +work it out, BUT I prefer a much looser license: +============================================================== +Copyright (c) 2009 Nik Martin + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +The original author of this work, Nik Martin, must be credited +as the original author of this work. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +============================================================== + +dial_by_name_directory.xml is a phrase macro for the beginning of the directory app. +dial_by_name_directory.js is the directory app itself. + +Place dial_by_name_directory somewhere in conf/lang/en/ maybe in a folder named directory? +edit en.xml in conf/lang/en to include the directory/ directory (uh-oh, bad name) + +drop dial_by_name_directpry.js in scripts/ + +in the dial plan, execute the dial by name directpry like: + +<extension name="dial_by_name"> + <condition field="destination_number" expression="^6000$"> + <action application="javascript" data="dial_by_name_directory.js" /> + </condition> +</extension> + +or, from an IVR: + +<entry action="menu-exec-app" digits="9" param="javascript dial_by_name_directory.js"/> \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.js Thu Apr 16 23:14:48 2009 @@ -0,0 +1,209 @@ +/** +======================= +Mostly From the Original Code aadir.js: +Original Code Author: John Wehle +Date: November 6, 2008 +Copyright (c) 2008 Feith Systems and Software, Inc. +All Rights Reserved +======================= + + +If the prior author's claimed copyright is infringed by the one I claim we'll +work it out, BUT I prefer a much looser MIT license: +============================================================== +Copyright (c) 2009 Nik Martin + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +The original author of this work, Nik Martin, must be credited +as the original author of this work. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +============================================================== +*/ + +var digitTimeOut = 3000; +var interDigitTimeOut = 1000; +var absoluteTimeOut = 10000; +var base_dir = session.getVariable ("base_dir"); +var domain = session.getVariable ("domain"); +var voicemail_path = base_dir + "/storage/voicemail/default/" + domain + "/"; +var file_exts = [ ".wav", ".mp3" ]; +var extRE = /^1[0-9][0-9][0-9]$/g; +var operator = "operator"; +var directory; + +var translations = [ "0", + "QZ", "ABC", "DEF", + "GHI", "JKL", "MNO", + "PQRS", "TUV", "WXYZ" ]; +var extension = ""; +var dtmf_digits = ""; + + +/** + * Build an array of [last_namefirst_name,extension]. + * matches will then start at last name and go until + * a unique match emerges: + * martinnik and martinmatt match until the a in matt and i in nik + * + * @return the image at the specified URL + */ + +function build_directory_list() { + var i; + var name; + var number; + var dir = apiExecute ("xml_locate", "directory domain name " + domain); + var re = /\s+$/g; + var length = dir.search (re); + if (length == -1) + length = dir.length; + dir = dir.substring (0, length); + var xdir = new XML (dir); + directory = new Array (); + i = 0; + re = /[^A-Z0-9\s]/gi; + for each (var variables in xdir.groups.group.users.user.variables) { + + name = ""; + number = ""; + for each (variable in variables.variable) { + if (variable.(a)name.toString() == "effective_caller_id_name") + name = variable.(a)value.toString(); + + //clean up the name string, letters and numbers only + name = name.replace (re, ""); + if (variable.(a)name.toString() == "effective_caller_id_number") + number = variable.(a)value.toString(); + } + if (name.length == 0 || number.length == 0 || number.search (extRE) == -1) + continue; + directory[i] = new Array (2); + //make the name look like LastnameFirstname + name = name.split(" ")[1] + name.split(" ")[0]; + directory[i][0] = name; + directory[i][1] = number; + console_log ("debug", directory[i][0] + ":" + directory[i][1] + "\n"); + i++; + } +} + +function directory_lookup (digits) { + var i; + var match = ""; + var pattern = "^"; + var re; + if (digits.length && digits[0] == 0) + return 0; + for (i = 0; i < digits.length; i++) { + if (isNaN (parseInt (digits[i], 10))) + return -1; + //build a regex pattern to match against + pattern += "[" + translations[parseInt (digits[i], 10)] + "]"; + console_log("debug", "pattern: " + pattern + "\n"); + } + re = new RegExp (pattern, "i"); + for (i = 0; i < directory.length; i++) + if (directory[i][0].search (re) != -1) { + if (! isNaN (parseInt (match, 10))) + return ""; + match = directory[i][1]; + } + if (isNaN (parseInt (match, 10))) + return -1; + return match; +} +function on_dtmf (session, type, obj, arg) { + if (type == "dtmf") { + dtmf_digits += obj.digit; + extension = directory_lookup (dtmf_digits) + return false; + } + return true; +} +function directory_prompt () { + var choice; + var index; + var repeat; + extension = ""; + choice = ""; + repeat = 0; + while (session.ready() && repeat < 3) { + /* play phrase - if digit keyed while playing callback will catch them*/ + session.sayPhrase ("dial_by_name_directory", "#", "", on_dtmf, ""); + choice = dtmf_digits; + while ( isNaN (parseInt (extension, 10)) ) { + if (! session.ready ()) + return ""; + dtmf_digits = session.getDigits (1, '#', digitTimeOut, + interDigitTimeOut, absoluteTimeOut); + choice += dtmf_digits; + console_log ("debug", "choice: " + choice + "\n"); + extension = directory_lookup(choice); + } + if (parseInt (extension, 10) >= 0) + break; + session.sayPhrase ("voicemail_invalid_extension", "#", "", on_dtmf, ""); + dtmf_digits = ""; + extension = ""; + choice = ""; + repeat++; + session.flushDigits (); + } + return extension; +} +var choice = ""; +var fd; +var i; +var recorded_name; +session.answer (); +session.execute("sleep", "1000"); +console_log("info", "loading dial-by-name directory\n"); +build_directory_list(); +dtmf_digits = ""; +session.flushDigits (); +choice = directory_prompt (); + +if (! session.ready ()) { + session.hangup(); + exit(); +} + +//this must try to determine if the extension is a number, but it seems that +//non-integer extension are ok in FS. Leftover from original code +if ( isNaN (parseInt (choice, 10)) || parseInt (choice, 10) <= 0) { + session.execute ("transfer", operator + " XML default"); + exit(); +} + +for (i = 0; i < file_exts.length; i++) { + recorded_name = voicemail_path + choice + "/recorded_name" + file_exts[i]; + fd = new File (recorded_name); + if (fd.exists) { + session.streamFile (recorded_name); + break; + } +} +session.execute ("phrase", "spell," + choice); +session.execute ("transfer", choice + " XML features"); +exit(); \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/dial_by_name_directory/dial_by_name_directory.xml Thu Apr 16 23:14:48 2009 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<include> + + +<macro name="dial_by_name_directory"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="ivr/ivr-use_telephone_keypad.wav"/> +  + <action function="play-file" data="ivr/ivr-spell_name.wav"/> + <action function="play-file" data="ivr/ivr-last_name_first.wav"/> + </match> + </input> + </macro> + + + +</include>

1 0

[commit] r13071 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 17 Apr '09

17 Apr '09

Author: mcollins Date: Thu Apr 16 22:50:11 2009 New Revision: 13071 Log: Mas translations on el Spanish phrase-o file-o Modified: freeswitch/trunk/docs/phrase/phrase_es.xml Modified: freeswitch/trunk/docs/phrase/phrase_es.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_es.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_es.xml Thu Apr 16 22:50:11 2009 @@ -204,23 +204,23 @@ <prompt phrase="En punto" filename="oclock.wav"/> <prompt phrase="oh" filename="oh.wav"/> <prompt phrase="P.M." filename="p-m.wav"/> - <prompt phrase="Second" filename="second.wav"/> - <prompt phrase="Seconds" filename="seconds.wav"/> - <prompt phrase="Today" filename="today.wav"/> - <prompt phrase="Tomorrow" filename="tomorrow.wav"/> - <prompt phrase="Yesterday" filename="yesterday.wav"/> + <prompt phrase="Segundo" filename="second.wav"/> + <prompt phrase="Segundos" filename="seconds.wav"/> + <prompt phrase="Hoy" filename="today.wav"/> + <prompt phrase="Ma�ana" filename="tomorrow.wav"/> + <prompt phrase="Ayer" filename="yesterday.wav"/> </time> <voicemail> - <prompt phrase="The person at extension" filename="vm-person.wav"/> - <prompt phrase="marked urgent" filename="vm-marked-urgent.wav"/> - <prompt phrase="emailed" filename="vm-emailed.wav"/> - <prompt phrase="you have" filename="vm-you_have.wav"/> - <prompt phrase="please enter your i d, followed by" filename="vm-enter_id.wav"/> - <prompt phrase="please enter your password, followed by" filename="vm-enter_pass.wav"/> - <prompt phrase="login incorrect" filename="vm-fail_auth.wav"/> - <prompt phrase="welcome to your voicemail" filename="vm-hello.wav"/> - <prompt phrase="goodbye" filename="vm-goodbye.wav"/> - <prompt phrase="at the tone please record your name, press any key or stop talking to end the recording." filename="vm-record_name1.wav"/> + <prompt phrase="La persona a la extensi�n" filename="vm-person.wav"/> + <prompt phrase="marcado urgente" filename="vm-marked-urgent.wav"/> + <prompt phrase="correo electr�nico" filename="vm-emailed.wav"/> + <prompt phrase="usted tiene" filename="vm-you_have.wav"/> + <prompt phrase="por favor ingrese su numero de usuario, seguido por" filename="vm-enter_id.wav"/> + <prompt phrase="por favor ingrese su contrase�a, seguido por" filename="vm-enter_pass.wav"/> + <prompt phrase="inicio de sesi�n incorrectos" filename="vm-fail_auth.wav"/> + <prompt phrase="bienvenido a su buz�n de voz" filename="vm-hello.wav"/> + <prompt phrase="Gracias por llamar" filename="vm-goodbye.wav"/> + <prompt phrase="En el tono, por favor anote su nombre, pulse cualquier tecla o dejar de hablar para poner fin a la grabaci�n." filename="vm-record_name1.wav"/> <prompt phrase="choose a greeting between 1 and 9" filename="vm-choose_greeting_choose.wav"/> <prompt phrase="invalid value" filename="vm-choose_greeting_fail.wav"/> <prompt phrase="too many failed attempts" filename="vm-abort.wav"/>

1 0

[commit] r13070 - freeswitch/trunk/src/mod/applications/mod_cluechoo
by FreeSWITCH SVN 17 Apr '09

17 Apr '09

Author: anthm Date: Thu Apr 16 22:38:40 2009 New Revision: 13070 Log: up Modified: freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c Modified: freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c Thu Apr 16 22:38:40 2009 @@ -217,7 +217,7 @@ int hangover = 40, hangunder = 15; int talking = 0; int energy_level = 500; - + int done = 0; switch_core_session_get_read_impl(session, &read_impl); printf("%s", SWITCH_SEQ_CLEARSCR); @@ -245,15 +245,18 @@ for (x = COLS - 1; ; --x) { - if (!switch_channel_ready(channel)) { - break; + if (!done && !switch_channel_ready(channel)) { + done = 1; } - - status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); - if (!SWITCH_READ_ACCEPTABLE(status)) { - break; + + if (!done) { + status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { + done = 1; + } } - + + if (!done) { int16_t *fdata = (int16_t *) read_frame->data; uint32_t samples = read_frame->datalen / sizeof(*fdata); @@ -261,6 +264,7 @@ double energy = 0; int divisor = 0; + for (count = 0; count < samples; count++) { energy += abs(fdata[j]); j += read_impl.number_of_channels; @@ -296,11 +300,13 @@ } } } - } - if (!talking) { - x++; - continue; + if (!talking) { + x++; + continue; + } + } else { + usleep(20000); } if (LOGO == 0) { @@ -310,8 +316,6 @@ } refresh(); - - /* if (x == COLS / 4) { sleep(2);

1 0

[commit] r13069 - in freeswitch/trunk: build conf/autoload_configs
by FreeSWITCH SVN 17 Apr '09

17 Apr '09

Author: anthm Date: Thu Apr 16 22:05:33 2009 New Revision: 13069 Log: clue choo Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/autoload_configs/modules.conf.xml Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Thu Apr 16 22:05:33 2009 @@ -21,6 +21,7 @@ #applications/mod_vmd #applications/mod_memcache #applications/mod_spy +applications/mod_cluechoo #asr_tts/mod_flite #asr_tts/mod_pocketsphinx #asr_tts/mod_cepstral Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Thu Apr 16 22:05:33 2009 @@ -49,6 +49,7 @@ <load module="mod_limit"/> <load module="mod_esf"/> <load module="mod_fsv"/> + <load module="mod_cluechoo"/>

1 0

[commit] r13068 - freeswitch/trunk/src/mod/applications/mod_cluechoo
by FreeSWITCH SVN 17 Apr '09

17 Apr '09

Author: anthm Date: Thu Apr 16 22:03:20 2009 New Revision: 13068 Log: clue choo Added: freeswitch/trunk/src/mod/applications/mod_cluechoo/ freeswitch/trunk/src/mod/applications/mod_cluechoo/Makefile freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c freeswitch/trunk/src/mod/applications/mod_cluechoo/sl.h Added: freeswitch/trunk/src/mod/applications/mod_cluechoo/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_cluechoo/Makefile Thu Apr 16 22:03:20 2009 @@ -0,0 +1,2 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules Added: freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_cluechoo/mod_cluechoo.c Thu Apr 16 22:03:20 2009 @@ -0,0 +1,492 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005-2009, Anthony Minessale II <anthm(a)freeswitch.org> + * + * 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 <anthm(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthm(a)freeswitch.org> + * Neal Horman <neal at wanlink dot com> + * + * + * mod_cluechoo.c -- Framework Demo Module + * + */ +#include <switch.h> + +/* Prototypes */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cluechoo_shutdown); +SWITCH_MODULE_RUNTIME_FUNCTION(mod_cluechoo_runtime); +SWITCH_MODULE_LOAD_FUNCTION(mod_cluechoo_load); + +/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) + * Defines a switch_loadable_module_function_table_t and a static const char[] modname + */ +SWITCH_MODULE_DEFINITION(mod_cluechoo, mod_cluechoo_load, mod_cluechoo_shutdown, NULL); + +int add_D51(); +int add_sl(); +int add_man(); +int add_smoke(); +int go(int i); +int vgo(int i, switch_core_session_t *session); + +SWITCH_STANDARD_APP(cluechoo_app) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + + switch_channel_answer(channel); + switch_ivr_sleep(session, 1000, SWITCH_FALSE, NULL); + + while(switch_channel_ready(channel)) { + if (vgo(0, session) < 0) { + break; + } + } +} + +SWITCH_STANDARD_API(cluechoo_function) +{ + //stream->write_function(stream, "+OK Reloading\n"); + + go(0); + return SWITCH_STATUS_SUCCESS; +} + +/* Macro expands to: switch_status_t mod_cluechoo_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */ +SWITCH_MODULE_LOAD_FUNCTION(mod_cluechoo_load) +{ + switch_api_interface_t *api_interface; + switch_application_interface_t *app_interface; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n"); + + SWITCH_ADD_API(api_interface, "cluechoo", "Cluechoo API", cluechoo_function, "syntax"); + + SWITCH_ADD_APP(app_interface, "cluechoo", "cluechoo", "cluechoo", cluechoo_app, "", SAF_NONE); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* + Called when the system shuts down + Macro expands to: switch_status_t mod_cluechoo_shutdown() */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cluechoo_shutdown) +{ + + return SWITCH_STATUS_SUCCESS; +} + + +/*======================================== + * sl.c: + * Copyright 1993,1998 Toyoda Masashi + * (toyoda(a)is.titech.ac.jp) + * Last Modified: 1998/ 7/22 + *======================================== + */ +/* sl version 3.03 : add usleep(20000) */ +/* by Toyoda Masashi 1998/ 7/22 */ +/* sl version 3.02 : D51 flies! Change options. */ +/* by Toyoda Masashi 1993/ 1/19 */ +/* sl version 3.01 : Wheel turns smoother */ +/* by Toyoda Masashi 1992/12/25 */ +/* sl version 3.00 : Add d(D51) option */ +/* by Toyoda Masashi 1992/12/24 */ +/* sl version 2.02 : Bug fixed.(dust remains in screen) */ +/* by Toyoda Masashi 1992/12/17 */ +/* sl version 2.01 : Smoke run and disappear. */ +/* Change '-a' to accident option. */ +/* by Toyoda Masashi 1992/12/16 */ +/* sl version 2.00 : Add a(all),l(long),F(Fly!) options. */ +/* by Toyoda Masashi 1992/12/15 */ +/* sl version 1.02 : Add turning wheel. */ +/* by Toyoda Masashi 1992/12/14 */ +/* sl version 1.01 : Add more complex smoke. */ +/* by Toyoda Masashi 1992/12/14 */ +/* sl version 1.00 : SL runs vomitting out smoke. */ +/* by Toyoda Masashi 1992/12/11 */ + +#include <curses.h> +#include <signal.h> +#include <unistd.h> +#include "sl.h" + +int ACCIDENT = 0; +int LOGO = 0; +int FLY = 0; + +int my_mvaddstr(int y, int x, char *str) +{ + for ( ; x < 0; ++x, ++str) + if (*str == '\0') return ERR; + for ( ; *str != '\0'; ++str, ++x) + if (mvaddch(y, x, *str) == ERR) return ERR; + return OK; +} + +void option(char *str) +{ + extern int ACCIDENT, FLY; + + while (*str != '\0') { + switch (*str++) { + case 'a': ACCIDENT = 1; break; + case 'F': FLY = 1; break; + case 'l': LOGO = 1; break; + default: break; + } + } +} + +int go(int i) +{ + int x; + int sleep_len = 40000; + + if (i > 0) { + sleep_len = i; + } + + /* + for (i = 1; i < argc; ++i) { + if (*argv[i] == '-') { + option(argv[i] + 1); + } + } + */ + initscr(); + signal(SIGINT, SIG_IGN); + noecho(); + leaveok(stdscr, TRUE); + scrollok(stdscr, FALSE); + + for (x = COLS - 1; ; --x) { + if (LOGO == 0) { + if (add_D51(x) == ERR) break; + } else { + if (add_sl(x) == ERR) break; + } + refresh(); + if (x == COLS / 4) { + sleep(2); + } else { + usleep(sleep_len); + } + } + mvcur(0, COLS - 1, LINES - 1, 0); + endwin(); + + return 0; +} + + +int vgo(int i, switch_core_session_t *session) +{ + int x; + int sleep_len = 40000; + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_frame_t *read_frame; + switch_status_t status; + switch_codec_implementation_t read_impl = {0}; + switch_codec_t codec = {0}; + int hangover_hits = 0, hangunder_hits = 0; + int diff_level = 400; + int hangover = 40, hangunder = 15; + int talking = 0; + int energy_level = 500; + + switch_core_session_get_read_impl(session, &read_impl); + + printf("%s", SWITCH_SEQ_CLEARSCR); + + if (i > 0) { + sleep_len = i; + } + + initscr(); + signal(SIGINT, SIG_IGN); + noecho(); + leaveok(stdscr, TRUE); + scrollok(stdscr, FALSE); + + + if (switch_core_codec_init(&codec, + "L16", + NULL, (int) read_impl.samples_per_second, read_impl.microseconds_per_packet / 1000, + 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + return -1; + } + + switch_core_session_set_read_codec(session, &codec); + + for (x = COLS - 1; ; --x) { + + if (!switch_channel_ready(channel)) { + break; + } + + status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + + { + int16_t *fdata = (int16_t *) read_frame->data; + uint32_t samples = read_frame->datalen / sizeof(*fdata); + uint32_t score, count = 0, j = 0; + double energy = 0; + int divisor = 0; + + for (count = 0; count < samples; count++) { + energy += abs(fdata[j]); + j += read_impl.number_of_channels; + } + + if (!(divisor = read_impl.actual_samples_per_second / 8000)) { + divisor = 1; + } + + score = (uint32_t) (energy / (samples / divisor)); + + if (score > energy_level) { + uint32_t diff = score - energy_level; + if (hangover_hits) { + hangover_hits--; + } + + if (diff >= diff_level || ++hangunder_hits >= hangunder) { + hangover_hits = hangunder_hits = 0; + + if (!talking) { + talking = 1; + } + } + } else { + if (hangunder_hits) { + hangunder_hits--; + } + if (talking) { + if (++hangover_hits >= hangover) { + hangover_hits = hangunder_hits = 0; + talking = 0; + } + } + } + } + + if (!talking) { + x++; + continue; + } + + if (LOGO == 0) { + if (add_D51(x) == ERR) break; + } else { + if (add_sl(x) == ERR) break; + } + refresh(); + + + + /* + if (x == COLS / 4) { + sleep(2); + } else { + usleep(sleep_len); + } + */ + } + mvcur(0, COLS - 1, LINES - 1, 0); + endwin(); + + switch_core_session_set_read_codec(session, NULL); + switch_core_codec_destroy(&codec); + return 0; +} + + +int add_sl(int x) +{ + static char *sl[LOGOPATTERNS][LOGOHIGHT + 1] + = {{LOGO1, LOGO2, LOGO3, LOGO4, LWHL11, LWHL12, DELLN}, + {LOGO1, LOGO2, LOGO3, LOGO4, LWHL21, LWHL22, DELLN}, + {LOGO1, LOGO2, LOGO3, LOGO4, LWHL31, LWHL32, DELLN}, + {LOGO1, LOGO2, LOGO3, LOGO4, LWHL41, LWHL42, DELLN}, + {LOGO1, LOGO2, LOGO3, LOGO4, LWHL51, LWHL52, DELLN}, + {LOGO1, LOGO2, LOGO3, LOGO4, LWHL61, LWHL62, DELLN}}; + + static char *coal[LOGOHIGHT + 1] + = {LCOAL1, LCOAL2, LCOAL3, LCOAL4, LCOAL5, LCOAL6, DELLN}; + + static char *car[LOGOHIGHT + 1] + = {LCAR1, LCAR2, LCAR3, LCAR4, LCAR5, LCAR6, DELLN}; + + int i, y, py1 = 0, py2 = 0, py3 = 0; + + if (x < - LOGOLENGTH) return ERR; + y = LINES / 2 - 3; + + if (FLY == 1) { + y = (x / 6) + LINES - (COLS / 6) - LOGOHIGHT; + py1 = 2; py2 = 4; py3 = 6; + } + + for (i = 0; i <= LOGOHIGHT; ++i) { + my_mvaddstr(y + i, x, sl[(LOGOLENGTH + x) / 3 % LOGOPATTERNS][i]); + my_mvaddstr(y + i + py1, x + 21, coal[i]); + my_mvaddstr(y + i + py2, x + 42, car[i]); + my_mvaddstr(y + i + py3, x + 63, car[i]); + } + if (ACCIDENT == 1) { + add_man(y + 1, x + 14); + add_man(y + 1 + py2, x + 45); add_man(y + 1 + py2, x + 53); + add_man(y + 1 + py3, x + 66); add_man(y + 1 + py3, x + 74); + } + add_smoke(y - 1, x + LOGOFUNNEL); + return OK; +} + +static int loops = 0; + +int add_D51(int x) +{ + static char *d51[D51PATTERNS][D51HIGHT + 1] + = {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, + D51WHL11, D51WHL12, D51WHL13, D51DEL}, + {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, + D51WHL21, D51WHL22, D51WHL23, D51DEL}, + {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, + D51WHL31, D51WHL32, D51WHL33, D51DEL}, + {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, + D51WHL41, D51WHL42, D51WHL43, D51DEL}, + {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, + D51WHL51, D51WHL52, D51WHL53, D51DEL}, + {D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7, + D51WHL61, D51WHL62, D51WHL63, D51DEL}}; + static char *coal[D51HIGHT + 1] + = {COAL01, COAL02, COAL03, COAL04, COAL05, + COAL06, COAL07, COAL08, COAL09, COAL10, COALDEL}; + + static char *acoal[D51HIGHT + 1] + = {COAL01, COAL02, COAL03, COAL04, COAL5A, + COAL06, COAL07, COAL08, COAL09, COAL10, COALDEL}; + + int y, i, dy = 0; + + if (x < - D51LENGTH) return ERR; + y = LINES / 2 - 5; + + if (FLY == 1) { + y = (x / 7) + LINES - (COLS / 7) - D51HIGHT; + dy = 1; + } + + for (i = 0; i <= D51HIGHT; ++i) { + my_mvaddstr(y + i, x, d51[(D51LENGTH + x) % D51PATTERNS][i]); + my_mvaddstr(y + i + dy, x + 53, loops > 60 ? coal[i] : acoal[i]); + loops++; + if (loops == 500) loops = -100; + } + if (ACCIDENT == 1) { + add_man(y + 2, x + 43); + add_man(y + 2, x + 47); + } + add_smoke(y - 1, x + D51FUNNEL); + return OK; +} + + +int add_man(int y, int x) +{ + static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}}; + int i; + + for (i = 0; i < 2; ++i) { + my_mvaddstr(y + i, x, man[(LOGOLENGTH + x) / 12 % 2][i]); + } + + return 0; +} + + +int add_smoke(int y, int x) +#define SMOKEPTNS 16 +{ + static struct smokes { + int y, x; + int ptrn, kind; + } S[1000]; + static int sum = 0; + static char *Smoke[2][SMOKEPTNS] + = {{"( )", "( )", "( )", "( )", "( )", + "( )" , "( )" , "( )" , "()" , "()" , + "O" , "O" , "O" , "O" , "O" , + " " }, + {"(@@@)", "(@@@@)", "(@@@@)", "(@@@)", "(@@)", + "(@@)" , "(@)" , "(@)" , "@@" , "@@" , + "@" , "@" , "@" , "@" , "@" , + " " }}; + static char *Eraser[SMOKEPTNS] + = {" ", " ", " ", " ", " ", + " " , " " , " " , " " , " " , + " " , " " , " " , " " , " " , + " " }; + static int dy[SMOKEPTNS] = { 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }; + static int dx[SMOKEPTNS] = {-2, -1, 0, 1, 1, 1, 1, 1, 2, 2, + 2, 2, 2, 3, 3, 3 }; + int i; + + if (x % 4 == 0) { + for (i = 0; i < sum; ++i) { + my_mvaddstr(S[i].y, S[i].x, Eraser[S[i].ptrn]); + S[i].y -= dy[S[i].ptrn]; + S[i].x += dx[S[i].ptrn]; + S[i].ptrn += (S[i].ptrn < SMOKEPTNS - 1) ? 1 : 0; + my_mvaddstr(S[i].y, S[i].x, Smoke[S[i].kind][S[i].ptrn]); + } + my_mvaddstr(y, x, Smoke[sum % 2][0]); + S[sum].y = y; S[sum].x = x; + S[sum].ptrn = 0; S[sum].kind = sum % 2; + sum ++; + } + + return 0; +} + + + +/* 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 + */ Added: freeswitch/trunk/src/mod/applications/mod_cluechoo/sl.h ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_cluechoo/sl.h Thu Apr 16 22:03:20 2009 @@ -0,0 +1,107 @@ +/*======================================== + * sl.h: Text data of SL version 3.01 + * Copyright 1993 Toyoda Masashi + * (toyoda(a)is.titech.ac.jp) + * Last Modified: 1992/12/23 + *======================================== + */ + +#define D51HIGHT 10 +#define D51FUNNEL 7 +#define D51LENGTH 83 +#define D51PATTERNS 6 + + +#define D51STR1 " ==== ________ ___________ " +#define D51STR2 " _D _| |_______/ \\__I_I_____===__|_________| " +#define D51STR3 " |(_)--- | H\\________/ | | =|___ ___| " +#define D51STR4 " / | | H | | | | ||_| |_|| " +#define D51STR5 " | | | H |__--------------------| [___] | " +#define D51STR6 " | ________|___H__/__|_____/[][]~\\_______| | " +#define D51STR7 " |/ | |-----------I_____I [][] [] D |=======|__ " + +#define D51WHL11 "__/ =| o |=-~~\\ /~~\\ /~~\\ /~~\\ ____Y___________|__ " +#define D51WHL12 " |/-=|___|= || || || |_____/~\\___/ " +#define D51WHL13 " \\_/ \\O=====O=====O=====O_/ \\_/ " + +#define D51WHL21 "__/ =| o |=-~~\\ /~~\\ /~~\\ /~~\\ ____Y___________|__ " +#define D51WHL22 " |/-=|___|=O=====O=====O=====O |_____/~\\___/ " +#define D51WHL23 " \\_/ \\__/ \\__/ \\__/ \\__/ \\_/ " + +#define D51WHL31 "__/ =| o |=-O=====O=====O=====O \\ ____Y___________|__ " +#define D51WHL32 " |/-=|___|= || || || |_____/~\\___/ " +#define D51WHL33 " \\_/ \\__/ \\__/ \\__/ \\__/ \\_/ " + +#define D51WHL41 "__/ =| o |=-~O=====O=====O=====O\\ ____Y___________|__ " +#define D51WHL42 " |/-=|___|= || || || |_____/~\\___/ " +#define D51WHL43 " \\_/ \\__/ \\__/ \\__/ \\__/ \\_/ " + +#define D51WHL51 "__/ =| o |=-~~\\ /~~\\ /~~\\ /~~\\ ____Y___________|__ " +#define D51WHL52 " |/-=|___|= O=====O=====O=====O|_____/~\\___/ " +#define D51WHL53 " \\_/ \\__/ \\__/ \\__/ \\__/ \\_/ " + +#define D51WHL61 "__/ =| o |=-~~\\ /~~\\ /~~\\ /~~\\ ____Y___________|__ " +#define D51WHL62 " |/-=|___|= || || || |_____/~\\___/ " +#define D51WHL63 " \\_/ \\_O=====O=====O=====O/ \\_/ " + +#define D51DEL " " + + + +#define COAL01 " " +#define COAL02 " " +#define COAL03 " _________________ " +#define COAL04 " _| \\_____A " +#define COAL05 " =| Come To ClueCon! | " +#define COAL5A " =| CLUE CHOO! | " +#define COAL06 " -| http://www.cluecon.com | " +#define COAL07 "__|________________________|_ " +#define COAL08 "|__________________________|_ " +#define COAL09 " |_D__D__D_| |_D__D__D_| " +#define COAL10 " \\_/ \\_/ \\_/ \\_/ " + +#define COALDEL " " + +#define LOGOHIGHT 6 +#define LOGOFUNNEL 4 +#define LOGOLENGTH 84 +#define LOGOPATTERNS 6 + +#define LOGO1 " ++ +------ " +#define LOGO2 " || |+-+ | " +#define LOGO3 " /---------|| | | " +#define LOGO4 " + ======== +-+ | " + +#define LWHL11 " _|--O========O~\\-+ " +#define LWHL12 "//// \\_/ \\_/ " + +#define LWHL21 " _|--/O========O\\-+ " +#define LWHL22 "//// \\_/ \\_/ " + +#define LWHL31 " _|--/~O========O-+ " +#define LWHL32 "//// \\_/ \\_/ " + +#define LWHL41 " _|--/~\\------/~\\-+ " +#define LWHL42 "//// \\_O========O " + +#define LWHL51 " _|--/~\\------/~\\-+ " +#define LWHL52 "//// \\O========O/ " + +#define LWHL61 " _|--/~\\------/~\\-+ " +#define LWHL62 "//// O========O_/ " + +#define LCOAL1 "____ " +#define LCOAL2 "| \\@@@@@@@@@@@ " +#define LCOAL3 "| \\@@@@@@@@@@@@@_ " +#define LCOAL4 "| | " +#define LCOAL5 "|__________________| " +#define LCOAL6 " (O) (O) " + +#define LCAR1 "____________________ " +#define LCAR2 "| ___ ___ ___ ___ | " +#define LCAR3 "| |_| |_| |_| |_| | " +#define LCAR4 "|__________________| " +#define LCAR5 "|__________________| " +#define LCAR6 " (O) (O) " + +#define DELLN " "

1 0

[commit] r13067 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 17 Apr '09

17 Apr '09

Author: mcollins Date: Thu Apr 16 19:10:06 2009 New Revision: 13067 Log: Updates to phrase_es.xml; gracias krzie, javar, y los otros Modified: freeswitch/trunk/docs/phrase/phrase_es.xml Modified: freeswitch/trunk/docs/phrase/phrase_es.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_es.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_es.xml Thu Apr 16 19:10:06 2009 @@ -5,10 +5,10 @@ <language> <en> <ascii> - <prompt phrase="Space" filename="32.wav"/> - <prompt phrase="Pound" filename="35.wav"/> - <prompt phrase="Star" filename="42.wav"/> - <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="Espacio" filename="32.wav"/> + <prompt phrase="Signo de n�mero" filename="35.wav"/> + <prompt phrase="Asterisco" filename="42.wav"/> + <prompt phrase="Punto" filename="46.wav"/> <prompt phrase="A" filename="97.wav"/> <prompt phrase="B" filename="98.wav"/> <prompt phrase="C" filename="99.wav"/> @@ -21,8 +21,10 @@ <prompt phrase="J" filename="106.wav"/> <prompt phrase="K" filename="107.wav"/> <prompt phrase="L" filename="108.wav"/> + <prompt phrase="LL" filename="???.wav"/> <prompt phrase="M" filename="109.wav"/> <prompt phrase="N" filename="110.wav"/> + <prompt phrase="�" filename="???.wav"/> <prompt phrase="O" filename="111.wav"/> <prompt phrase="P" filename="112.wav"/> <prompt phrase="Q" filename="113.wav"/> @@ -37,8 +39,8 @@ <prompt phrase="Z" filename="122.wav"/> </ascii> <phonetic-ascii> - <prompt phrase="Space" filename="32.wav"/> - <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="Espacio" filename="32.wav"/> + <prompt phrase="Punto" filename="46.wav"/> <prompt phrase="Alpha" filename="97.wav"/> <prompt phrase="Bravo" filename="98.wav"/> <prompt phrase="Charlie" filename="99.wav"/> @@ -67,12 +69,12 @@ <prompt phrase="Zulu" filename="122.wav"/> </phonetic-ascii> <digits> - <prompt phrase="Cerro" filename="0.wav"/> + <prompt phrase="Cero" filename="0.wav"/> <prompt phrase="Uno" filename="1.wav"/> <prompt phrase="Dos" filename="2.wav"/> <prompt phrase="Tres" filename="3.wav"/> <prompt phrase="Cuatro" filename="4.wav"/> - <prompt phrase="Cinqo" filename="5.wav"/> + <prompt phrase="Cinco" filename="5.wav"/> <prompt phrase="Seis" filename="6.wav"/> <prompt phrase="Siete" filename="7.wav"/> <prompt phrase="Ocho" filename="8.wav"/> @@ -83,86 +85,123 @@ <prompt phrase="Trece" filename="13.wav"/> <prompt phrase="Catorce" filename="14.wav"/> <prompt phrase="Quince" filename="15.wav"/> - <prompt phrase="Dieciséis" filename="16.wav"/> - <prompt phrase="Diecisiete " filename="17.wav"/> - <prompt phrase="Dieciocho " filename="18.wav"/> - <prompt phrase="Diecinueve " filename="19.wav"/> - <prompt phrase="Veinte " filename="20.wav"/> - <prompt phrase="Thirty" filename="30.wav"/> - <prompt phrase="Fourty" filename="40.wav"/> - <prompt phrase="Fifty" filename="50.wav"/> - <prompt phrase="Sixty" filename="60.wav"/> - <prompt phrase="Seventy" filename="70.wav"/> - <prompt phrase="Eighty" filename="80.wav"/> - <prompt phrase="Ninety" filename="90.wav"/> - <prompt phrase="Dot" filename="dot.wav"/> - <prompt phrase="First" filename="h-1.wav"/> - <prompt phrase="Second" filename="h-2.wav"/> - <prompt phrase="Third" filename="h-3.wav"/> - <prompt phrase="Fourth" filename="h-4.wav"/> - <prompt phrase="Fifth" filename="h-5.wav"/> - <prompt phrase="Sixth" filename="h-6.wav"/> - <prompt phrase="Seventh" filename="h-7.wav"/> - <prompt phrase="Eighth" filename="h-8.wav"/> - <prompt phrase="Nineth" filename="h-9.wav"/> - <prompt phrase="Tenth" filename="h-10.wav"/> - <prompt phrase="Eleventh" filename="h-11.wav"/> - <prompt phrase="Twelveth" filename="h-12.wav"/> - <prompt phrase="Thirteenth" filename="h-13.wav"/> - <prompt phrase="Fourteenth" filename="h-14.wav"/> - <prompt phrase="Fifteenth" filename="h-15.wav"/> - <prompt phrase="Sixteenth" filename="h-16.wav"/> - <prompt phrase="Seventeenth" filename="h-17.wav"/> - <prompt phrase="Eighteenth" filename="h-18.wav"/> - <prompt phrase="Nineteenth" filename="h-19.wav"/> - <prompt phrase="Twentieth" filename="h-20.wav"/> - <prompt phrase="Thirtieth" filename="h-30.wav"/> - <prompt phrase="Hundred" filename="hundred.wav"/> - <prompt phrase="Million" filename="million.wav"/> - <prompt phrase="Period" filename="period.wav"/> - <prompt phrase="Point" filename="point.wav"/> - <prompt phrase="Pound" filename="pound.wav"/> - <prompt phrase="Star" filename="star.wav"/> - <prompt phrase="Thousand" filename="thousand.wav"/> + <prompt phrase="Diecis�is" filename="16.wav"/> + <prompt phrase="Diecisiete" filename="17.wav"/> + <prompt phrase="Dieciocho" filename="18.wav"/> + <prompt phrase="Diecinueve" filename="19.wav"/> + <prompt phrase="Veinte" filename="20.wav"/> + + <prompt phrase="Veintiuno" filename="21.wav"/> + <prompt phrase="Veintidos" filename="22.wav"/> + <prompt phrase="Veintitr�s" filename="23.wav"/> + <prompt phrase="Veinticuatro" filename="24.wav"/> + <prompt phrase="Veinticinco" filename="25.wav"/> + <prompt phrase="Veintis�is" filename="26.wav"/> + <prompt phrase="Veintisiete" filename="27.wav"/> + <prompt phrase="Veintiocho" filename="28.wav"/> + <prompt phrase="Veintinueve" filename="29.wav"/> + <prompt phrase="Treinta" filename="30.wav"/> + <prompt phrase="Cuarenta" filename="40.wav"/> + <prompt phrase="Cincuenta" filename="50.wav"/> + <prompt phrase="Sesenta" filename="60.wav"/> + <prompt phrase="Setenta" filename="70.wav"/> + <prompt phrase="Ochenta" filename="80.wav"/> + <prompt phrase="Noventa" filename="90.wav"/> + <prompt phrase="Punto" filename="dot.wav"/> + + <prompt phrase="Primero" filename="h-1.wav"/> + <prompt phrase="Segundo" filename="h-2.wav"/> + <prompt phrase="Tercero" filename="h-3.wav"/> + <prompt phrase="Cuarto" filename="h-4.wav"/> + <prompt phrase="Quinto" filename="h-5.wav"/> + <prompt phrase="Sexto" filename="h-6.wav"/> + <prompt phrase="S�ptimo" filename="h-7.wav"/> + <prompt phrase="Octavo" filename="h-8.wav"/> + <prompt phrase="Noveno" filename="h-9.wav"/> + <prompt phrase="D�cimo" filename="h-10.wav"/> + + <prompt phrase="Und�cimo" filename="h-11.wav"/> + <prompt phrase="Duod�cimo" filename="h-12.wav"/> + <prompt phrase="Decimotecero" filename="h-13.wav"/> + <prompt phrase="Decimocuarto" filename="h-14.wav"/> + <prompt phrase="Decimoquinto" filename="h-15.wav"/> + <prompt phrase="Decimosexto" filename="h-16.wav"/> + <prompt phrase="Decimo�ptimo" filename="h-17.wav"/> + <prompt phrase="Decimoctavo" filename="h-18.wav"/> + <prompt phrase="Decimonoveno" filename="h-19.wav"/> + <prompt phrase="Vig�simo" filename="h-20.wav"/> + <prompt phrase="Trig�simo" filename="h-30.wav"/> + <prompt phrase="Cien" filename="hundred.wav"/> + <prompt phrase="Mill?n" filename="million.wav"/> + <prompt phrase="Per�odo" filename="period.wav"/> + <prompt phrase="Punto" filename="point.wav"/> + <prompt phrase="Signo de n�mero" filename="pound.wav"/> + <prompt phrase="Asterisco" filename="star.wav"/> + <prompt phrase="Mil" filename="thousand.wav"/> </digits> <currency> - <prompt phrase="And" filename="and.wav"/> - <prompt phrase="Cent" filename="cent.wav"/> + <prompt phrase="Y" filename="and.wav"/> + <prompt phrase="Centavo" filename="cent.wav"/> <prompt phrase="Central" filename="central.wav"/> - <prompt phrase="Cents per minute" filename="cents-per-minute.wav"/> - <prompt phrase="Cents" filename="cents.wav"/> - <prompt phrase="Dollar" filename="dollar.wav"/> - <prompt phrase="Dollars" filename="dollars.wav"/> - <prompt phrase="Minus" filename="minus.wav"/> - <prompt phrase="Negative" filename="negative.wav"/> + <prompt phrase="Centavos por minuto" filename="cents-per-minute.wav"/> + <prompt phrase="Centavos" filename="cents.wav"/> + <prompt phrase="Dolar" filename="dollar.wav"/> + <prompt phrase="D�lares" filename="dollars.wav"/> + <prompt phrase="Menos" filename="minus.wav"/> + <prompt phrase="Negativo" filename="negative.wav"/> </currency> <time> <prompt phrase="A.M." filename="a-m.wav"/> - <prompt phrase="At" filename="at.wav"/> - <prompt phrase="Sunday" filename="day-0.wav"/> - <prompt phrase="Monday" filename="day-1.wav"/> - <prompt phrase="Tuesday" filename="day-2.wav"/> - <prompt phrase="Wednesday" filename="day-3.wav"/> - <prompt phrase="Thursday" filename="day-4.wav"/> - <prompt phrase="Friday" filename="day-5.wav"/> - <prompt phrase="Saturday" filename="day-6.wav"/> - <prompt phrase="Hour" filename="hour.wav"/> - <prompt phrase="Hours" filename="hours.wav"/> - <prompt phrase="Minute" filename="minute.wav"/> - <prompt phrase="Minutes" filename="minutes.wav"/> - <prompt phrase="January" filename="mon-0.wav"/> - <prompt phrase="Febuary" filename="mon-1.wav"/> - <prompt phrase="March" filename="mon-2.wav"/> - <prompt phrase="April" filename="mon-3.wav"/> - <prompt phrase="May" filename="mon-4.wav"/> - <prompt phrase="June" filename="mon-5.wav"/> - <prompt phrase="July" filename="mon-6.wav"/> - <prompt phrase="August" filename="mon-7.wav"/> - <prompt phrase="September" filename="mon-8.wav"/> - <prompt phrase="October" filename="mon-9.wav"/> - <prompt phrase="November" filename="mon-10.wav"/> - <prompt phrase="December" filename="mon-11.wav"/> - <prompt phrase="O'Clock" filename="oclock.wav"/> + <prompt phrase="A" filename="at.wav"/> + <prompt phrase="Domingo" filename="day-0.wav"/> + <prompt phrase="Lunes" filename="day-1.wav"/> + <prompt phrase="Martes" filename="day-2.wav"/> + <prompt phrase="Mi�rcoles" filename="day-3.wav"/> + <prompt phrase="Jueves" filename="day-4.wav"/> + <prompt phrase="Viernes" filename="day-5.wav"/> + <prompt phrase="S�bado" filename="day-6.wav"/> + <prompt phrase="Hora" filename="hour.wav"/> + <prompt phrase="Horas" filename="hours.wav"/> + <prompt phrase="Minuto" filename="minute.wav"/> + <prompt phrase="Minutos" filename="minutes.wav"/> + <prompt phrase="Enero" filename="mon-0.wav"/> + <prompt phrase="Febrero" filename="mon-1.wav"/> + <prompt phrase="Marzo" filename="mon-2.wav"/> + <prompt phrase="Abril" filename="mon-3.wav"/> + <prompt phrase="Mayo" filename="mon-4.wav"/> + <prompt phrase="Junio" filename="mon-5.wav"/> + <prompt phrase="Julio" filename="mon-6.wav"/> + <prompt phrase="Agosto" filename="mon-7.wav"/> + <prompt phrase="Septiembre" filename="mon-8.wav"/> + <prompt phrase="Octubre" filename="mon-9.wav"/> + <prompt phrase="Noviembre" filename="mon-10.wav"/> + <prompt phrase="Diciembre" filename="mon-11.wav"/> + <prompt phrase="En punto" filename="oclock.wav"/> <prompt phrase="oh" filename="oh.wav"/> <prompt phrase="P.M." filename="p-m.wav"/> <prompt phrase="Second" filename="second.wav"/> @@ -271,10 +310,10 @@ <prompt phrase="To speak with an operator" filename="ivr-to_speak_with_an_operator.wav"/> <prompt phrase="Welcome to FreeSWITCH, the future of telephony" filename="ivr-welcome_to_freeswitch.wav"/> <prompt phrase="You may exit at any time by simply hanging up" filename="ivr-you_may_exit_by_hanging_up.wav"/> - <prompt phrase="or" filename ="ivr-or.wav"/> - <prompt phrase="not" filename ="ivr-not.wav"/> - <prompt phrase="call" filename ="ivr-call.wav"/> - <prompt phrase="You may" filename ="ivr-you_may.wav"/> + <prompt phrase="or" filename="ivr-or.wav"/> + <prompt phrase="not" filename="ivr-not.wav"/> + <prompt phrase="call" filename="ivr-call.wav"/> + <prompt phrase="You may" filename="ivr-you_may.wav"/> <prompt phrase="hello" filename="ivr-hello.wav"/> <prompt phrase="Using your telephone keypad..." filename="ivr-use_telephone_keypad.wav"/> <prompt phrase="please spell the name of the person you are trying to reach." filename="ivr-spell_name.wav"/> @@ -298,4 +337,4 @@ <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> </misc> </en> -</language> +</language> \ No newline at end of file

1 0

[commit] r13066 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: andrew Date: Thu Apr 16 18:02:41 2009 New Revision: 13066 Log: Reply appropriately to net_adm:ping() Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Thu Apr 16 18:02:41 2009 @@ -800,50 +800,138 @@ } -int handle_msg(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) +/* fake enough of the net_kernel module to be able to respond to net_adm:ping */ +/* {'$gen_call', {<cpx(a)freecpx.128.0>, #Ref<254770.4.0>}, {is_auth, cpx@freecpx} */ +static switch_status_t handle_net_kernel_msg(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) { - int type, type2, size, version, arity, tmpindex; - switch_status_t ret = SWITCH_STATUS_SUCCESS; + int version, size, type, arity; + char atom[MAXATOMLEN]; + erlang_ref ref; + erlang_pid pid; buf->index = 0; ei_decode_version(buf->buff, &buf->index, &version); ei_get_type(buf->buff, &buf->index, &type, &size); - switch(type) { - case ERL_SMALL_TUPLE_EXT : - case ERL_LARGE_TUPLE_EXT : - tmpindex = buf->index; - ei_decode_tuple_header(buf->buff, &tmpindex, &arity); - ei_get_type(buf->buff, &tmpindex, &type2, &size); - - switch(type2) { - case ERL_ATOM_EXT: - ret = handle_msg_tuple(listener,msg,buf,rbuf); - break; - case ERL_REFERENCE_EXT : - case ERL_NEW_REFERENCE_EXT : - ret = handle_ref_tuple(listener, msg, buf, rbuf); - default : - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type); - /* some other kind of erlang term */ - ei_x_encode_tuple_header(rbuf, 2); - ei_x_encode_atom(rbuf, "error"); - ei_x_encode_atom(rbuf, "undef"); - break; + if (type != ERL_SMALL_TUPLE_EXT && type != ERL_SMALL_TUPLE_EXT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not a tuple\n"); + return SWITCH_STATUS_FALSE; + } + + ei_decode_tuple_header(buf->buff, &buf->index, &arity); + + if (arity != 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "wrong arity\n"); + return SWITCH_STATUS_FALSE; + } + + if (ei_decode_atom(buf->buff, &buf->index, atom) || strncmp(atom, "$gen_call", MAXATOMLEN)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not gen_call\n"); + return SWITCH_STATUS_FALSE; + } + + ei_get_type(buf->buff, &buf->index, &type, &size); + + if (type != ERL_SMALL_TUPLE_EXT && type != ERL_SMALL_TUPLE_EXT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not a tuple\n"); + return SWITCH_STATUS_FALSE; + } + + ei_decode_tuple_header(buf->buff, &buf->index, &arity); + + if (arity != 2) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "wrong arity\n"); + return SWITCH_STATUS_FALSE; + } + + if (ei_decode_pid(buf->buff, &buf->index, &pid) || ei_decode_ref(buf->buff, &buf->index, &ref)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "decoding pid and ref error\n"); + return SWITCH_STATUS_FALSE; + } + + ei_get_type(buf->buff, &buf->index, &type, &size); + + if (type != ERL_SMALL_TUPLE_EXT && type != ERL_SMALL_TUPLE_EXT) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not a tuple\n"); + return SWITCH_STATUS_FALSE; + } + + ei_decode_tuple_header(buf->buff, &buf->index, &arity); + + if (arity != 2) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "bad arity\n"); + return SWITCH_STATUS_FALSE; + } + + if (ei_decode_atom(buf->buff, &buf->index, atom) || strncmp(atom, "is_auth", MAXATOMLEN)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "not is_auth\n"); + return SWITCH_STATUS_FALSE; + } + + /* To ! {Tag, Reply} */ + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_ref(rbuf, &ref); + ei_x_encode_atom(rbuf, "yes"); + + switch_mutex_lock(listener->sock_mutex); + ei_send(listener->sockfd, &pid, rbuf->buff, rbuf->index); + switch_mutex_unlock(listener->sock_mutex); +#ifdef EI_DEBUG + ei_x_print_msg(rbuf, &pid, 1); +#endif + + return SWITCH_STATUS_FALSE; +} + + +int handle_msg(listener_t *listener, erlang_msg *msg, ei_x_buff *buf, ei_x_buff *rbuf) +{ + int type, type2, size, version, arity, tmpindex; + switch_status_t ret = SWITCH_STATUS_SUCCESS; + + if (msg->msgtype == ERL_REG_SEND && !strncmp(msg->toname, "net_kernel", MAXATOMLEN)) { + /* try to respond to ping stuff */ + ret = handle_net_kernel_msg(listener, msg, buf, rbuf); + } else { + buf->index = 0; + ei_decode_version(buf->buff, &buf->index, &version); + ei_get_type(buf->buff, &buf->index, &type, &size); + switch(type) { + case ERL_SMALL_TUPLE_EXT : + case ERL_LARGE_TUPLE_EXT : + tmpindex = buf->index; + ei_decode_tuple_header(buf->buff, &tmpindex, &arity); + ei_get_type(buf->buff, &tmpindex, &type2, &size); + + switch(type2) { + case ERL_ATOM_EXT: + ret = handle_msg_tuple(listener,msg,buf,rbuf); + break; + case ERL_REFERENCE_EXT : + case ERL_NEW_REFERENCE_EXT : + ret = handle_ref_tuple(listener, msg, buf, rbuf); + default : + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WEEEEEEEE %d\n", type); + /* some other kind of erlang term */ + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "undef"); + break; + } + + break; + + case ERL_ATOM_EXT : + ret = handle_msg_atom(listener,msg,buf,rbuf); + break; + + default : + /* some other kind of erlang term */ + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "undef"); + break; } - - break; - - case ERL_ATOM_EXT : - ret = handle_msg_atom(listener,msg,buf,rbuf); - break; - - default : - /* some other kind of erlang term */ - ei_x_encode_tuple_header(rbuf, 2); - ei_x_encode_atom(rbuf, "error"); - ei_x_encode_atom(rbuf, "undef"); - break; } if (SWITCH_STATUS_FALSE==ret) {

1 0

[commit] r13065 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: anthm Date: Thu Apr 16 17:13:55 2009 New Revision: 13065 Log: autoflush on bridge and add bridge_hangup_cause variable to indicate the hangup cause of the last bridged channel Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Thu Apr 16 17:13:55 2009 @@ -351,7 +351,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, switch_io_flag_t io_flags); -SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session); +SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session, switch_rtp_flush_t flush); /*! \brief Enable VAD on an RTP Session Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Apr 16 17:13:55 2009 @@ -110,6 +110,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE "bridge_hangup_cause" #define SWITCH_READ_TERMINATOR_USED_VARIABLE "read_terminator_used" #define SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE "send_silence_when_idle" #define SWITCH_CURRENT_APPLICATION_VARIABLE "current_application" @@ -443,6 +444,11 @@ switch_rtp_numbers_t outbound; } switch_rtp_stats_t; +typedef enum { + SWITCH_RTP_FLUSH_ONCE, + SWITCH_RTP_FLUSH_STICK, + SWITCH_RTP_FLUSH_UNSTICK +} switch_rtp_flush_t; #define SWITCH_RTP_CNG_PAYLOAD 13 @@ -464,7 +470,7 @@ SWITCH_RTP_FLAG_DATAWAIT - Do not return from reads unless there is data even when non blocking SWITCH_RTP_FLAG_BUGGY_2833 - Emulate the bug in cisco equipment to allow interop SWITCH_RTP_FLAG_PASS_RFC2833 - Pass 2833 (ignore it) - SWITCH_RTP_FLAG_AUTO_CNG - Generate outbound CNG frames when idle + SWITCH_RTP_FLAG_AUTO_CNG - Generate outbound CNG frames when idle </pre> */ typedef enum { @@ -489,7 +495,8 @@ SWITCH_RTP_FLAG_PROXY_MEDIA = (1 << 18), SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19), SWITCH_RTP_FLAG_FLUSH = (1 << 20), - SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21) + SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21), + SWITCH_RTP_FLAG_STICKY_FLUSH = (1 << 22) } switch_rtp_flag_enum_t; typedef uint32_t switch_rtp_flag_t; 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 Thu Apr 16 17:13:55 2009 @@ -1015,10 +1015,18 @@ goto end; case SWITCH_MESSAGE_INDICATE_BRIDGE: + if (switch_rtp_ready(tech_pvt->rtp_session)) { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_STICK); + } + goto end; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + if (switch_rtp_ready(tech_pvt->rtp_session)) { + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_UNSTICK); + } + goto end; case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC: if (switch_rtp_ready(tech_pvt->rtp_session)) { - rtp_flush_read_buffer(tech_pvt->rtp_session); + rtp_flush_read_buffer(tech_pvt->rtp_session, SWITCH_RTP_FLUSH_ONCE); } goto end; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Apr 16 17:13:55 2009 @@ -829,6 +829,7 @@ int br = 0; int inner_bridge = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE); const char *var; + switch_call_cause_t cause; switch_channel_set_flag(caller_channel, CF_ORIGINATOR); @@ -961,6 +962,14 @@ switch_cond_next(); } + if ((cause = switch_channel_get_cause(caller_channel))) { + switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE, switch_channel_cause2str(cause)); + } + + if ((cause = switch_channel_get_cause(peer_channel))) { + switch_channel_set_variable(caller_channel, SWITCH_BRIDGE_HANGUP_CAUSE_VARIABLE, switch_channel_cause2str(cause)); + } + switch_core_session_rwunlock(peer_session); } else { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Apr 16 17:13:55 2009 @@ -1330,10 +1330,20 @@ } } -SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session) +SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session, switch_rtp_flush_t flush) { if (switch_rtp_ready(rtp_session) && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_FLUSH); + switch (flush) { + case SWITCH_RTP_FLUSH_STICK: + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH); + break; + case SWITCH_RTP_FLUSH_UNSTICK: + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH); + break; + default: + break; + } } } @@ -1459,7 +1469,7 @@ int do_cng = 0; if (rtp_session->timer.interval) { - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH)) { + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) { if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { hot_socket = 1; } @@ -1526,7 +1536,7 @@ } if (bytes && rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) { - rtp_flush_read_buffer(rtp_session); + rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE); } if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) {

1 0

[commit] r13064 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: mikej Date: Thu Apr 16 14:08:31 2009 New Revision: 13064 Log: revert temporary hack Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c Thu Apr 16 14:08:31 2009 @@ -1154,7 +1154,7 @@ if (status == 423) { unsigned my_expires = 0; - if (cr->cr_sip && cr->cr_sip->sip_expires) + if (cr->cr_sip->sip_expires) my_expires = cr->cr_sip->sip_expires->ex_delta; if (sip->sip_min_expires && @@ -1209,8 +1209,7 @@ } } - if (500 <= status && status < 600 && - cr->cr_sip && + if (0 && 500 <= status && status < 600 && sip->sip_retry_after && sip->sip_retry_after->af_delta < 32) { su_timer_t *timer;

1 0

[commit] r13063 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 16 Apr '09

16 Apr '09

Author: mikej Date: Thu Apr 16 12:21:54 2009 New Revision: 13063 Log: Thu Apr 16 12:11:33 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: added yet another test case for re-INVITE glare S2_CASE("2.6.5", "Re-INVITE glare and 500 Retry-After", "NUA receives re-INVITE, replies with 200, " "sends re-INVITE, gets 500, gets ACK, retrys INVITE," "sends BYE."); test case for SFSIP-135 and SFSIP-137 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 16 12:21:54 2009 @@ -1 +1 @@ -Thu Apr 16 12:18:30 CDT 2009 +Thu Apr 16 12:20:45 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Thu Apr 16 12:21:54 2009 @@ -1710,9 +1710,9 @@ invite = s2_sip_wait_for_request(SIP_METHOD_INVITE); fail_if(!invite); - respond_with_sdp(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR, - SIPTAG_RETRY_AFTER_STR("8"), - TAG_END()); + s2_sip_respond_to(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR, + SIPTAG_RETRY_AFTER_STR("8"), + TAG_END()); s2_sip_free_message(invite); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); fail_if(!ack); @@ -1789,8 +1789,8 @@ fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_INVITE, NULL, - SIPTAG_USER_AGENT_STR("evil (evil) evil"), - TAG_END()); + SIPTAG_USER_AGENT_STR("evil (evil) evil"), + TAG_END()); nua_respond(nh, SIP_200_OK, TAG_END()); @@ -1851,6 +1851,70 @@ } END_TEST +START_TEST(call_2_6_5) +{ + nua_handle_t *nh; + struct event *reinvite; + struct message *invite, *ack, *response; + + /* Test case for FreeSwitch bugs #SFSIP-135, #SFSIP-137 */ + + S2_CASE("2.6.5", "Re-INVITE glare and 500 Retry-After", + "NUA receives re-INVITE, replies with 200, " + "sends re-INVITE, gets 500, gets ACK, retrys INVITE," + "sends BYE."); + + nh = invite_to_nua(TAG_END()); + + soa_generate_offer(soa, 1, NULL); + request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); + reinvite = s2_wait_for_event(nua_i_invite, 200); fail_unless(reinvite != NULL); + fail_unless(s2_check_callstate(nua_callstate_completed)); + response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE); + fail_if(!response); + s2_sip_update_dialog(dialog, response); + process_answer(response); + s2_sip_free_message(response); + + nua_invite(nh, TAG_END()); + fail_unless(s2_check_callstate(nua_callstate_calling)); + invite = s2_sip_wait_for_request(SIP_METHOD_INVITE); + fail_if(!invite); + s2_sip_respond_to(invite, dialog, SIP_500_INTERNAL_SERVER_ERROR, + SIPTAG_RETRY_AFTER_STR("7"), + TAG_END()); + s2_sip_free_message(invite); + ack = s2_sip_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + s2_sip_free_message(ack); + + /* We get nua_r_invite with 100 trying (and 500 in sip->sip_status) */ + fail_unless_event(nua_r_invite, 100); + + fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); + fail_unless_event(nua_i_ack, 200); + fail_unless(s2_check_callstate(nua_callstate_ready)); + + s2_nua_fast_forward(10, s2base->root); + + fail_unless(s2_check_callstate(nua_callstate_calling)); + + invite = s2_sip_wait_for_request(SIP_METHOD_INVITE); + process_offer(invite); + + respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); + fail_unless_event(nua_r_invite, 200); + fail_unless(s2_check_callstate(nua_callstate_ready)); + ack = s2_sip_wait_for_request(SIP_METHOD_ACK); + fail_if(!ack); + s2_sip_free_message(ack); + + bye_by_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST + TCase *reinvite_tcase(int threading) { TCase *tc = tcase_create("2.6 - re-INVITEs"); @@ -1861,6 +1925,7 @@ tcase_add_test(tc, call_2_6_2); tcase_add_test(tc, call_2_6_3); tcase_add_test(tc, call_2_6_4); + tcase_add_test(tc, call_2_6_5); } return tc; }

1 0