<p>Emmanuel BUU has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/9510">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">avoid merging command and regular T140 text<br><br>Change-Id: Ifbe993311410fa855cb8aa4a12084db75f413462<br>---<br>M res/res_rtp_asterisk.c<br>1 file changed, 15 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/10/9510/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c</span><br><span>index 1a1307f..82f86d0 100644</span><br><span>--- a/res/res_rtp_asterisk.c</span><br><span>+++ b/res/res_rtp_asterisk.c</span><br><span>@@ -6102,13 +6102,27 @@</span><br><span> {</span><br><span>   struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        if ( !rtp->red ) return 0;</span><br><span>        if (frame->datalen > -1) {</span><br><span>             struct rtp_red *red = rtp->red;</span><br><span style="color: hsl(120, 100%, 40%);">+            const unsigned char * primary = red->buf_data;</span><br><span style="color: hsl(120, 100%, 40%);">+             if (red->t140.datalen > 0 &&</span><br><span style="color: hsl(120, 100%, 40%);">+                (primary[0] == 0x08 || primary[0] == 0x0a || primary[0] == 0x0d)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                       /* flush previous t140 packet if it is a command */</span><br><span style="color: hsl(120, 100%, 40%);">+                   ast_rtp_write(instance, &rtp->red->t140);</span><br><span style="color: hsl(120, 100%, 40%);">+           }</span><br><span style="color: hsl(120, 100%, 40%);">+             else {</span><br><span style="color: hsl(120, 100%, 40%);">+                        primary = frame->data.ptr;</span><br><span style="color: hsl(120, 100%, 40%);">+                 if (primary[0] == 0x08 || primary[0] == 0x0a || primary[0] == 0x0d) {</span><br><span style="color: hsl(120, 100%, 40%);">+                         /* flush previous t140 packet we send commands */</span><br><span style="color: hsl(120, 100%, 40%);">+                             ast_rtp_write(instance, &rtp->red->t140);</span><br><span style="color: hsl(120, 100%, 40%);">+                   }</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>          memcpy(&red->buf_data[red->t140.datalen], frame->data.ptr, frame->datalen);</span><br><span>          red->t140.datalen += frame->datalen;</span><br><span>           red->t140.ts = frame->ts;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>    return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9510">change 9510</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9510"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifbe993311410fa855cb8aa4a12084db75f413462 </div>
<div style="display:none"> Gerrit-Change-Number: 9510 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Emmanuel BUU <emmanuel.buu@ives.fr> </div>