<!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][17017] </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=17017">17017</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-16 17:49:54 -0500 (Tue, 16 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix logic err that would not permit many acl entries in sofia</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_rtph">freeswitch/trunk/src/include/switch_rtp.h</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="freeswitchtrunksrcincludeswitch_rtph"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_rtp.h (17016 => 17017)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_rtp.h 2010-03-16 19:37:59 UTC (rev 17016)
+++ freeswitch/trunk/src/include/switch_rtp.h 2010-03-16 22:49:54 UTC (rev 17017)
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> \param te the payload type
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(void) switch_rtp_set_telephony_event(switch_rtp_t *rtp_session, switch_payload_t te);
</span><del>-
</del><ins>+SWITCH_DECLARE(void) switch_rtp_set_telephony_recv_event(switch_rtp_t *rtp_session, switch_payload_t te);
</ins><span class="cx"> /*!
</span><span class="cx"> \brief Set the payload type for comfort noise
</span><span class="cx"> \param rtp_session the RTP session to modify
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (17016 => 17017)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-03-16 19:37:59 UTC (rev 17016)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-03-16 22:49:54 UTC (rev 17017)
</span><span class="lines">@@ -5784,7 +5784,7 @@
</span><span class="cx">
</span><span class="cx"> for (x = 0; x < profile->acl_count; x++) {
</span><span class="cx"> last_acl = profile->acl[x];
</span><del>- if (!(ok = switch_check_network_list_ip_token(network_ip, last_acl, &token))) {
</del><ins>+ if ((ok = switch_check_network_list_ip_token(network_ip, last_acl, &token))) {
</ins><span class="cx"> break;
</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 (17016 => 17017)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-03-16 19:37:59 UTC (rev 17016)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-03-16 22:49:54 UTC (rev 17017)
</span><span class="lines">@@ -3507,10 +3507,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!te && !strcasecmp(rm_encoding, "telephone-event")) {
</span><del>- te = tech_pvt->te = (switch_payload_t) map->rm_pt;
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set 2833 dtmf payload to %u\n", te);
- if (tech_pvt->rtp_session) {
- switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te);
</del><ins>+ if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set 2833 dtmf recv payload to %u\n", te);
+ if (tech_pvt->rtp_session) {
+ switch_rtp_set_telephony_recv_event(tech_pvt->rtp_session, (switch_payload_t) map->rm_pt);
+ }
+ } else {
+ te = tech_pvt->te = (switch_payload_t) map->rm_pt;
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set 2833 dtmf send payload to %u\n", te);
+ if (tech_pvt->rtp_session) {
+ switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (17016 => 17017)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_rtp.c 2010-03-16 19:37:59 UTC (rev 17016)
+++ freeswitch/trunk/src/switch_rtp.c 2010-03-16 22:49:54 UTC (rev 17017)
</span><span class="lines">@@ -193,6 +193,7 @@
</span><span class="cx"> struct switch_rtp_vad_data vad_data;
</span><span class="cx"> struct switch_rtp_rfc2833_data dtmf_data;
</span><span class="cx"> switch_payload_t te;
</span><ins>+ switch_payload_t recv_te;
</ins><span class="cx"> switch_payload_t cng_pt;
</span><span class="cx"> switch_mutex_t *flag_mutex;
</span><span class="cx"> switch_mutex_t *read_mutex;
</span><span class="lines">@@ -1122,8 +1123,8 @@
</span><span class="cx">
</span><span class="cx"> rtp_session->pool = pool;
</span><span class="cx"> rtp_session->te = 101;
</span><ins>+ rtp_session->recv_te = 101;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> switch_mutex_init(&rtp_session->flag_mutex, SWITCH_MUTEX_NESTED, pool);
</span><span class="cx"> switch_mutex_init(&rtp_session->read_mutex, SWITCH_MUTEX_NESTED, pool);
</span><span class="cx"> switch_mutex_init(&rtp_session->write_mutex, SWITCH_MUTEX_NESTED, pool);
</span><span class="lines">@@ -1336,6 +1337,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+SWITCH_DECLARE(void) switch_rtp_set_telephony_recv_event(switch_rtp_t *rtp_session, switch_payload_t te)
+{
+ if (te > 95) {
+ rtp_session->recv_te = te;
+ }
+}
+
</ins><span class="cx"> SWITCH_DECLARE(void) switch_rtp_set_cng_pt(switch_rtp_t *rtp_session, switch_payload_t pt)
</span><span class="cx"> {
</span><span class="cx"> rtp_session->cng_pt = pt;
</span><span class="lines">@@ -1784,7 +1793,7 @@
</span><span class="cx">
</span><span class="cx"> if (*bytes) {
</span><span class="cx"> rtp_session->stats.inbound.raw_bytes += *bytes;
</span><del>- if (rtp_session->te && rtp_session->recv_msg.header.pt == rtp_session->te) {
</del><ins>+ if (rtp_session->recv_te && rtp_session->recv_msg.header.pt == rtp_session->recv_te) {
</ins><span class="cx"> rtp_session->stats.inbound.dtmf_packet_count++;
</span><span class="cx"> } else if (rtp_session->cng_pt && (rtp_session->recv_msg.header.pt == rtp_session->cng_pt || rtp_session->recv_msg.header.pt == 13)) {
</span><span class="cx"> rtp_session->stats.inbound.cng_packet_count++;
</span><span class="lines">@@ -1796,13 +1805,13 @@
</span><span class="cx"> rtp_session->stats.inbound.packet_count++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (rtp_session->te && rtp_session->recv_msg.header.pt == rtp_session->te) {
</del><ins>+ if (rtp_session->recv_te && rtp_session->recv_msg.header.pt == rtp_session->recv_te) {
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (rtp_session->jb && rtp_session->recv_msg.header.version == 2 && *bytes) {
</span><del>- if (rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) {
</del><ins>+ if (rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->recv_te) {
</ins><span class="cx"> stfu_n_reset(rtp_session->jb);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1974,7 +1983,7 @@
</span><span class="cx"> goto recvfrom;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (bytes && rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) {
</del><ins>+ if (bytes && rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->recv_te) {
</ins><span class="cx"> rtp_flush_read_buffer(rtp_session, SWITCH_RTP_FLUSH_ONCE);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2166,7 +2175,7 @@
</span><span class="cx">
</span><span class="cx"> stat = srtp_unprotect(rtp_session->recv_ctx, &rtp_session->recv_msg.header, &sbytes);
</span><span class="cx">
</span><del>- if (stat && rtp_session->recv_msg.header.pt != rtp_session->te && rtp_session->recv_msg.header.pt != rtp_session->cng_pt) {
</del><ins>+ if (stat && rtp_session->recv_msg.header.pt != rtp_session->recv_te && rtp_session->recv_msg.header.pt != rtp_session->cng_pt) {
</ins><span class="cx"> if (++rtp_session->srtp_errs >= MAX_SRTP_ERRS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</span><span class="cx"> "Error: SRTP unprotect failed with code %d%s\n", stat,
</span><span class="lines">@@ -2201,7 +2210,7 @@
</span><span class="cx"> doing it right. Nice guys finish last!
</span><span class="cx"> */
</span><span class="cx"> if (bytes && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA) &&
</span><del>- !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) && rtp_session->recv_msg.header.pt == rtp_session->te) {
</del><ins>+ !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) && rtp_session->recv_msg.header.pt == rtp_session->recv_te) {
</ins><span class="cx"> switch_size_t len = bytes - rtp_header_len;
</span><span class="cx"> unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body;
</span><span class="cx"> int end;
</span><span class="lines">@@ -2517,7 +2526,7 @@
</span><span class="cx"> frame->packetlen = bytes;
</span><span class="cx"> frame->source = __FILE__;
</span><span class="cx"> switch_set_flag(frame, SFF_RAW_RTP);
</span><del>- if (frame->payload == rtp_session->te) {
</del><ins>+ if (frame->payload == rtp_session->recv_te) {
</ins><span class="cx"> switch_set_flag(frame, SFF_RFC2833);
</span><span class="cx"> }
</span><span class="cx"> frame->timestamp = ntohl(rtp_session->recv_msg.header.ts);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>