<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11499">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 MDCX command statistics to osmo-mgw<br><br>Add a counter group for MDCX commands. The group contains counters for<br>successful connection processing as well as various error conditions.<br>This provides a quick overview of MDCX 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>Change-Id: I79c27425ba40c3a85edc6cd846cba325d847298c<br>Depends: Ia2004f8063f3a50b5d7a838ebe8a784a47fcc50d<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, 92 insertions(+), 18 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 b866f91..c8c2cfd 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -137,6 +137,25 @@</span><br><span>     MGCP_CRCX_FAIL_BIND_PORT,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Global MCGP MDCX related rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+     MGCP_MDCX_SUCCESS,</span><br><span style="color: hsl(120, 100%, 40%);">+    MGCP_MDCX_FAIL_WILDCARD,</span><br><span style="color: hsl(120, 100%, 40%);">+      MGCP_MDCX_FAIL_NO_CONN,</span><br><span style="color: hsl(120, 100%, 40%);">+       MGCP_MDCX_FAIL_INVALID_CALLID,</span><br><span style="color: hsl(120, 100%, 40%);">+        MGCP_MDCX_FAIL_INVALID_CONNID,</span><br><span style="color: hsl(120, 100%, 40%);">+        MGCP_MDCX_FAIL_UNHANDLED_PARAM,</span><br><span style="color: hsl(120, 100%, 40%);">+       MGCP_MDCX_FAIL_NO_CONNID,</span><br><span style="color: hsl(120, 100%, 40%);">+     MGCP_MDCX_FAIL_CONN_NOT_FOUND,</span><br><span style="color: hsl(120, 100%, 40%);">+        MGCP_MDCX_FAIL_INVALID_MODE,</span><br><span style="color: hsl(120, 100%, 40%);">+  MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS,</span><br><span style="color: hsl(120, 100%, 40%);">+  MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC,</span><br><span style="color: hsl(120, 100%, 40%);">+   MGCP_MDCX_FAIL_START_RTP,</span><br><span style="color: hsl(120, 100%, 40%);">+     MGCP_MDCX_FAIL_REJECTED_BY_POLICY,</span><br><span style="color: hsl(120, 100%, 40%);">+    MGCP_MDCX_FAIL_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%);">+</span><br><span> struct mgcp_trunk_config {</span><br><span>      struct llist_head entry;</span><br><span> </span><br><span>@@ -177,6 +196,7 @@</span><br><span> </span><br><span>       /* rate counters */</span><br><span>  struct rate_ctr_group *mgcp_crcx_ctr_group;</span><br><span style="color: hsl(120, 100%, 40%);">+   struct rate_ctr_group *mgcp_mdcx_ctr_group;</span><br><span> };</span><br><span> </span><br><span> enum mgcp_role {</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index ccbdfc8..3a0e4ea 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span>   [MGCP_CRCX_FAIL_BAD_ACTION] = {"crcx:bad_action", "bad action in CRCX command."},</span><br><span>        [MGCP_CRCX_FAIL_UNHANDLED_PARAM] = {"crcx:unhandled_param", "unhandled parameter in CRCX command."},</span><br><span>     [MGCP_CRCX_FAIL_MISSING_CALLID] = {"crcx:missing_callid", "missing CallId in CRCX command."},</span><br><span style="color: hsl(0, 100%, 40%);">-       [MGCP_CRCX_FAIL_INVALID_MODE] = {"crcx:invalid_mode", "connection invalid mode in CRCX command."},</span><br><span style="color: hsl(120, 100%, 40%);">+        [MGCP_CRCX_FAIL_INVALID_MODE] = {"crcx:invalid_mode", "invalid connection mode in CRCX command."},</span><br><span>       [MGCP_CRCX_FAIL_LIMIT_EXCEEDED] = {"crcx:limit_exceeded", "limit of concurrent connections was reached."},</span><br><span>       [MGCP_CRCX_FAIL_UNKNOWN_CALLID] = {"crcx:unkown_callid", "unknown CallId in CRCX command."},</span><br><span>     [MGCP_CRCX_FAIL_ALLOC_CONN] = {"crcx:alloc_conn_fail", "connection allocation failure."},</span><br><span>@@ -78,6 +78,31 @@</span><br><span>   .ctr_desc = mgcp_crcx_ctr_desc</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc mgcp_mdcx_ctr_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+  [MGCP_MDCX_SUCCESS] = {"mdcx:success", "MDCX command processed successfully."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [MGCP_MDCX_FAIL_WILDCARD] = {"mdcx:wildcard", "wildcard endpoint names in MDCX commands are unsupported."},</span><br><span style="color: hsl(120, 100%, 40%);">+       [MGCP_MDCX_FAIL_NO_CONN] = {"mdcx:no_conn", "endpoint specified in MDCX command has no active connections."},</span><br><span style="color: hsl(120, 100%, 40%);">+     [MGCP_MDCX_FAIL_INVALID_CALLID] = {"mdcx:callid", "invalid CallId specified in MDCX command."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [MGCP_MDCX_FAIL_INVALID_CONNID] = {"mdcx:connid", "invalid connection ID specified in MDCX command."},</span><br><span style="color: hsl(120, 100%, 40%);">+    [MGCP_MDCX_FAIL_UNHANDLED_PARAM] = {"crcx:unhandled_param", "unhandled parameter in MDCX command."},</span><br><span style="color: hsl(120, 100%, 40%);">+      [MGCP_MDCX_FAIL_NO_CONNID] = {"mdcx:no_connid", "no connection ID specified in MDCX command."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [MGCP_MDCX_FAIL_CONN_NOT_FOUND] = {"mdcx:conn_not_found", "connection specified in MDCX command does not exist."},</span><br><span style="color: hsl(120, 100%, 40%);">+        [MGCP_MDCX_FAIL_INVALID_MODE] = {"mdcx:invalid_mode", "invalid connection mode in MDCX command."},</span><br><span style="color: hsl(120, 100%, 40%);">+        [MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS] = {"mdcx:conn_opt", "connection options invalid."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC] = {"mdcx:no_remote_conn_desc", "no opposite end specified for connection."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [MGCP_MDCX_FAIL_START_RTP] = {"mdcx:start_rtp_failure", "failure to start RTP processing."},</span><br><span style="color: hsl(120, 100%, 40%);">+      [MGCP_MDCX_FAIL_REJECTED_BY_POLICY] = {"mdcx:conn_rejected", "connection rejected by policy."},</span><br><span style="color: hsl(120, 100%, 40%);">+   [MGCP_MDCX_FAIL_DEFERRED_BY_POLICY] = {"mdcx:conn_deferred", "connection 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_mdcx_ctr_group_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+       .group_name_prefix = "mdcx",</span><br><span style="color: hsl(120, 100%, 40%);">+        .group_description = "mdcx 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_mdcx_ctr_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+    .ctr_desc = mgcp_mdcx_ctr_desc</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data);</span><br><span> static struct msgb *handle_create_con(struct mgcp_parse_data *data);</span><br><span> static struct msgb *handle_delete_con(struct mgcp_parse_data *data);</span><br><span>@@ -999,7 +1024,9 @@</span><br><span> /* MDCX command handler, processes the received command */</span><br><span> static struct msgb *handle_modify_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_mdcx_ctr_group;</span><br><span>     int error_code = 500;</span><br><span>        int silent = 0;</span><br><span>      int have_sdp = 0;</span><br><span>@@ -1017,6 +1044,7 @@</span><br><span>            LOGP(DLMGCP, LOGL_ERROR,</span><br><span>                  "MDCX: 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_MDCX_FAIL_WILDCARD]);</span><br><span>               return create_err_response(endp, 507, "MDCX", p->trans);</span><br><span>        }</span><br><span> </span><br><span>@@ -1024,6 +1052,7 @@</span><br><span>                LOGP(DLMGCP, LOGL_ERROR,</span><br><span>                  "MDCX: 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_MDCX_FAIL_NO_CONN]);</span><br><span>                return create_err_response(endp, 400, "MDCX", p->trans);</span><br><span>        }</span><br><span> </span><br><span>@@ -1034,14 +1063,17 @@</span><br><span>              switch (line[0]) {</span><br><span>           case 'C':</span><br><span>                    if (mgcp_verify_call_id(endp, line + 3) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                               rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CALLID]);</span><br><span>                                 error_code = 516;</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_MDCX_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 'L':</span><br><span>                    local_options = (const char *)line + 3;</span><br><span>@@ -1060,6 +1092,7 @@</span><br><span>                      LOGP(DLMGCP, LOGL_NOTICE,</span><br><span>                         "MDCX: 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_MDCX_FAIL_UNHANDLED_PARAM]);</span><br><span>                        return create_err_response(NULL, 539, "MDCX", p->trans);</span><br><span>                        break;</span><br><span>               }</span><br><span>@@ -1070,15 +1103,19 @@</span><br><span>          LOGP(DLMGCP, LOGL_ERROR,</span><br><span>                  "MDCX: endpoint:0x%x insufficient parameters, missing ci (connectionIdentifier)\n",</span><br><span>                ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+          rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_CONNID]);</span><br><span>              return create_err_response(endp, 515, "MDCX", p->trans);</span><br><span>        }</span><br><span> </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_MDCX_FAIL_CONN_NOT_FOUND]);</span><br><span>                 return create_err_response(endp, 400, "MDCX", p->trans);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span>        if (mode) {</span><br><span>          if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                   rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_MODE]);</span><br><span>                   error_code = 517;</span><br><span>                    goto error3;</span><br><span>                 }</span><br><span>@@ -1091,9 +1128,10 @@</span><br><span>                                     &endp->local_options, local_options);</span><br><span>               if (rc != 0) {</span><br><span>                       LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                             "MDCX: endpoint:%x inavlid local connection options!\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                            "MDCX: endpoint:%x invalid 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_MDCX_FAIL_INVALID_CONN_OPTIONS]);</span><br><span>                   goto error3;</span><br><span>                 }</span><br><span>    }</span><br><span>@@ -1114,12 +1152,15 @@</span><br><span>               "MDCX: endpoint:%x selected connection mode type requires an opposite end!\n",</span><br><span>                     ENDPOINT_NUMBER(endp));</span><br><span>                 error_code = 527;</span><br><span style="color: hsl(120, 100%, 40%);">+             rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC]);</span><br><span>            goto error3;</span><br><span>         }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       if (setup_rtp_processing(endp, conn) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+    if (setup_rtp_processing(endp, conn) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+          rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_START_RTP]);</span><br><span>              goto error3;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span> </span><br><span> </span><br><span>    /* policy CB */</span><br><span>@@ -1132,6 +1173,7 @@</span><br><span>                      LOGP(DLMGCP, LOGL_NOTICE,</span><br><span>                         "MDCX: 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_MDCX_FAIL_REJECTED_BY_POLICY]);</span><br><span>                     if (silent)</span><br><span>                          goto out_silent;</span><br><span>                     return create_err_response(endp, 400, "MDCX", p->trans);</span><br><span>@@ -1139,8 +1181,9 @@</span><br><span>                case MGCP_POLICY_DEFER:</span><br><span>                      /* stop processing */</span><br><span>                        LOGP(DLMGCP, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">-                             "MDCX: endpoint:0x%x defered by policy\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                          "MDCX: endpoint:0x%x deferred 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_MDCX_FAIL_DEFERRED_BY_POLICY]);</span><br><span>                     return NULL;</span><br><span>                         break;</span><br><span>               case MGCP_POLICY_CONT:</span><br><span>@@ -1165,6 +1208,7 @@</span><br><span>           && endp->tcfg->keepalive_interval != MGCP_KEEPALIVE_NEVER)</span><br><span>                 send_dummy(endp, conn);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_SUCCESS]);</span><br><span>     if (silent)</span><br><span>          goto out_silent;</span><br><span> </span><br><span>@@ -1443,20 +1487,26 @@</span><br><span>       return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void alloc_mgcp_crxc_rate_counters(struct mgcp_trunk_config *trunk, void *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+static void alloc_mgcp_rate_counters(struct mgcp_trunk_config *trunk, void *ctx)</span><br><span> {</span><br><span>       /* FIXME: Each new rate counter group requires a unique index. At the</span><br><span>         * moment we generate an index using a counter, but perhaps there is</span><br><span>          * a better way of assigning indices? */</span><br><span style="color: hsl(0, 100%, 40%);">-        static unsigned int rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+       static unsigned int crcx_rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+  static unsigned int mdcx_rate_ctr_index = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        if (trunk->mgcp_crcx_ctr_group != NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-              return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, rate_ctr_index);</span><br><span style="color: hsl(0, 100%, 40%);">-       OSMO_ASSERT(trunk->mgcp_crcx_ctr_group);</span><br><span style="color: hsl(0, 100%, 40%);">-     talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group);</span><br><span style="color: hsl(0, 100%, 40%);">-  rate_ctr_index++;</span><br><span style="color: hsl(120, 100%, 40%);">+     if (trunk->mgcp_crcx_ctr_group == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+          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(120, 100%, 40%);">+                OSMO_ASSERT(trunk->mgcp_crcx_ctr_group);</span><br><span style="color: hsl(120, 100%, 40%);">+           talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group);</span><br><span style="color: hsl(120, 100%, 40%);">+                crcx_rate_ctr_index++;</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (trunk->mgcp_mdcx_ctr_group == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+          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(120, 100%, 40%);">+                OSMO_ASSERT(trunk->mgcp_mdcx_ctr_group);</span><br><span style="color: hsl(120, 100%, 40%);">+           talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group);</span><br><span style="color: hsl(120, 100%, 40%);">+                mdcx_rate_ctr_index++;</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span> }</span><br><span> </span><br><span> /*! allocate configuration with default values.</span><br><span>@@ -1496,7 +1546,7 @@</span><br><span>        cfg->trunk.audio_send_name = 1;</span><br><span>   cfg->trunk.omit_rtcp = 0;</span><br><span>         mgcp_trunk_set_keepalive(&cfg->trunk, MGCP_KEEPALIVE_ONCE);</span><br><span style="color: hsl(0, 100%, 40%);">-      alloc_mgcp_crxc_rate_counters(&cfg->trunk, cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+       alloc_mgcp_rate_counters(&cfg->trunk, cfg);</span><br><span> </span><br><span>       INIT_LLIST_HEAD(&cfg->trunks);</span><br><span> </span><br><span>@@ -1528,7 +1578,7 @@</span><br><span>    trunk->vty_number_endpoints = 33;</span><br><span>         trunk->omit_rtcp = 0;</span><br><span>     mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE);</span><br><span style="color: hsl(0, 100%, 40%);">-   alloc_mgcp_crxc_rate_counters(trunk, trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+  alloc_mgcp_rate_counters(trunk, trunk);</span><br><span>      llist_add_tail(&trunk->entry, &cfg->trunks);</span><br><span> </span><br><span>       return trunk;</span><br><span>@@ -1575,7 +1625,7 @@</span><br><span>        }</span><br><span> </span><br><span>        tcfg->number_endpoints = tcfg->vty_number_endpoints;</span><br><span style="color: hsl(0, 100%, 40%);">-      alloc_mgcp_crxc_rate_counters(tcfg, tcfg->cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+    alloc_mgcp_rate_counters(tcfg, tcfg->cfg);</span><br><span> </span><br><span>    return 0;</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 5643180..ed8aca5 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_mdcx_ctr_group) {</span><br><span style="color: hsl(120, 100%, 40%);">+              vty_out(vty, "   %s:%s", cfg->mgcp_mdcx_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_mdcx_ctr_group);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span> }</span><br><span> </span><br><span> #define SHOW_MGCP_STR "Display information about the MGCP Media Gateway\n"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11499">change 11499</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/11499"/><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: I79c27425ba40c3a85edc6cd846cba325d847298c </div>
<div style="display:none"> Gerrit-Change-Number: 11499 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>