<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11496">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add more mgcp crxc error counters<br><br>Add counters for error conditions which I overlooked in<br>commit 1e174875bf72c3d7840fa98cfad8c410a542919e<br><br>Change-Id: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d<br>Depends: If4f097c5e441914eaa24c7657813ebb3f9a49916<br>Related: OS#2660<br>---<br>M include/osmocom/mgcp/mgcp.h<br>M src/libosmo-mgcp/mgcp_protocol.c<br>2 files changed, 13 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h</span><br><span>index f9f0ac7..b866f91 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -131,6 +131,10 @@</span><br><span> MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC,</span><br><span> MGCP_CRCX_FAIL_START_RTP,</span><br><span> MGCP_CRCX_FAIL_REJECTED_BY_POLICY,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_NO_OSMUX,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_CODEC_NEGOTIATION,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_BIND_PORT,</span><br><span> };</span><br><span> </span><br><span> struct mgcp_trunk_config {</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 24c8e54..ccbdfc8 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -64,6 +64,10 @@</span><br><span> [MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC] = {"crcx:no_remote_conn_desc", "no opposite end specified for connection."},</span><br><span> [MGCP_CRCX_FAIL_START_RTP] = {"crcx:start_rtp_failure", "failure to start RTP processing."},</span><br><span> [MGCP_CRCX_FAIL_REJECTED_BY_POLICY] = {"crcx:conn_rejected", "connection rejected by policy."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_CRCX_FAIL_NO_OSMUX] = {"crcx:no_osmux", "no osmux offered by peer."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS] = {"crcx:conn_opt", "connection options invalid."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_CRCX_FAIL_CODEC_NEGOTIATION] = {"crcx:codec_nego", "codec negotiation failure."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_CRCX_FAIL_BIND_PORT] = {"crcx:bind_port", "port bind failure."},</span><br><span> };</span><br><span> </span><br><span> const static struct rate_ctr_group_desc mgcp_crcx_ctr_group_desc = {</span><br><span>@@ -863,6 +867,7 @@</span><br><span> </span><br><span> if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) {</span><br><span> error_code = 517;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_MODE]);</span><br><span> goto error2;</span><br><span> }</span><br><span> </span><br><span>@@ -876,6 +881,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "CRCX: endpoint:0x%x osmux only and no osmux offered\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_OSMUX]);</span><br><span> goto error2;</span><br><span> }</span><br><span> </span><br><span>@@ -888,6 +894,7 @@</span><br><span> "CRCX: endpoint:%x inavlid local connection options!\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span> error_code = rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS]);</span><br><span> goto error2;</span><br><span> }</span><br><span> }</span><br><span>@@ -897,6 +904,7 @@</span><br><span> mgcp_codec_summary(conn);</span><br><span> if (rc) {</span><br><span> error_code = rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_CODEC_NEGOTIATION]);</span><br><span> goto error2;</span><br><span> }</span><br><span> </span><br><span>@@ -923,6 +931,7 @@</span><br><span> }</span><br><span> </span><br><span> if (allocate_port(endp, conn) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_BIND_PORT]);</span><br><span> goto error2;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11496">change 11496</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/11496"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d </div>
<div style="display:none"> Gerrit-Change-Number: 11496 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>