<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18894">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;">ratectr: move rate counter definitions into mgcp_ratectr.h<br><br>The rate counter definition (enums) are still in mgcp.h.<br>Lets move them to mgcp_ratectr.h since it makes more sense<br>to keep them there.<br><br>Change-Id: Id37f66673bc20f9c2cc47a6b44cdfe75f728b936<br>Related: OS#2659<br>---<br>M include/osmocom/mgcp/mgcp.h<br>M include/osmocom/mgcp/mgcp_ratectr.h<br>2 files changed, 60 insertions(+), 59 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 3811991..989d138 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -120,65 +120,6 @@</span><br><span> #define MGCP_KEEPALIVE_ONCE (-1)</span><br><span> #define MGCP_KEEPALIVE_NEVER 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Global MCGP general rate counters */</span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_GENERAL_RX_MSGS_TOTAL,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_GENERAL_RX_MSGS_RETRANSMITTED,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_GENERAL_RX_MSGS_HANDLED,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_GENERAL_RX_MSGS_UNHANDLED,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_GENERAL_RX_FAIL_MSG_PARSE,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_GENERAL_RX_FAIL_NO_ENDPOINT,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Global MCGP CRCX related rate counters */</span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_SUCCESS,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_BAD_ACTION,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_UNHANDLED_PARAM,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_MISSING_CALLID,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_INVALID_MODE,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_LIMIT_EXCEEDED,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_UNKNOWN_CALLID,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_ALLOC_CONN,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_START_RTP,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_REJECTED_BY_POLICY,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_NO_OSMUX,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_CODEC_NEGOTIATION,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_CRCX_FAIL_BIND_PORT,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Global MCGP MDCX related rate counters */</span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_SUCCESS,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_WILDCARD,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_NO_CONN,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_INVALID_CALLID,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_INVALID_CONNID,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_UNHANDLED_PARAM,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_NO_CONNID,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_CONN_NOT_FOUND,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_INVALID_MODE,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_START_RTP,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_FAIL_REJECTED_BY_POLICY,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_MDCX_DEFERRED_BY_POLICY</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Global MCGP DLCX related rate counters */</span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_DLCX_SUCCESS,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_DLCX_FAIL_WILDCARD,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_DLCX_FAIL_NO_CONN,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_DLCX_FAIL_INVALID_CALLID,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_DLCX_FAIL_INVALID_CONNID,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_DLCX_FAIL_UNHANDLED_PARAM,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_DLCX_FAIL_REJECTED_BY_POLICY,</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP_DLCX_DEFERRED_BY_POLICY,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum mgcp_role {</span><br><span> MGCP_BSC = 0,</span><br><span> MGCP_BSC_NAT,</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_ratectr.h b/include/osmocom/mgcp/mgcp_ratectr.h</span><br><span>index e05b70c..a579f5b 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_ratectr.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_ratectr.h</span><br><span>@@ -1,5 +1,65 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Global MCGP general rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_GENERAL_RX_MSGS_TOTAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_GENERAL_RX_MSGS_RETRANSMITTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_GENERAL_RX_MSGS_HANDLED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_GENERAL_RX_MSGS_UNHANDLED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_GENERAL_RX_FAIL_MSG_PARSE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_GENERAL_RX_FAIL_NO_ENDPOINT,</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%);">+/* Global MCGP CRCX related rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_SUCCESS,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_BAD_ACTION,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_UNHANDLED_PARAM,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_MISSING_CALLID,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_INVALID_MODE,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_LIMIT_EXCEEDED,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_UNKNOWN_CALLID,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_ALLOC_CONN,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC,</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP_CRCX_FAIL_START_RTP,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</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_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%);">+/* 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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* NOTE: When adding counters, also the dump_ratectr_* routines in vty.c must be updated. */</span><br><span> </span><br><span> struct mgcp_ratectr_global {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18894">change 18894</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/+/18894"/><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: Id37f66673bc20f9c2cc47a6b44cdfe75f728b936 </div>
<div style="display:none"> Gerrit-Change-Number: 18894 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@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>