March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

25 Mar '09

Author: nmartin Date: Tue Mar 24 20:05:30 2009 New Revision: 12770 Log: fix typo Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt (original) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Tue Mar 24 20:05:30 2009 @@ -32,7 +32,7 @@ ============================================================== -Drop all thee files in ~/Library/Address Book Scripts +Drop all files in ~/Library/Address Book Scripts Edit fsdial.py to set up your server information and phone number

1 0

[commit] r12769 - freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial
by FreeSWITCH SVN 25 Mar '09

25 Mar '09

Author: nmartin Date: Tue Mar 24 19:49:53 2009 New Revision: 12769 Log: fix typo for SwK Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt ============================================================================== --- freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt (original) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/README.txt Tue Mar 24 19:49:53 2009 @@ -36,7 +36,7 @@ Unzip Click2Dial.zip. -Inside fs_dial.app, edit COntents/Resources/fsdial.py to set up your server information and phone number +Inside fs_dial.app, edit Contents/Resources/fsdial.py to set up your server information and phone number Import linkify.user.js into greasemonkey (http://www.greasespot.net/)

1 0

[commit] r12768 - in freeswitch/trunk/scripts/contrib/nmartin: fs_client_side_click2dial osx_click2dial
by FreeSWITCH SVN 25 Mar '09

25 Mar '09

Author: nmartin Date: Tue Mar 24 19:40:02 2009 New Revision: 12768 Log: delete old folder Added: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/ - copied from r12766, /freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/ Removed: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/ Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/click2dial.zip Modified: freeswitch/trunk/scripts/contrib/nmartin/osx_click2dial/click2dial.zip ============================================================================== Binary files. No diff available.

1 0

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

25 Mar '09

Author: nmartin Date: Tue Mar 24 19:39:41 2009 New Revision: 12767 Log: initial import Address Book Dialer applet OS X only :( Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/ESL.pyc (contents, props changed) freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/_ESL.so (contents, props changed) freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.py freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt (contents, props changed) freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/test.scpt (contents, props changed) Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/ESL.pyc ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/README.txt Tue Mar 24 19:39:41 2009 @@ -0,0 +1,39 @@ +README + + +============================================================== +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. + + +============================================================== + + +Drop all thee files in ~/Library/Address Book Scripts + +Edit fsdial.py to set up your server information and phone number + +Start Address Book. You should now have a FS Dial entry on the popup menu on phone numbers now. \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/_ESL.so ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.py Tue Mar 24 19:39:41 2009 @@ -0,0 +1,82 @@ +#!/usr/bin/env python + + +#============================================================== +#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. +# +# +#============================================================== + +import string +import sys +from optparse import OptionParser +from ESL import * + + +def main(argv): + # change these to match your configuration + my_number = "1000" #(a)mydomain.com + server_addr = "fs.ip.add.ress" + server_port = "8021" + server_auth = "ClueCon" + + + try: + + parser = OptionParser() + parser.add_option("-n", "--number", dest="number", + help="number to dial") + + (options, args) = parser.parse_args() + + + if not options.number: + print "ERROR: destination number required" + sys.exit(2) + + cmd = "api originate {ignore_early_media=true,origination_caller_id_number=" + options.number + ",effective_caller_id_number=" + my_number + "}user/" + my_number + " &transfer(" + options.number + " XML default)" + print cmd + + con = ESLconnection(server_addr, server_port, server_auth) + #are we connected? + + if con.connected: + + e=con.sendRecv(cmd) + print e.getBody() + + else: + + print "Not Connected" + sys.exit(2) + + except: + print "Unexpected error:", sys.exc_info()[0] + raise + +if __name__ == "__main__": + main(sys.argv[1:]) \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/fsdial.scpt ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/nmartin/osx_address_book_dial/test.scpt ============================================================================== Binary file. No diff available.

1 0

[commit] r12766 - freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial
by FreeSWITCH SVN 25 Mar '09

25 Mar '09

Author: nmartin Date: Tue Mar 24 19:24:21 2009 New Revision: 12766 Log: initial import click2dial applet OS X only :( Added: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/ freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/README.txt freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/click2dial.zip (contents, props changed) freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/linkify.user.js Added: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/README.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/README.txt Tue Mar 24 19:24:21 2009 @@ -0,0 +1,48 @@ +README + +Client Side Click2Dial + +============================================================== +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. + + +============================================================== + +Setup: + +Unzip Click2Dial.zip. + +Inside fs_dial.app, edit COntents/Resources/fsdial.py to set up your server information and phone number + +Import linkify.user.js into greasemonkey (http://www.greasespot.net/) + +Double Click fs_dial.app to register it as the handler for dial:// urls + +The greasemonkey script will linkify any text on a web page that looks like a phone number. +You can edit the reg-ex inside the greasemonkey script to match different types of numbers. + +The fsdial.py script assumes you have a default context, and outbound calls should go to this context \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/click2dial.zip ============================================================================== Binary file. No diff available. Added: freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/linkify.user.js ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/nmartin/fs_client_side_click2dial/linkify.user.js Tue Mar 24 19:24:21 2009 @@ -0,0 +1,78 @@ +// FreeSWITCH Dial Linkify +// Author: Nik Martin +// License: MIT +// +//This script was taken from another script here: http://userscripts.org/scripts/show/1003 +// +// Matches these patterns: +// 800-555-1212 +// (800) 555-1212 +// (800)555-1212 +// 8005551212 +// Weak since it does any 10+ digit number +// 800.555.1212 +// Tested with: +// www.yellowpages.com +// local.google.com +// a9.com +// +// International calling sure would be neat +// ==UserScript== +// @name FreeSWITCH Dial Linkify +// @namespace +// @description Looks for phone numbers in pages and makes hyperlinks out of them. When clicking on the link, FS will connect your phone to the number you clicked +// @include * +// ==/UserScript== + +(function () { + +//this is the test to see if the number looks like a phone number or not + const trackRegex = /(\+\d\d?)?[\-\s\/\.]?[$]?(\d){2,4}[$]?[\-\s\/\.]?\d\d\d[\-\s\/\.]?(\d){3,5}\b/ig; + + function trackUrl(t) { + return "dial://org.FreeSWITCH.Dialer?number=" + String(t).replace(/[\- \.]/g, ""); + } + + // tags we will scan looking for un-hyperlinked urls + var allowedParents = [ + "abbr", "acronym", "address", "applet", "b", "bdo", "big", "blockquote", "body", + "caption", "center", "cite", "code", "dd", "del", "div", "dfn", "dt", "em", + "fieldset", "font", "form", "h1", "h2", "h3", "h4", "h5", "h6", "i", "iframe", + "ins", "kdb", "li", "object", "nobr", "pre", "p", "q", "samp", "small", "span", "strike", + "s", "strong", "sub", "sup", "td", "th", "tt", "u", "var" + ]; + + var xpath = "//text()[(parent::" + allowedParents.join(" or parent::") + ")" + + //" and contains(translate(., 'HTTP', 'http'), 'http') + " + + "]"; + + var candidates = document.evaluate(xpath, document, null, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null); + + //var t0 = new Date().getTime(); + for (var cand = null, i = 0; (cand = candidates.snapshotItem(i)); i++) { + if (trackRegex.test(cand.nodeValue)) { + var span = document.createElement("span"); + var source = cand.nodeValue; + + cand.parentNode.replaceChild(span, cand); + + trackRegex.lastIndex = 0; + for (var match = null, lastLastIndex = 0; (match = trackRegex.exec(source)); ) { + span.appendChild(document.createTextNode(source.substring(lastLastIndex, match.index))); + + var a = document.createElement("a"); + a.setAttribute("href", trackUrl(match[0])); + a.appendChild(document.createTextNode(match[0])); + span.appendChild(a); + + lastLastIndex = trackRegex.lastIndex; + } + + span.appendChild(document.createTextNode(source.substring(lastLastIndex))); + span.normalize(); + } + } + // var t1 = new Date().getTime(); + // alert("X-Lite Dial linkify took " + ((t1 - t0) / 1000) + " seconds"); + +})();

1 0

[commit] r12765 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/endpoints/mod_sofia mod/event_handlers/mod_cdr_csv mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: anthm Date: Tue Mar 24 18:44:03 2009 New Revision: 12765 Log: fix var events to not have stamp info Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue Mar 24 18:44:03 2009 @@ -332,6 +332,15 @@ */ #define switch_event_create(event, id) switch_event_create_subclass(event, id, SWITCH_EVENT_SUBCLASS_ANY) +static inline switch_status_t switch_event_create_plain(switch_event_t **event, switch_event_types_t event_id) +{ + switch_status_t status = switch_event_create(event, SWITCH_EVENT_CLONE); + if (status == SWITCH_STATUS_SUCCESS) { + (*event)->event_id = event_id; + } + + return status; +} /*! \brief Deliver an event to all of the registered event listeners \param event the event to send (will be nulled) Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Mar 24 18:44:03 2009 @@ -938,7 +938,7 @@ switch_event_t *event; char *buf; - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create_plain(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(switch_core_session_get_channel(session), event); switch_event_serialize(event, &buf, SWITCH_FALSE); switch_assert(buf); 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 Tue Mar 24 18:44:03 2009 @@ -1147,14 +1147,14 @@ if (in) { if (!gateway->ib_vars) { - switch_event_create(&gateway->ib_vars, SWITCH_EVENT_GENERAL); + switch_event_create_plain(&gateway->ib_vars, SWITCH_EVENT_GENERAL); } switch_event_add_header_string(gateway->ib_vars, SWITCH_STACK_BOTTOM, var, val); } if (out) { if (!gateway->ob_vars) { - switch_event_create(&gateway->ob_vars, SWITCH_EVENT_GENERAL); + switch_event_create_plain(&gateway->ob_vars, SWITCH_EVENT_GENERAL); } switch_event_add_header_string(gateway->ob_vars, SWITCH_STACK_BOTTOM, var, 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 Tue Mar 24 18:44:03 2009 @@ -1780,8 +1780,10 @@ if (first && ret == AUTH_OK) { if (v_event) { - switch_event_create(v_event, SWITCH_EVENT_REQUEST_PARAMS); + switch_event_create_plain(v_event, SWITCH_EVENT_REQUEST_PARAMS); } + + if (v_event && *v_event) { switch_xml_t xparams[3]; int i = 0; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Tue Mar 24 18:44:03 2009 @@ -199,7 +199,7 @@ if (globals.debug) { switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create_plain(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { char *buf; switch_channel_event_set_data(channel, event); switch_event_serialize(event, &buf, SWITCH_FALSE); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Mar 24 18:44:03 2009 @@ -611,8 +611,7 @@ switch_mutex_lock(listener->filter_mutex); if (!listener->filters) { - switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); - listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; + switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); } if (!strcasecmp(action, "delete")) { @@ -623,8 +622,7 @@ if (!strcasecmp(header_val, "all")) { switch_event_destroy(&listener->filters); - switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); - listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; + switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); } else { switch_event_del_header(listener->filters, header_val); } @@ -1408,15 +1406,13 @@ switch_mutex_lock(listener->filter_mutex); if (!listener->filters) { - switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); - listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; + switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); } if (!strcasecmp(header_name, "delete")) { if (!strcasecmp(header_val, "all")) { switch_event_destroy(&listener->filters); - switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); - listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; + switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); } else { switch_event_del_header(listener->filters, header_val); } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 24 18:44:03 2009 @@ -220,7 +220,7 @@ return SWITCH_STATUS_MEMERR; } - switch_event_create(&(*channel)->variables, SWITCH_EVENT_GENERAL); + switch_event_create_plain(&(*channel)->variables, SWITCH_EVENT_CHANNEL_DATA); switch_core_hash_init(&(*channel)->private_hash, pool); switch_queue_create(&(*channel)->dtmf_queue, SWITCH_DTMF_LOG_LEN, pool);

1 0

[commit] r12764 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: brian Date: Tue Mar 24 18:18:04 2009 New Revision: 12764 Log: not really a warning Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Mar 24 18:18:04 2009 @@ -221,7 +221,7 @@ switch_mutex_unlock(ps->flag_mutex); switch_clear_flag(ps, PSFLAG_HAS_TEXT); switch_clear_flag(ps, PSFLAG_READY); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Port Closed.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Port Closed.\n"); switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12763 - in freeswitch/trunk/src/mod: applications/mod_commands event_handlers/mod_event_socket
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: anthm Date: Tue Mar 24 17:22:05 2009 New Revision: 12763 Log: fix typo Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Mar 24 17:22:05 2009 @@ -2598,7 +2598,7 @@ } else if (!strcasecmp(command, "tasks")) { sprintf(sql, "select * from %s", command); } else if (!strcasecmp(command, "application") || !strcasecmp(command, "api")) { - if (argv[1]) { + if (argv[1] && strcasecmp(argv[1], "as")) { sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' and name = '%s' order by type,name", command, argv[1]); } else { sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' order by type,name", command); @@ -2628,7 +2628,7 @@ help = 1; holder.print_title = 0; - if ((cmdname = strchr(command, ' ')) != 0) { + if ((cmdname = strchr(command, ' ')) && strcasecmp(cmdname, "as")) { *cmdname++ = '\0'; switch_snprintf(sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s' order by name", cmdname); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Mar 24 17:22:05 2009 @@ -1593,7 +1593,7 @@ strip_cr(uuid); } } - + if (switch_strlen_zero(uuid)) { uuid = switch_event_get_header(*event, "session-id"); }

1 0

[commit] r12762 - freeswitch/trunk/scripts/contrib/nmartin
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 17:13:19 2009 New Revision: 12762 Log: add anm's folder Added: freeswitch/trunk/scripts/contrib/nmartin/

1 0

[commit] r12761 - freeswitch/trunk/libs/esl/perl/ESL
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: anthm Date: Tue Mar 24 13:06:25 2009 New Revision: 12761 Log: update Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL/IVR.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Tue Mar 24 13:06:25 2009 @@ -58,6 +58,10 @@ sub playAndGetDigits($;) { my $self = shift; my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var) = @_; + + if (!$self->{_esl}->connected()) { + return undef; + } $self->execute("play_and_get_digits", "$min $max $tries $to $term $file $invalid_file $var"); @@ -69,6 +73,10 @@ my $self = shift; my ($min, $max, $file, $var, $to, $term) = @_; + if (!$self->{_esl}->connected()) { + return undef; + } + $self->execute("read", "$min $max $file $var $to $term"); return $self->getVar($var); @@ -79,6 +87,10 @@ my $self = shift; my ($file) = @_; + if (!$self->{_esl}->connected()) { + return undef; + } + $self->execute("playback", $file); return $self->getVar("playback_terminators_used");

1 0