<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15781] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15781">15781</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-03 16:51:50 -0600 (Thu, 03 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>huge sonus infection <a href="http://jira.freeswitch.org/browse/FSRTP-8">FSRTP-8</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_rtpc">freeswitch/trunk/src/switch_rtp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15780 => 15781)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-12-03 22:15:22 UTC (rev 15780)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-12-03 22:51:50 UTC (rev 15781)
</span><span class="lines">@@ -789,7 +789,7 @@
</span><span class="cx"> if (tech_pvt->read_frame.datalen > 0) {
</span><span class="cx"> uint32_t bytes = 0;
</span><span class="cx"> int frames = 1;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) {
</span><span class="cx"> if (!tech_pvt->read_codec.implementation || !switch_core_codec_ready(&tech_pvt->read_codec)) {
</span><span class="cx"> *frame = NULL;
</span><span class="lines">@@ -808,11 +808,13 @@
</span><span class="cx"> if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_impl.encoded_bytes_per_packet) {
</span><span class="cx"> uint32_t codec_ms = (int)(tech_pvt->read_frame.timestamp -
</span><span class="cx"> tech_pvt->last_ts) / (tech_pvt->read_impl.samples_per_second / 1000);
</span><del>- if ((codec_ms % 10) != 0) {
- tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES;
</del><ins>+
+ if ((codec_ms % 10) != 0 || codec_ms > tech_pvt->read_impl.samples_per_packet * 10) {
+ tech_pvt->last_ts = 0;
</ins><span class="cx"> goto skip;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if (tech_pvt->last_codec_ms && tech_pvt->last_codec_ms == codec_ms) {
</span><span class="cx"> tech_pvt->mismatch_count++;
</span><span class="cx"> }
</span><span class="lines">@@ -839,22 +841,18 @@
</span><span class="cx"> "This issue has so far been identified to happen on the following broken platforms/devices:\n"
</span><span class="cx"> "Linksys/Sipura aka Cisco\n"
</span><span class="cx"> "ShoreTel\n"
</span><del>- "Sonus/L3 (If you're really lucky, you may even get this message twice once they "
- "answer and change it back again!! Go Sonus!)\n"
</del><ins>+ "Sonus/L3\n"
</ins><span class="cx"> "We will try to fix it but some of the devices on this list are so broken who knows what will happen..\n"
</span><span class="cx"> ,
</span><span class="cx"> (int)tech_pvt->codec_ms, (int)codec_ms);
</span><del>- tech_pvt->codec_ms = codec_ms;
- switch_core_session_lock_codec_write(session);
- switch_core_session_lock_codec_read(session);
</del><span class="cx">
</span><del>- switch_core_codec_destroy(&tech_pvt->read_codec);
- switch_core_codec_destroy(&tech_pvt->write_codec);
</del><ins>+ switch_channel_set_variable_printf(channel, "sip_h_X-Broken-PTIME", "Adv=%d;Sent=%d",
+ (int)tech_pvt->codec_ms, (int)codec_ms);
+
+ tech_pvt->codec_ms = codec_ms;
</ins><span class="cx">
</span><span class="cx"> if (sofia_glue_tech_set_codec(tech_pvt, 2) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> *frame = NULL;
</span><del>- switch_core_session_unlock_codec_write(session);
- switch_core_session_unlock_codec_read(session);
</del><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -887,19 +885,11 @@
</span><span class="cx"> tech_pvt->read_impl.samples_per_packet;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (switch_rtp_change_interval(tech_pvt->rtp_session,
- tech_pvt->codec_ms * 1000,
- tech_pvt->read_impl.samples_per_packet
- ) != SWITCH_STATUS_SUCCESS) {
- switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
-
- }
-
- tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES;
</del><ins>+
+ tech_pvt->check_frames = 0;
+ tech_pvt->last_ts = 0;
</ins><span class="cx"> /* inform them of the codec they are actually sending */
</span><span class="cx"> sofia_glue_do_invite(session);
</span><del>- switch_core_session_unlock_codec_write(session);
- switch_core_session_unlock_codec_read(session);
</del><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1182,10 +1172,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> if ((var = switch_channel_get_variable(channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) {
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_SECURE);
</span><span class="cx"> }
</span><ins>+
+ if (sofia_test_pflag(tech_pvt->profile, PFLAG_AUTOFIX_TIMING)) {
+ tech_pvt->check_frames = 0;
+ tech_pvt->last_ts = 0;
+ }
+
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> default:
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15780 => 15781)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-03 22:15:22 UTC (rev 15780)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-12-03 22:51:50 UTC (rev 15781)
</span><span class="lines">@@ -3337,6 +3337,7 @@
</span><span class="cx">
</span><span class="cx"> if (sofia_test_pflag(tech_pvt->profile, PFLAG_AUTOFIX_TIMING)) {
</span><span class="cx"> tech_pvt->check_frames = 0;
</span><ins>+ tech_pvt->last_ts = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (15780 => 15781)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-12-03 22:15:22 UTC (rev 15780)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-12-03 22:51:50 UTC (rev 15781)
</span><span class="lines">@@ -2057,21 +2057,24 @@
</span><span class="cx"> int ms;
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> int resetting = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!tech_pvt->iananame) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "No audio codec available\n");
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (tech_pvt->read_codec.implementation && switch_core_codec_ready(&tech_pvt->read_codec)) {
</del><ins>+ if (switch_core_codec_ready(&tech_pvt->read_codec)) {
</ins><span class="cx"> if (!force) {
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, end);
</span><span class="cx"> }
</span><del>- if (strcasecmp(tech_pvt->read_codec.implementation->iananame, tech_pvt->iananame) ||
- tech_pvt->read_codec.implementation->samples_per_second != tech_pvt->rm_rate) {
</del><ins>+ if (strcasecmp(tech_pvt->read_impl.iananame, tech_pvt->iananame) ||
+ tech_pvt->read_impl.samples_per_second != tech_pvt->rm_rate ||
+ tech_pvt->codec_ms != tech_pvt->read_impl.microseconds_per_packet) {
+
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Changing Codec from %s@%dms to %s@%dms\n",
+ tech_pvt->read_impl.iananame, tech_pvt->read_impl.microseconds_per_packet / 1000,
+ tech_pvt->rm_encoding, tech_pvt->codec_ms);
</ins><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Changing Codec from %s to %s\n",
- tech_pvt->read_codec.implementation->iananame, tech_pvt->rm_encoding);
</del><span class="cx"> switch_core_session_lock_codec_write(tech_pvt->session);
</span><span class="cx"> switch_core_session_lock_codec_read(tech_pvt->session);
</span><span class="cx"> resetting = 1;
</span><span class="lines">@@ -2079,7 +2082,7 @@
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->write_codec);
</span><span class="cx"> switch_core_session_reset(tech_pvt->session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Already using %s\n", tech_pvt->read_codec.implementation->iananame);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Already using %s\n", tech_pvt->read_impl.iananame);
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, end);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2119,9 +2122,14 @@
</span><span class="cx">
</span><span class="cx"> if (switch_rtp_ready(tech_pvt->rtp_session)) {
</span><span class="cx"> switch_assert(tech_pvt->read_codec.implementation);
</span><del>- switch_rtp_set_interval(tech_pvt->rtp_session,
- tech_pvt->write_codec.implementation->microseconds_per_packet,
- tech_pvt->read_impl.samples_per_packet);
</del><ins>+
+ if (switch_rtp_change_interval(tech_pvt->rtp_session,
+ tech_pvt->read_impl.microseconds_per_packet,
+ tech_pvt->read_impl.samples_per_packet
+ ) != SWITCH_STATUS_SUCCESS) {
+ switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+ switch_goto_status(SWITCH_STATUS_FALSE, end);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tech_pvt->read_frame.rate = tech_pvt->rm_rate;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (15780 => 15781)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_rtp.c 2009-12-03 22:15:22 UTC (rev 15780)
+++ freeswitch/trunk/src/switch_rtp.c 2009-12-03 22:51:50 UTC (rev 15781)
</span><span class="lines">@@ -1052,26 +1052,38 @@
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_rtp_change_interval(switch_rtp_t *rtp_session, uint32_t ms_per_packet, uint32_t samples_per_interval)
</span><span class="cx"> {
</span><ins>+ switch_status_t status = SWITCH_STATUS_SUCCESS;
+ int change_timer = 0;
+
+ if (rtp_session->ms_per_packet && rtp_session->ms_per_packet != ms_per_packet) {
+ change_timer = 1;
+ }
</ins><span class="cx">
</span><span class="cx"> switch_rtp_set_interval(rtp_session, ms_per_packet, samples_per_interval);
</span><span class="cx">
</span><del>- if (rtp_session->timer_name) {
</del><ins>+ if (change_timer && rtp_session->timer_name) {
+ READ_INC(rtp_session);
+ WRITE_INC(rtp_session);
+
</ins><span class="cx"> if (rtp_session->timer.timer_interface) {
</span><span class="cx"> switch_core_timer_destroy(&rtp_session->timer);
</span><span class="cx"> }
</span><del>- if (switch_core_timer_init(&rtp_session->timer,
- rtp_session->timer_name, ms_per_packet / 1000, samples_per_interval, rtp_session->pool) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if ((status = switch_core_timer_init(&rtp_session->timer,
+ rtp_session->timer_name, ms_per_packet / 1000,
+ samples_per_interval, rtp_session->pool)) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</span><span class="cx"> "RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet);
</span><span class="cx"> } else {
</span><span class="cx"> memset(&rtp_session->timer, 0, sizeof(rtp_session->timer));
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</span><span class="cx"> "Problem RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet / 1000);
</span><del>- return SWITCH_STATUS_FALSE;
</del><span class="cx"> }
</span><ins>+
+ WRITE_DEC(rtp_session);
+ READ_DEC(rtp_session);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return status;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session,
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>