<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15243">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  pespin: Looks good to me, approved
  osmith: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_send(): stop looping on conversion error<br><br>If mgcp_send() runs a transcoder loop, break the loop if rfc5993_hr_convert()<br>or amr_oa_bwe_convert() return with error. Possibly fixes an infinite loop<br>situation for erratic packets? (Didn't check for that in detail.)<br><br>Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c<br>---<br>M src/libosmo-mgcp/mgcp_network.c<br>1 file changed, 14 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index e163d23..53cdc06 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -870,13 +870,23 @@</span><br><span>                                                     addr, buf, buflen);</span><br><span> </span><br><span>                         if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                             amr_oa_bwe_convert(endp, buf, &buflen,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                 conn_dst->end.codec->param.amr_octet_aligned);</span><br><span style="color: hsl(120, 100%, 40%);">+                               rc = amr_oa_bwe_convert(endp, buf, &buflen,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                       conn_dst->end.codec->param.amr_octet_aligned);</span><br><span style="color: hsl(120, 100%, 40%);">+                          if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                      LOGPENDP(endp, DRTP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                                               "Error in AMR octet-aligned <-> bandwidth-efficient mode conversion\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                                     break;</span><br><span style="color: hsl(120, 100%, 40%);">+                                }</span><br><span>                    }</span><br><span>                    else if (rtp_end->rfc5993_hr_convert</span><br><span>                          && strcmp(conn_src->end.codec->subtype_name,</span><br><span style="color: hsl(0, 100%, 40%);">-                                "GSM-HR-08") == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                              rfc5993_hr_convert(endp, buf, &buflen);</span><br><span style="color: hsl(120, 100%, 40%);">+                                 "GSM-HR-08") == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                          rc = rfc5993_hr_convert(endp, buf, &buflen);</span><br><span style="color: hsl(120, 100%, 40%);">+                              if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                      LOGPENDP(endp, DRTP, LOGL_ERROR, "Error while converting to GSM-HR-08\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                                  break;</span><br><span style="color: hsl(120, 100%, 40%);">+                                }</span><br><span style="color: hsl(120, 100%, 40%);">+                     }</span><br><span> </span><br><span>                        LOGPENDP(endp, DRTP, LOGL_DEBUG,</span><br><span>                              "process/send to %s %s "</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15243">change 15243</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/c/osmo-mgw/+/15243"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c </div>
<div style="display:none"> Gerrit-Change-Number: 15243 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>