<!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][16207] </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=16207">16207</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-07 18:45:09 -0600 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCORE-523">FSCORE-523</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsstfustfuc">freeswitch/trunk/libs/stfu/stfu.c</a></li>
<li><a href="#freeswitchtrunklibsstfustfuh">freeswitch/trunk/libs/stfu/stfu.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivrc">freeswitch/trunk/src/switch_ivr.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="freeswitchtrunklibsstfustfuc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/stfu/stfu.c (16206 => 16207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/stfu/stfu.c 2010-01-08 00:41:10 UTC (rev 16206)
+++ freeswitch/trunk/libs/stfu/stfu.c 2010-01-08 00:45:09 UTC (rev 16207)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_t datalen, int last)
</del><ins>+stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void *data, size_t datalen, int last)
</ins><span class="cx"> {
</span><span class="cx"> uint32_t index;
</span><span class="cx"> stfu_frame_t *frame;
</span><span class="lines">@@ -203,10 +203,7 @@
</span><span class="cx"> if (stfu_n_process(i, i->out_queue) < 0) {
</span><span class="cx"> if (i->in_queue->array_len == i->in_queue->array_size && i->out_queue->array_len == i->out_queue->array_size) {
</span><span class="cx"> stfu_n_resize(i, i->out_queue->array_size * 2);
</span><del>- printf("DOH RESIZE\n");
</del><span class="cx"> }
</span><del>-
-
</del><span class="cx"> //return STFU_IT_FAILED;
</span><span class="cx"> }
</span><span class="cx"> for(index = 0; index < i->out_queue->array_len; index++) {
</span><span class="lines">@@ -226,6 +223,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> memcpy(frame->data, data, cplen);
</span><ins>+ frame->pt = pt;
</ins><span class="cx"> frame->ts = ts;
</span><span class="cx"> frame->dlen = cplen;
</span><span class="cx"> frame->was_read = 0;
</span></span></pre></div>
<a id="freeswitchtrunklibsstfustfuh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/stfu/stfu.h (16206 => 16207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/stfu/stfu.h 2010-01-08 00:41:10 UTC (rev 16206)
+++ freeswitch/trunk/libs/stfu/stfu.h 2010-01-08 00:45:09 UTC (rev 16207)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> struct stfu_frame {
</span><span class="cx"> uint32_t ts;
</span><ins>+ uint32_t pt;
</ins><span class="cx"> uint8_t data[STFU_DATALEN];
</span><span class="cx"> size_t dlen;
</span><span class="cx"> uint8_t was_read;
</span><span class="lines">@@ -97,12 +98,12 @@
</span><span class="cx"> void stfu_n_destroy(stfu_instance_t **i);
</span><span class="cx"> stfu_instance_t *stfu_n_init(uint32_t qlen);
</span><span class="cx"> stfu_status_t stfu_n_resize(stfu_instance_t *i, uint32_t qlen);
</span><del>-stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_t datalen, int last);
</del><ins>+stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void *data, size_t datalen, int last);
</ins><span class="cx"> stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i);
</span><span class="cx"> void stfu_n_reset(stfu_instance_t *i);
</span><span class="cx">
</span><span class="cx"> #define stfu_im_done(i) stfu_n_add_data(i, 0, NULL, 0, 1)
</span><del>-#define stfu_n_eat(i,t,d,l) stfu_n_add_data(i, t, d, l, 0)
</del><ins>+#define stfu_n_eat(i,t,p,d,l) stfu_n_add_data(i, t, p, d, l, 0)
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr.c (16206 => 16207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr.c 2010-01-08 00:41:10 UTC (rev 16206)
+++ freeswitch/trunk/src/switch_ivr.c 2010-01-08 00:45:09 UTC (rev 16207)
</span><span class="lines">@@ -2046,7 +2046,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- stfu_n_eat(jb, ts, read_frame->data, read_frame->datalen);
</del><ins>+ stfu_n_eat(jb, ts, read_frame->payload, read_frame->data, read_frame->datalen);
</ins><span class="cx"> ts += interval;
</span><span class="cx">
</span><span class="cx"> if ((jb_frame = stfu_n_read_a_frame(jb))) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (16206 => 16207)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_rtp.c 2010-01-08 00:41:10 UTC (rev 16206)
+++ freeswitch/trunk/src/switch_rtp.c 2010-01-08 00:45:09 UTC (rev 16207)
</span><span class="lines">@@ -1763,12 +1763,18 @@
</span><span class="cx"> rtp_session->stats.inbound.packet_count++;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (rtp_session->te && rtp_session->recv_msg.header.pt == rtp_session->te) {
+ return SWITCH_STATUS_SUCCESS;
+ }
+
+
</ins><span class="cx"> if (rtp_session->jb && rtp_session->recv_msg.header.version == 2 && *bytes) {
</span><span class="cx"> if (rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) {
</span><span class="cx"> stfu_n_reset(rtp_session->jb);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, *bytes - rtp_header_len);
</del><ins>+ stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.header.pt,
+ rtp_session->recv_msg.body, *bytes - rtp_header_len);
</ins><span class="cx"> *bytes = 0;
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -1783,7 +1789,8 @@
</span><span class="cx"> }
</span><span class="cx"> *bytes = jb_frame->dlen + rtp_header_len;
</span><span class="cx"> rtp_session->recv_msg.header.ts = htonl(jb_frame->ts);
</span><del>- rtp_session->recv_msg.header.pt = rtp_session->payload;
</del><ins>+ rtp_session->recv_msg.header.pt = jb_frame->pt;
+
</ins><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>