- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

07 Jul '07

Author: trixter Date: Fri Jul 6 22:10:28 2007 New Revision: 5510 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/curlrouting.php freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/dialplan.php Log: changed the way the module interface works a bit so that it can signal errors 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 22:10:28 2007 @@ -16,8 +16,9 @@ if(isset($_POST['section'])) { if(isset($callBacks[$_POST['section']])) { - call_user_func($callBacks[$_POST['section']]); - exit; + if(call_user_func($callBacks[$_POST['section']])==TRUE) { + exit; + } } } Header("HTTP/1.0 404 Not Found"); Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php Fri Jul 6 22:10:28 2007 @@ -13,6 +13,8 @@ $params['anounce-count'] = '2'; $params['max-mmebers'] = '15'; $params['energy-level'] = '300'; + $params['member-flags'] = 'waste'; + $digits['0'] = 'event'; $digits['1'] = 'event'; $digits['2'] = 'event'; @@ -33,11 +35,10 @@ 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"); + error_log("Unable to locate configuration file " . $_POST['key_value'] . " for " . $_SERVER['REMOTE_USER']); + return FALSE; } + return TRUE; } // register the callback Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/dialplan.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/dialplan.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/dialplan.php Fri Jul 6 22:10:28 2007 @@ -2,6 +2,7 @@ function dialplan() { global $_SERVER; + global $_POST; // create a new smarty object @@ -20,6 +21,8 @@ } // end - they were logged in $smarty->display($_SERVER['DOCUMENT_ROOT']."/templates/".$_SERVER['REMOTE_USER']."/".$template); + + return TRUE; }

1 0

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

07 Jul '07

Author: trixter Date: Fri Jul 6 21:54:35 2007 New Revision: 5509 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php Log: fixed typo to make this actually generate correct xml Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/modules/configuration.php Fri Jul 6 21:54:35 2007 @@ -9,22 +9,22 @@ 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'; + $params['pin'] = '1234'; + $params['anounce-count'] = '2'; + $params['max-mmebers'] = '15'; + $params['energy-level'] = '300'; + $digits['0'] = 'event'; + $digits['1'] = 'event'; + $digits['2'] = 'event'; + $digits['3'] = 'event'; + $digits['4'] = 'event'; + $digits['5'] = 'event'; + $digits['6'] = 'event'; + $digits['7'] = 'event'; + $digits['8'] = 'event'; + $digits['9'] = 'event'; + $digits['#'] = 'event'; + $digits['*'] = 'event'; $smarty->assign('CONFNAME',$_POST['conf_name']); $smarty->assign('digits',$digits);

1 0

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

07 Jul '07

Author: trixter Date: Fri Jul 6 21:45:36 2007 New Revision: 5508 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/README Log: better readme example config Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/README ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-cdr/README (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/README Fri Jul 6 21:45:36 2007 @@ -1,11 +1,23 @@ To use this you need to have the mod_xml_cdr loaded and configured. +If you use either errLogDir or logDir then make sure that the directories +exist. In the case of logDir the original code appended "/xml_cdr" onto +the value, so I do that as well. If logDir is set but empty (value="") +it will use the FreeSWITCH default log dir and appent "/xml_cdr" onto +that. + <configuration name="xml_cdr.conf" description="XML CDR CURL logger"> <settings> +  <param name="url" value="http://myhost/cdr.php"/> +  <param name="retries" value="2"/> +  <param name="delay" value="120"/> +  + <param name="errLogDir" value="/usr/local/freeswitch/log/xml_cdr_errors"/>

1 0

[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

[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

[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

[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

[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

[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

[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