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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_client_fsm cleanup: Do not assert on DLCX failure<br><br>During FSM instance cleanup, a DLCX message composition may fail if a preceding<br>received MGCP message was missing parameters. If that occurs, don't crash, just<br>log an error and deallocate.<br><br>Change-Id: Ic1c3c4deeb4703b60e870af9d5d7be216a87fff8<br>---<br>M src/libosmo-mgcp-client/mgcp_client_fsm.c<br>1 file changed, 4 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>index e83a119..7565d32 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c</span><br><span>@@ -525,8 +525,10 @@</span><br><span>             LOGPFSML(fi, LOGL_ERROR,</span><br><span>                      "MGW/DLCX: abrupt FSM termination with connections still present, sending unconditional DLCX...\n");</span><br><span>              msg = make_dlcx_msg(mgcp_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-          OSMO_ASSERT(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-               mgcp_client_tx(mgcp, msg, NULL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+                if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+                     LOGPFSML(fi, LOGL_ERROR, "MGW/DLCX: Error composing DLCX message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+               else</span><br><span style="color: hsl(120, 100%, 40%);">+                  mgcp_client_tx(mgcp, msg, NULL, NULL);</span><br><span>       }</span><br><span> </span><br><span>        talloc_free(mgcp_ctx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15836">change 15836</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/+/15836"/><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: Ic1c3c4deeb4703b60e870af9d5d7be216a87fff8 </div>
<div style="display:none"> Gerrit-Change-Number: 15836 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>