<p>Stefan Sperling <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11521">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add DLCX command statistics to osmo-mgw<br><br>Add a counter group for DLCX commands. The group contains counters for<br>successful connection processing as well as various error conditions.<br>This provides a quick overview of DLCX failures on each trunk throughout<br>the lifetime of the osmo-mgw process.<br><br>The counters are displayed by 'show mgcp stats' and 'show rate-counters'<br><br>While here, rename MGCP_MDCX_FAIL_DEFERRED_BY_POLICY to<br>MGCP_MDCX_DEFERRED_BY_POLICY; we have decided that deferred connections<br>aren't failures, and this keeps names used by DLCX and MDCX in sync.<br><br>Also remove some allocation failure checks with OSMO_ASSERT(); such<br>checks aren't en vogue anymore.<br><br>Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b<br>Depends: I80d36181600901ae2e0f321dc02b5d54ddc94139I<br>Related: OS#2660<br>---<br>M include/osmocom/mgcp/mgcp.h<br>M src/libosmo-mgcp/mgcp_protocol.c<br>M src/libosmo-mgcp/mgcp_vty.c<br>3 files changed, 66 insertions(+), 11 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 aa5607f..034a780 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -152,9 +152,20 @@</span><br><span> MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC,</span><br><span> MGCP_MDCX_FAIL_START_RTP,</span><br><span> MGCP_MDCX_FAIL_REJECTED_BY_POLICY,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_DEFERRED_BY_POLICY</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_MDCX_DEFERRED_BY_POLICY</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Global MCGP DLCX related rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_DLCX_SUCCESS,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_DLCX_FAIL_WILDCARD,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_DLCX_FAIL_NO_CONN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_DLCX_FAIL_INVALID_CALLID,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_DLCX_FAIL_INVALID_CONNID,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_DLCX_FAIL_UNHANDLED_PARAM,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_DLCX_FAIL_REJECTED_BY_POLICY,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_DLCX_DEFERRED_BY_POLICY,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span> struct mgcp_trunk_config {</span><br><span> struct llist_head entry;</span><br><span>@@ -198,6 +209,8 @@</span><br><span> struct rate_ctr_group *mgcp_crcx_ctr_group;</span><br><span> /* Rate counter group which contains stats for processed MDCX commands. */</span><br><span> struct rate_ctr_group *mgcp_mdcx_ctr_group;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rate counter group which contains stats for processed DLCX commands. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *mgcp_dlcx_ctr_group;</span><br><span> /* Rate counter group which aggregates stats of individual RTP connections. */</span><br><span> struct rate_ctr_group *all_rtp_conn_stats;</span><br><span> };</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 3313164..eaf0e5a 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -93,7 +93,7 @@</span><br><span> [MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC] = {"mdcx:no_remote_conn_desc", "no opposite end specified for connection."},</span><br><span> [MGCP_MDCX_FAIL_START_RTP] = {"mdcx:start_rtp_failure", "failure to start RTP processing."},</span><br><span> [MGCP_MDCX_FAIL_REJECTED_BY_POLICY] = {"mdcx:conn_rejected", "connection rejected by policy."},</span><br><span style="color: hsl(0, 100%, 40%);">- [MGCP_MDCX_FAIL_DEFERRED_BY_POLICY] = {"mdcx:conn_deferred", "connection deferred by policy."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_MDCX_DEFERRED_BY_POLICY] = {"mdcx:conn_deferred", "connection deferred by policy."},</span><br><span> };</span><br><span> </span><br><span> const static struct rate_ctr_group_desc mgcp_mdcx_ctr_group_desc = {</span><br><span>@@ -104,6 +104,25 @@</span><br><span> .ctr_desc = mgcp_mdcx_ctr_desc</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc mgcp_dlcx_ctr_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_DLCX_SUCCESS] = {"dlcx:success", "DLCX command processed successfully."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_DLCX_FAIL_WILDCARD] = {"dlcx:wildcard", "wildcard names in DLCX commands are unsupported."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_DLCX_FAIL_NO_CONN] = {"dlcx:no_conn", "endpoint specified in DLCX command has no active connections."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_DLCX_FAIL_INVALID_CALLID] = {"dlcx:callid", "CallId specified in DLCX command mismatches endpoint's CallId ."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_DLCX_FAIL_INVALID_CONNID] = {"dlcx:connid", "connection ID specified in DLCX command does not exist on endpoint."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_DLCX_FAIL_UNHANDLED_PARAM] = {"dlcx:unhandled_param", "unhandled parameter in DLCX command."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_DLCX_FAIL_REJECTED_BY_POLICY] = {"dlcx:rejected", "connection deletion rejected by policy."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_DLCX_DEFERRED_BY_POLICY] = {"dlcx:deferred", "connection deletion deferred by policy."},</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%);">+const static struct rate_ctr_group_desc mgcp_dlcx_ctr_group_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_name_prefix = "dlcx",</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_description = "dlcx statistics",</span><br><span style="color: hsl(120, 100%, 40%);">+ .class_id = OSMO_STATS_CLASS_GLOBAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_ctr = ARRAY_SIZE(mgcp_dlcx_ctr_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ .ctr_desc = mgcp_dlcx_ctr_desc</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const static struct rate_ctr_group_desc all_rtp_conn_rate_ctr_group_desc = {</span><br><span> .group_name_prefix = "all_rtp_conn",</span><br><span> .group_description = "aggregated statistics for all rtp connections",</span><br><span>@@ -1192,7 +1211,7 @@</span><br><span> LOGP(DLMGCP, LOGL_DEBUG,</span><br><span> "MDCX: endpoint:0x%x deferred by policy\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_DEFERRED_BY_POLICY]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_DEFERRED_BY_POLICY]);</span><br><span> return NULL;</span><br><span> break;</span><br><span> case MGCP_POLICY_CONT:</span><br><span>@@ -1237,7 +1256,9 @@</span><br><span> /* DLCX command handler, processes the received command */</span><br><span> static struct msgb *handle_delete_con(struct mgcp_parse_data *p)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_trunk_config *tcfg = p->endp->tcfg;</span><br><span> struct mgcp_endpoint *endp = p->endp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *rate_ctrs = tcfg->mgcp_dlcx_ctr_group;</span><br><span> int error_code = 400;</span><br><span> int silent = 0;</span><br><span> char *line;</span><br><span>@@ -1254,6 +1275,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "DLCX: endpoint:0x%x wildcarded endpoint names not supported.\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_WILDCARD]);</span><br><span> return create_err_response(endp, 507, "DLCX", p->trans);</span><br><span> }</span><br><span> </span><br><span>@@ -1261,6 +1283,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "DLCX: endpoint:0x%x endpoint is not holding a connection.\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_NO_CONN]);</span><br><span> return create_err_response(endp, 515, "DLCX", p->trans);</span><br><span> }</span><br><span> </span><br><span>@@ -1272,13 +1295,16 @@</span><br><span> case 'C':</span><br><span> if (mgcp_verify_call_id(endp, line + 3) != 0) {</span><br><span> error_code = 516;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_INVALID_CALLID]);</span><br><span> goto error3;</span><br><span> }</span><br><span> break;</span><br><span> case 'I':</span><br><span> conn_id = (const char *)line + 3;</span><br><span style="color: hsl(0, 100%, 40%);">- if ((error_code = mgcp_verify_ci(endp, conn_id)))</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((error_code = mgcp_verify_ci(endp, conn_id))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_INVALID_CONNID]);</span><br><span> goto error3;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> case 'Z':</span><br><span> silent = strcmp("noanswer", line + 3) == 0;</span><br><span>@@ -1287,6 +1313,7 @@</span><br><span> LOGP(DLMGCP, LOGL_NOTICE,</span><br><span> "DLCX: endpoint:0x%x Unhandled MGCP option: '%c'/%d\n",</span><br><span> ENDPOINT_NUMBER(endp), line[0], line[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_UNHANDLED_PARAM]);</span><br><span> return create_err_response(NULL, 539, "DLCX", p->trans);</span><br><span> break;</span><br><span> }</span><br><span>@@ -1302,12 +1329,14 @@</span><br><span> LOGP(DLMGCP, LOGL_NOTICE,</span><br><span> "DLCX: endpoint:0x%x rejected by policy\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_REJECTED_BY_POLICY]);</span><br><span> if (silent)</span><br><span> goto out_silent;</span><br><span> return create_err_response(endp, 400, "DLCX", p->trans);</span><br><span> break;</span><br><span> case MGCP_POLICY_DEFER:</span><br><span> /* stop processing */</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_DEFERRED_BY_POLICY]);</span><br><span> return NULL;</span><br><span> break;</span><br><span> case MGCP_POLICY_CONT:</span><br><span>@@ -1320,9 +1349,13 @@</span><br><span> * wildcarded DLCX and drop all connections at once. (See also</span><br><span> * RFC3435 Section F.7) */</span><br><span> if (!conn_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int num_conns = llist_count(&endp->conns);</span><br><span> LOGP(DLMGCP, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "DLCX: endpoint:0x%x missing ci (connectionIdentifier), will remove all connections at once\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+ "DLCX: endpoint:0x%x missing ci (connectionIdentifier), will remove all connections (%d total) at once\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ num_conns, ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (num_conns > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&rate_ctrs->ctr[MGCP_DLCX_SUCCESS], num_conns);</span><br><span> </span><br><span> mgcp_endp_release(endp);</span><br><span> </span><br><span>@@ -1334,9 +1367,10 @@</span><br><span> </span><br><span> /* Find the connection */</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_INVALID_CONNID]);</span><br><span> goto error3;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* save the statistics of the current connection */</span><br><span> mgcp_format_stats(stats, sizeof(stats), conn->conn);</span><br><span> </span><br><span>@@ -1361,6 +1395,7 @@</span><br><span> p->cfg->change_cb(endp->tcfg, ENDPOINT_NUMBER(endp),</span><br><span> MGCP_ENDP_DLCX);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_SUCCESS]);</span><br><span> if (silent)</span><br><span> goto out_silent;</span><br><span> return create_ok_resp_with_param(endp, 250, "DLCX", p->trans, stats);</span><br><span>@@ -1503,24 +1538,27 @@</span><br><span> * a better way of assigning indices? */</span><br><span> static unsigned int crcx_rate_ctr_index = 0;</span><br><span> static unsigned int mdcx_rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static unsigned int dlcx_rate_ctr_index = 0;</span><br><span> static unsigned int all_rtp_conn_rate_ctr_index = 0;</span><br><span> </span><br><span> if (trunk->mgcp_crcx_ctr_group == NULL) {</span><br><span> trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(trunk->mgcp_crcx_ctr_group);</span><br><span> talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group);</span><br><span> crcx_rate_ctr_index++;</span><br><span> }</span><br><span> if (trunk->mgcp_mdcx_ctr_group == NULL) {</span><br><span> trunk->mgcp_mdcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_mdcx_ctr_group_desc, mdcx_rate_ctr_index);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(trunk->mgcp_mdcx_ctr_group);</span><br><span> talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group);</span><br><span> mdcx_rate_ctr_index++;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->mgcp_dlcx_ctr_group == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->mgcp_dlcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_dlcx_ctr_group_desc, dlcx_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_set_destructor(trunk->mgcp_dlcx_ctr_group, free_rate_counter_group);</span><br><span style="color: hsl(120, 100%, 40%);">+ dlcx_rate_ctr_index++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (trunk->all_rtp_conn_stats == NULL) {</span><br><span> trunk->all_rtp_conn_stats = rate_ctr_group_alloc(ctx, &all_rtp_conn_rate_ctr_group_desc,</span><br><span> all_rtp_conn_rate_ctr_index);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(trunk->all_rtp_conn_stats);</span><br><span> talloc_set_destructor(trunk->all_rtp_conn_stats, free_rate_counter_group);</span><br><span> all_rtp_conn_rate_ctr_index++;</span><br><span> }</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index e40d412..83f845a 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -249,6 +249,10 @@</span><br><span> vty_out(vty, " %s:%s", cfg->mgcp_crcx_ctr_group->desc->group_description, VTY_NEWLINE);</span><br><span> vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_crcx_ctr_group);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (show_stats && cfg->mgcp_dlcx_ctr_group) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s:%s", cfg->mgcp_dlcx_ctr_group->desc->group_description, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_dlcx_ctr_group);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (show_stats && cfg->mgcp_mdcx_ctr_group) {</span><br><span> vty_out(vty, " %s:%s", cfg->mgcp_mdcx_ctr_group->desc->group_description, VTY_NEWLINE);</span><br><span> vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_mdcx_ctr_group);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11521">change 11521</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/11521"/><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: Ie0dde2faf02fd68a69f986973d39b1bea367039b </div>
<div style="display:none"> Gerrit-Change-Number: 11521 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>