July 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r5507 - freeswitch/trunk/scripts/contrib/trixter/xml-curl
by Freeswitch SVN 07 Jul '07

07 Jul '07

Author: trixter Date: Fri Jul 6 21:29:21 2007 New Revision: 5507 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php Log: remove testing stuff and make it more 'real' Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php Fri Jul 6 21:29:21 2007 @@ -20,11 +20,8 @@ exit; } } -$_SERVER['REMOTE_USER']="switch1"; -$_POST['key_value']='conference.conf'; -call_user_func($callBacks['configuration']); -//Header("HTTP/1.0 404 Not Found"); -//echo "Not Found"; +Header("HTTP/1.0 404 Not Found"); +echo "Not Found"; exit; ?>

1 0

[Freeswitch-svn] [commit] r5506 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 07 Jul '07

07 Jul '07

Author: trixter Date: Fri Jul 6 21:27:51 2007 New Revision: 5506 Modified: freeswitch/trunk/scripts/contrib/trixter/faxlib.jm Log: marked deprecated Modified: freeswitch/trunk/scripts/contrib/trixter/faxlib.jm ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/faxlib.jm (original) +++ freeswitch/trunk/scripts/contrib/trixter/faxlib.jm Fri Jul 6 21:27:51 2007 @@ -1,5 +1,13 @@ // -*- mode:c; tab-width:4; c-basic-offset:4; c-indent-level:4; indent-tabs-mode:nil; -*- /* + * + * THIS IS DEPRECATED NOW - THERE IS A FUNCTION IN DPTOOLS THAT LETS YOU DO MOST + * OF THIS WITHOUT USING THIS SCRIPT. DIRECT TRANSFER ON FAX CNG DETECT + * THIS IS HERE FOR REFERENCE AND HOW YOU MIGHT EMAIL A PDF OF A FAX + * + */ + +/* * Version: MPL 1.1 * * The contents of this file are subject to the Mozilla Public License Version

1 0

[Freeswitch-svn] [commit] r5505 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 07 Jul '07

07 Jul '07

Author: trixter Date: Fri Jul 6 21:26:25 2007 New Revision: 5505 Removed: freeswitch/trunk/scripts/contrib/trixter/Parse_XML_CDR.php Log: file is duped in xml-cdr

1 0

[Freeswitch-svn] [commit] r5504 - freeswitch/trunk/scripts/contrib/trixter/xml-cdr
by Freeswitch SVN 07 Jul '07

07 Jul '07

Author: trixter Date: Fri Jul 6 21:25:58 2007 New Revision: 5504 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Log: patch for sometimes invalid data sent Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Fri Jul 6 21:25:58 2007 @@ -9,6 +9,7 @@ var $_level = 0; function Parse_CDR_XML(&$data,$showattribs = false) { + $data = preg_replace("/<(.*?)><(.*?)><\/(.*?)>/","<\\1>\\2</\\3>",$data); $this->_showAttribs = $showattribs; $this->_parser = xml_parser_create(); @@ -74,6 +75,8 @@ if (!isset($start[$name])) $start[$name] = ''; $add = ''; } + + $update = &$start[$name]; if ($isattribs && !$this->_showAttribs) return;

1 0

[Freeswitch-svn] [commit] r5503 - in freeswitch/trunk/scripts/contrib/trixter/xml-curl: . modules
by Freeswitch SVN 07 Jul '07

07 Jul '07

Author: trixter Date: Fri Jul 6 21:22:20 2007 New Revision: 5503 Added: freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/ freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/dialplan.php Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/README freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php Log: module based now for handling requests, better readme, better error control Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/README ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-curl/README (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/README Fri Jul 6 21:22:20 2007 @@ -1 +1,30 @@ +This is an example that will respond to mod_xml_curl requests for information. +It uses modules, which are contained in the modules subdirectory. If a module +(any file ending in .php) is in the dir it will be loaded. If it registers +to handle a specific type of xml_curl request, that will be passed to the function named. +If you dont have a module for a specific type of data, for example directory, then +a 404 will be returned to FreeSWITCH. + +The module nature allows you to more easily turn on/off different components. + +Its a template based system, which relies on someone authenticating, such as with +.htaccess. Their username is used in this default example for their configuration +files. This allows for multiple switches to identify themselves uniquely, as well +as giving you the ability to have different templates for different switches. + + + +PREREQUISITES You will need to get smarty from http://smarty.php.net to make this work + +If you install it globally, edit your php.ini to make the Smarty/libs dir as part +of the search path, otherwise add the following to curlrouting.php near the other +ini_set line. Adjust it to suit your particular setup. + +ini_set("include_path",".:/usr/local/lib/php:/usr/share/php:./Smarty-2.6.18/libs"); + + + +You also must create a directory named templates_c where you install this, its a smarty +requirement for caching templates. This directory *must* be writable by the webserver +or Smarty will not properly operate. Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php Fri Jul 6 21:22:20 2007 @@ -1,65 +1,30 @@ <?php // -*- mode:c; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil; -*- Header("Content-type: text/plain"); -ini_set("include_path",".:/usr/local/lib/php:/usr/share/php:./Smarty-2.6.18/libs"); +$callBacks = Array(); +ini_set("magic_quotes_gpc","Off"); include_once('Smarty.class.php'); - -if (isset($_POST['section']) && $_POST['section']=="dialplan") { - // create a new smarty object - $smarty = new Smarty(); - $template = 'fail.tpl'; - - - // see if they authenticated via .htaccess - if(isset($_SERVER['REMOTE_USER']) && $_SERVER['REMOTE_USER']!="") { - // we might check a database for the route, but in this example we hardcode it - $template = 'frompstn.tpl'; // one can exist for each profile or channel type or ... - - $ACTION['javascript']="somethingcool.js"; - $ACTION['bridge']="sofia/external/".$_POST['destination_number']."@myprovider.tld"; - $smarty->assign('ACTION',$ACTION); - - } // end - they were logged in - $smarty->display($_SERVER['DOCUMENT_ROOT']."/templates/".$_SERVER['REMOTE_USER']."/".$template); -} else if (isset($_POST['section']) && $_POST['section']=="configuration") { - $smarty = new Smarty(); - $template = $_POST['key_value'].".tpl"; - switch($_POST['key_value']) { - case "conference.conf": - // simulate data from a database, perhaps a table with 3 columns did,value,args - $digits['pin'] = '1234'; - $digits['anounce-count'] = '2'; - $digits['max-mmebers'] = '15'; - $digits['energy-level'] = '300'; - $params['0'] = 'event'; - $params['1'] = 'event'; - $params['2'] = 'event'; - $params['3'] = 'event'; - $params['4'] = 'event'; - $params['5'] = 'event'; - $params['6'] = 'event'; - $params['7'] = 'event'; - $params['8'] = 'event'; - $params['9'] = 'event'; - $params['#'] = 'event'; - $params['*'] = 'event'; +// load the modules +$dh = @opendir("./modules") or die("Unable to open modules dir"); +while ($file = readdir($dh)) { + if(preg_match("/.*\.php$/i",$file)) { + include_once("modules/$file"); + } +} - $smarty->assign('CONFNAME',$_POST['conf_name']); - $smarty->assign('digits',$digits); - $smarty->assign('params',$params); - } - if($smarty->template_exists($_SERVER['DOCUMENT_ROOT']."/templates/".$_SERVER['REMOTE_USER']."/".$template)) { - $smarty->display($_SERVER['DOCUMENT_ROOT']."/templates/".$_SERVER['REMOTE_USER']."/".$template); - } else { - // //logCallData(); - error_log("Unable to locate template $template"); - $smarty->assign('CONFNAME',$_POST['key_value']); - $smarty->display($_SERVER['DOCUMENT_ROOT']."/templates/".$_SERVER['REMOTE_USER']."/default.conf.tpl"); - } -} else if (isset($_POST['section']) && $_POST['section']=="directory") { - // we dont do anything but you get the idea +if(isset($_POST['section'])) { + if(isset($callBacks[$_POST['section']])) { + call_user_func($callBacks[$_POST['section']]); + exit; + } } +$_SERVER['REMOTE_USER']="switch1"; +$_POST['key_value']='conference.conf'; +call_user_func($callBacks['configuration']); +//Header("HTTP/1.0 404 Not Found"); +//echo "Not Found"; +exit; ?> Added: freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php Fri Jul 6 21:22:20 2007 @@ -0,0 +1,46 @@ +<?php // -*- mode:c; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil; -*- +function configuration() +{ + global $_SERVER; + global $_POST; + + $smarty = new Smarty(); + $template = $_POST['key_value'].".tpl"; + switch($_POST['key_value']) { + case "conference.conf": + // simulate data from a database, perhaps a table with 3 columns did,value,args + $digits['pin'] = '1234'; + $digits['anounce-count'] = '2'; + $digits['max-mmebers'] = '15'; + $digits['energy-level'] = '300'; + $params['0'] = 'event'; + $params['1'] = 'event'; + $params['2'] = 'event'; + $params['3'] = 'event'; + $params['4'] = 'event'; + $params['5'] = 'event'; + $params['6'] = 'event'; + $params['7'] = 'event'; + $params['8'] = 'event'; + $params['9'] = 'event'; + $params['#'] = 'event'; + $params['*'] = 'event'; + + $smarty->assign('CONFNAME',$_POST['conf_name']); + $smarty->assign('digits',$digits); + $smarty->assign('params',$params); + } + if($smarty->template_exists($_SERVER['DOCUMENT_ROOT'].dirname($_SERVER['PHP_SELF'])."/templates/".$_SERVER['REMOTE_USER']."/".$template)) { + $smarty->display($_SERVER['DOCUMENT_ROOT'].dirname($_SERVER['PHP_SELF'])."/templates/".$_SERVER['REMOTE_USER']."/".$template); + } else { + // //logCallData(); + error_log("Unable to locate template $template"); + $smarty->assign('CONFNAME',$_POST['key_value']); + $smarty->display($_SERVER['DOCUMENT_ROOT'].dirname($_SERVER['PHP_SELF'])."/templates/".$_SERVER['REMOTE_USER']."/default.conf.tpl"); + } +} + +// register the callback +$callBacks['configuration']='configuration'; + +?> Added: freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/dialplan.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/dialplan.php Fri Jul 6 21:22:20 2007 @@ -0,0 +1,29 @@ +<?php // -*- mode:c; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil; -*- +function dialplan() +{ + global $_SERVER; + + + // create a new smarty object + $smarty = new Smarty(); + $template = 'fail.tpl'; + + + // see if they authenticated via .htaccess + if(isset($_SERVER['REMOTE_USER']) && $_SERVER['REMOTE_USER']!="") { + // we might check a database for the route, but in this example we hardcode it + $template = 'frompstn.tpl'; // one can exist for each profile or channel type or ... + + $ACTION['javascript']="somethingcool.js"; + $ACTION['bridge']="sofia/external/".$_POST['destination_number']."@myprovider.tld"; + $smarty->assign('ACTION',$ACTION); + + } // end - they were logged in + $smarty->display($_SERVER['DOCUMENT_ROOT']."/templates/".$_SERVER['REMOTE_USER']."/".$template); +} + + +// register the callback +$callBacks['dialplan']='dialplan'; + +?>

1 0

[Freeswitch-svn] [commit] r5502 - freeswitch/trunk/src
by Freeswitch SVN 06 Jul '07

06 Jul '07

Author: anthm Date: Fri Jul 6 12:29:25 2007 New Revision: 5502 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_session.c Log: fix startup race Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Jul 6 12:29:25 2007 @@ -398,6 +398,8 @@ switch_uuid_t uuid; memset(&runtime, 0, sizeof(runtime)); + runtime.no_new_sessions = 1; + /* INIT APR and Create the pool context */ if (apr_initialize() != SWITCH_STATUS_SUCCESS) { *err = "FATAL ERROR! Could not initilize APR\n"; @@ -577,6 +579,9 @@ "\nFreeSWITCH Version %s Started.\nCrash Protection [%s]\nMax Sessions[%u]\n\n", SWITCH_VERSION_FULL, runtime.crash_prot ? "Enabled" : "Disabled", switch_core_session_limit(0)); + + runtime.no_new_sessions = 0; + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Jul 6 12:29:25 2007 @@ -767,7 +767,10 @@ switch_uuid_t uuid; uint32_t count = 0; - assert(endpoint_interface != NULL); + if (!switch_core_ready() || endpoint_interface == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "The system cannot create any sessions at this time.\n"); + return NULL; + } switch_mutex_lock(session_manager.session_table_mutex); count = session_manager.session_count; @@ -778,11 +781,6 @@ return NULL; } - if (!switch_core_ready()) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read my lips: no new sessions!\n"); - return NULL; - } - if (pool && *pool) { usepool = *pool; *pool = NULL;

1 0

[Freeswitch-svn] [commit] r5501 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 06 Jul '07

06 Jul '07

Author: anthm Date: Fri Jul 6 12:19:40 2007 New Revision: 5501 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: futz with rtp 2833 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jul 6 12:19:40 2007 @@ -865,7 +865,7 @@ } if (!((tech_pvt->profile->pflags & PFLAG_REWRITE_TIMESTAMPS) || - ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_rewrite_timestamps")) && switch_true(val)))) { + ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_rewrite_timestamps")) && !switch_true(val)))) { flags |= SWITCH_RTP_FLAG_RAW_WRITE; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jul 6 12:19:40 2007 @@ -110,7 +110,6 @@ unsigned int out_digit_sofar; unsigned int out_digit_dur; uint16_t in_digit_seq; - uint16_t out_digit_seq; uint32_t out_digit_ssrc; int32_t timestamp_dtmf; char last_digit; @@ -135,6 +134,7 @@ uint16_t seq; uint16_t rseq; + uint8_t sending_dtmf; switch_payload_t payload; switch_payload_t rpayload; switch_rtp_invalid_handler_t invalid_handler; @@ -431,7 +431,7 @@ } - + rtp_session->dtmf_data.out_digit_ssrc = ssrc; rtp_session->pool = pool; rtp_session->te = 101; @@ -758,27 +758,26 @@ for (x = 0; x < loops; x++) { - rtp_session->dtmf_data.out_digit_seq++; + rtp_session->seq++; switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, 0, rtp_session->te, - rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_seq, rtp_session->dtmf_data.out_digit_ssrc, + rtp_session->dtmf_data.timestamp_dtmf, rtp_session->seq, rtp_session->dtmf_data.out_digit_ssrc, &flags); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, - rtp_session->dtmf_data.out_digit_sofar, duration, rtp_session->dtmf_data.out_digit_seq); + rtp_session->dtmf_data.out_digit_sofar, duration, rtp_session->seq); } - if (loops == 1) { - rtp_session->last_write_seq = 0; - } else { - rtp_session->dtmf_data.out_digit_seq = 0; + if (loops != 1) { + rtp_session->sending_dtmf = 0; } + } if (!rtp_session->dtmf_data.out_digit_dur && rtp_session->dtmf_data.dtmf_queue && switch_queue_size(rtp_session->dtmf_data.dtmf_queue)) { @@ -800,25 +799,24 @@ } else { rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; } - - rtp_session->dtmf_data.out_digit_seq = rtp_session->last_write_seq; - rtp_session->dtmf_data.out_digit_ssrc = rtp_session->last_write_ssrc; - + + rtp_session->sending_dtmf = 1; for (x = 0; x < 3; x++) { - rtp_session->dtmf_data.out_digit_seq++; + rtp_session->seq++; switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BUGGY_2833) ? 0 : 1, rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, - rtp_session->dtmf_data.out_digit_seq, rtp_session->dtmf_data.out_digit_ssrc, &flags); + rtp_session->seq, + rtp_session->dtmf_data.out_digit_ssrc, &flags); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send start packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", rtp_session->dtmf_data.out_digit, - rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, 0, rtp_session->dtmf_data.out_digit_seq); + rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, 0, rtp_session->seq); } rtp_session->dtmf_data.timestamp_dtmf += samples; free(rdigit); @@ -1027,6 +1025,7 @@ if ((time(NULL) - rtp_session->dtmf_data.last_digit_time) > 2) { rtp_session->dtmf_data.last_digit = 0; rtp_session->dtmf_data.dc = 0; + rtp_session->dtmf_data.in_digit_seq = 0; } if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { rtp_session->dtmf_data.in_digit_seq = in_digit_seq; @@ -1295,7 +1294,7 @@ rtp_session->cn = 0; m++; } - + send_msg = &rtp_session->send_msg; send_msg->header.pt = payload; send_msg->header.m = m ? 1 : 0; @@ -1424,8 +1423,7 @@ } } - - if (rtp_session->last_write_seq > 0 && rtp_session->last_write_seq <= rtp_session->dtmf_data.out_digit_seq) { + if (rtp_session->sending_dtmf) { send = 0; }

1 0

[Freeswitch-svn] [commit] r5500 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 05 Jul '07

05 Jul '07

Author: trixter Date: Thu Jul 5 17:24:54 2007 New Revision: 5500 Modified: freeswitch/trunk/scripts/contrib/trixter/Parse_XML_CDR.php Log: bug fix in parsing xml cdr records due to php auto html decoding data when it shouldnt Modified: freeswitch/trunk/scripts/contrib/trixter/Parse_XML_CDR.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/Parse_XML_CDR.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/Parse_XML_CDR.php Thu Jul 5 17:24:54 2007 @@ -9,6 +9,7 @@ var $_level = 0; function Parse_CDR_XML(&$data,$showattribs = false) { + $data = preg_replace("/<(.*?)><(.*?)><\/(.*?)>/","<\\1>\\2</\\3>",$data); $this->_showAttribs = $showattribs; $this->_parser = xml_parser_create(); @@ -74,6 +75,8 @@ if (!isset($start[$name])) $start[$name] = ''; $add = ''; } + + $update = &$start[$name]; if ($isattribs && !$this->_showAttribs) return;

1 0

[Freeswitch-svn] [commit] r5499 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 05 Jul '07

05 Jul '07

Author: anthm Date: Thu Jul 5 14:52:19 2007 New Revision: 5499 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: fix for MODAPP-21 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jul 5 14:52:19 2007 @@ -242,6 +242,8 @@ switch_channel_mark_ring_ready(channel); while (switch_channel_get_state(channel) == CS_INIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) { + switch_size_t olen = globals.timer.samples; + if (switch_time_now() - last >= waitsec) { char buf[512]; switch_event_t *event; @@ -254,25 +256,22 @@ switch_channel_event_set_data(channel, event); switch_event_fire(&event); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", buf); last = switch_time_now(); - if (ring_file) { + } + + if (ring_file) { + if (switch_core_timer_next(&globals.timer) != SWITCH_STATUS_SUCCESS) { + switch_core_file_close(&fh); + break; + } + switch_core_file_read(&fh, abuf, &olen); + if (olen == 0) { unsigned int pos = 0; switch_core_file_seek(&fh, &pos, 0, SEEK_SET); - for (;;) { - switch_size_t olen = 1024; - switch_core_file_read(&fh, abuf, &olen); - if (olen == 0) { - break; - } - WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.timer); - } } + WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.timer); } - - switch_yield(globals.read_codec.implementation->microseconds_per_frame); - } switch_clear_flag_locked((&globals), GFLAG_RING); }

1 0

[Freeswitch-svn] [commit] r5498 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/languages/mod_spidermonkey
by Freeswitch SVN 05 Jul '07

05 Jul '07

Author: anthm Date: Thu Jul 5 13:03:14 2007 New Revision: 5498 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_ivr_play_say.c Log: add uuid fsapi function, last_file_position variable, and volume controls to js callback volume:+1 etc Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Jul 5 13:03:14 2007 @@ -284,6 +284,9 @@ switch_buffer_t *audio_buffer; uint32_t thresh; uint32_t silence_hits; + uint32_t offset_pos; + uint32_t last_pos; + int32_t vol; }; /*! \brief Abstract interface to an asr module */ 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 Thu Jul 5 13:03:14 2007 @@ -311,6 +311,19 @@ return SWITCH_STATUS_SUCCESS; } + +SWITCH_STANDARD_API(uuid_function) +{ + switch_uuid_t uuid; + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + + switch_uuid_get(&uuid); + switch_uuid_format(uuid_str, &uuid); + stream->write_function(stream, "%s", uuid_str); + return SWITCH_STATUS_SUCCESS; +} + + #define SCHED_TRANSFER_SYNTAX "[+]<time> <uuid> <extension> [<dialplan>] [<context>]" SWITCH_STANDARD_API(sched_transfer_function) { @@ -1282,7 +1295,7 @@ SWITCH_ADD_API(commands_api_interface, "break", "Break", break_function, BREAK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "show", "Show", show_function, SHOW_SYNTAX); SWITCH_ADD_API(commands_api_interface, "status", "status", status_function, ""); - SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, UUID_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_bridge", "uuid_bridge", uuid_bridge_function, ""); SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); SWITCH_ADD_API(commands_api_interface, "session_record", "session record", session_record_function, SESS_REC_SYNTAX); SWITCH_ADD_API(commands_api_interface, "broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX); @@ -1294,6 +1307,7 @@ SWITCH_ADD_API(commands_api_interface, "sched_hangup", "Schedule a running call to hangup", sched_hangup_function, SCHED_HANGUP_SYNTAX); SWITCH_ADD_API(commands_api_interface, "sched_broadcast", "Schedule a broadcast event to a running call", sched_broadcast_function, SCHED_BROADCAST_SYNTAX); SWITCH_ADD_API(commands_api_interface, "sched_transfer", "Schedule a broadcast event to a running call", sched_transfer_function, SCHED_TRANSFER_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "create_uuid", "Create a uuid", uuid_function, UUID_SYNTAX); SWITCH_ADD_API(commands_api_interface, "sched_api", "Schedule an api command", sched_api_function, "[+]<time> <group_name> <command_string>"); SWITCH_ADD_API(commands_api_interface, "sched_del", "Delete a Scheduled task", sched_del_function, "<task_id>|<group_id>"); SWITCH_ADD_API(commands_api_interface, "xml_wrap", "Wrap another api command in xml", xml_wrap_api_function, "<command> <args>"); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Thu Jul 5 13:03:14 2007 @@ -930,6 +930,29 @@ } return SWITCH_STATUS_FALSE; + } else if (!strncasecmp(ret, "volume", 6)) { + char *p; + + if ((p = strchr(ret, ':'))) { + p++; + if (*p == '+' || *p == '-') { + int step; + if (!(step = atoi(p))) { + step = 1; + } + fh->vol += step; + } else { + int vol = atoi(p); + fh->vol = vol; + } + return SWITCH_STATUS_SUCCESS; + } + + if (fh->vol) { + switch_normalize_volume(fh->vol); + } + + return SWITCH_STATUS_FALSE; } else if (!strcasecmp(ret, "pause")) { if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) { switch_clear_flag(fh, SWITCH_FILE_PAUSE); @@ -1361,8 +1384,8 @@ switch_file_handle_t fh = { 0 }; JSFunction *function; switch_input_args_t args = { 0 }; - char *prebuf; - + char *prebuf, posbuf[35] = ""; + METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); @@ -1420,6 +1443,9 @@ JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; + snprintf(posbuf, sizeof(posbuf), "%u", fh.offset_pos); + switch_channel_set_variable(channel, "last_file_position", posbuf); + return JS_TRUE; } @@ -1768,15 +1794,19 @@ CHANNEL_SANITY_CHECK(); - if (argc > 1) { + if (argc > 0) { const switch_application_interface_t *application_interface; char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - char *app_arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + char *app_arg = NULL; struct js_session *jss = JS_GetPrivate(cx, obj); jsrefcount saveDepth; METHOD_SANITY_CHECK(); + if (argc > 1) { + app_arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + } + if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { saveDepth = JS_SuspendRequest(cx); Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Thu Jul 5 13:03:14 2007 @@ -110,11 +110,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_seek(switch_file_handle_t *fh, unsigned int *cur_pos, int64_t samples, int whence) { + switch_status_t status; + assert(fh != NULL); assert(fh->file_interface != NULL); switch_set_flag(fh, SWITCH_FILE_SEEK); - return fh->file_interface->file_seek(fh, cur_pos, samples, whence); + status = fh->file_interface->file_seek(fh, cur_pos, samples, whence); + if (samples) { + fh->offset_pos = *cur_pos; + } + return status; } SWITCH_DECLARE(switch_status_t) switch_core_file_set_string(switch_file_handle_t *fh, switch_audio_col_t col, const char *string) Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu Jul 5 13:03:14 2007 @@ -692,6 +692,7 @@ if (sample_start > 0) { uint32_t pos = 0; + switch_core_file_seek(fh, &pos, 0, SEEK_SET); switch_core_file_seek(fh, &pos, sample_start, SEEK_CUR); } @@ -879,6 +880,7 @@ if (done || olen <= 0) { break; } + if (!asis) { if (fh->speed > 2) { @@ -940,8 +942,15 @@ olen = llen; } - write_frame.datalen = (uint32_t) (olen * (asis ? 1 : 2)); - write_frame.samples = (uint32_t) olen; + write_frame.samples = olen; + + if (asis) { + write_frame.datalen = olen; + } else { + write_frame.datalen = write_frame.samples * 2; + } + + llen = olen; @@ -957,8 +966,13 @@ #endif stream_id = 0; - status = switch_core_session_write_frame(session, &write_frame, -1, stream_id); + if (fh->vol) { + switch_change_sln_volume(write_frame.data, write_frame.datalen / 2, fh->vol); + } + fh->offset_pos += write_frame.samples / 2; + status = switch_core_session_write_frame(session, &write_frame, -1, stream_id); + if (status == SWITCH_STATUS_MORE_DATA) { status = SWITCH_STATUS_SUCCESS; continue; @@ -991,6 +1005,8 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done playing file\n"); + switch_core_file_seek(fh, &fh->last_pos, 0, SEEK_CUR); + switch_core_file_close(fh); switch_buffer_destroy(&fh->audio_buffer); if (!asis) {

1 0