ratectr: move rate counter definitions into mgcp_ratectr.h
The rate counter definition (enums) are still in mgcp.h.
Lets move them to mgcp_ratectr.h since it makes more sense
to keep them there.
Change-Id: Id37f66673bc20f9c2cc47a6b44cdfe75f728b936
Related: OS#2659
diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h
index 3811991..989d138 100644
--- a/include/osmocom/mgcp/mgcp.h
+++ b/include/osmocom/mgcp/mgcp.h
@@ -120,65 +120,6 @@
#define MGCP_KEEPALIVE_ONCE (-1)
#define MGCP_KEEPALIVE_NEVER 0
-/* Global MCGP general rate counters */
-enum {
- MGCP_GENERAL_RX_MSGS_TOTAL,
- MGCP_GENERAL_RX_MSGS_RETRANSMITTED,
- MGCP_GENERAL_RX_MSGS_HANDLED,
- MGCP_GENERAL_RX_MSGS_UNHANDLED,
- MGCP_GENERAL_RX_FAIL_MSG_PARSE,
- MGCP_GENERAL_RX_FAIL_NO_ENDPOINT,
-};
-
-/* Global MCGP CRCX related rate counters */
-enum {
- MGCP_CRCX_SUCCESS,
- MGCP_CRCX_FAIL_BAD_ACTION,
- MGCP_CRCX_FAIL_UNHANDLED_PARAM,
- MGCP_CRCX_FAIL_MISSING_CALLID,
- MGCP_CRCX_FAIL_INVALID_MODE,
- MGCP_CRCX_FAIL_LIMIT_EXCEEDED,
- MGCP_CRCX_FAIL_UNKNOWN_CALLID,
- MGCP_CRCX_FAIL_ALLOC_CONN,
- MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC,
- MGCP_CRCX_FAIL_START_RTP,
- MGCP_CRCX_FAIL_REJECTED_BY_POLICY,
- MGCP_CRCX_FAIL_NO_OSMUX,
- MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS,
- MGCP_CRCX_FAIL_CODEC_NEGOTIATION,
- MGCP_CRCX_FAIL_BIND_PORT,
-};
-
-/* Global MCGP MDCX related rate counters */
-enum {
- MGCP_MDCX_SUCCESS,
- MGCP_MDCX_FAIL_WILDCARD,
- MGCP_MDCX_FAIL_NO_CONN,
- MGCP_MDCX_FAIL_INVALID_CALLID,
- MGCP_MDCX_FAIL_INVALID_CONNID,
- MGCP_MDCX_FAIL_UNHANDLED_PARAM,
- MGCP_MDCX_FAIL_NO_CONNID,
- MGCP_MDCX_FAIL_CONN_NOT_FOUND,
- MGCP_MDCX_FAIL_INVALID_MODE,
- MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS,
- MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC,
- MGCP_MDCX_FAIL_START_RTP,
- MGCP_MDCX_FAIL_REJECTED_BY_POLICY,
- MGCP_MDCX_DEFERRED_BY_POLICY
-};
-
-/* Global MCGP DLCX related rate counters */
-enum {
- MGCP_DLCX_SUCCESS,
- MGCP_DLCX_FAIL_WILDCARD,
- MGCP_DLCX_FAIL_NO_CONN,
- MGCP_DLCX_FAIL_INVALID_CALLID,
- MGCP_DLCX_FAIL_INVALID_CONNID,
- MGCP_DLCX_FAIL_UNHANDLED_PARAM,
- MGCP_DLCX_FAIL_REJECTED_BY_POLICY,
- MGCP_DLCX_DEFERRED_BY_POLICY,
-};
-
enum mgcp_role {
MGCP_BSC = 0,
MGCP_BSC_NAT,
diff --git a/include/osmocom/mgcp/mgcp_ratectr.h b/include/osmocom/mgcp/mgcp_ratectr.h
index e05b70c..a579f5b 100644
--- a/include/osmocom/mgcp/mgcp_ratectr.h
+++ b/include/osmocom/mgcp/mgcp_ratectr.h
@@ -1,5 +1,65 @@
#pragma once
+
+/* Global MCGP general rate counters */
+enum {
+ MGCP_GENERAL_RX_MSGS_TOTAL,
+ MGCP_GENERAL_RX_MSGS_RETRANSMITTED,
+ MGCP_GENERAL_RX_MSGS_HANDLED,
+ MGCP_GENERAL_RX_MSGS_UNHANDLED,
+ MGCP_GENERAL_RX_FAIL_MSG_PARSE,
+ MGCP_GENERAL_RX_FAIL_NO_ENDPOINT,
+};
+
+/* Global MCGP CRCX related rate counters */
+enum {
+ MGCP_CRCX_SUCCESS,
+ MGCP_CRCX_FAIL_BAD_ACTION,
+ MGCP_CRCX_FAIL_UNHANDLED_PARAM,
+ MGCP_CRCX_FAIL_MISSING_CALLID,
+ MGCP_CRCX_FAIL_INVALID_MODE,
+ MGCP_CRCX_FAIL_LIMIT_EXCEEDED,
+ MGCP_CRCX_FAIL_UNKNOWN_CALLID,
+ MGCP_CRCX_FAIL_ALLOC_CONN,
+ MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC,
+ MGCP_CRCX_FAIL_START_RTP,
+ MGCP_CRCX_FAIL_REJECTED_BY_POLICY,
+ MGCP_CRCX_FAIL_NO_OSMUX,
+ MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS,
+ MGCP_CRCX_FAIL_CODEC_NEGOTIATION,
+ MGCP_CRCX_FAIL_BIND_PORT,
+};
+
+/* Global MCGP MDCX related rate counters */
+enum {
+ MGCP_MDCX_SUCCESS,
+ MGCP_MDCX_FAIL_WILDCARD,
+ MGCP_MDCX_FAIL_NO_CONN,
+ MGCP_MDCX_FAIL_INVALID_CALLID,
+ MGCP_MDCX_FAIL_INVALID_CONNID,
+ MGCP_MDCX_FAIL_UNHANDLED_PARAM,
+ MGCP_MDCX_FAIL_NO_CONNID,
+ MGCP_MDCX_FAIL_CONN_NOT_FOUND,
+ MGCP_MDCX_FAIL_INVALID_MODE,
+ MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS,
+ MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC,
+ MGCP_MDCX_FAIL_START_RTP,
+ MGCP_MDCX_FAIL_REJECTED_BY_POLICY,
+ MGCP_MDCX_DEFERRED_BY_POLICY
+};
+
+/* Global MCGP DLCX related rate counters */
+enum {
+ MGCP_DLCX_SUCCESS,
+ MGCP_DLCX_FAIL_WILDCARD,
+ MGCP_DLCX_FAIL_NO_CONN,
+ MGCP_DLCX_FAIL_INVALID_CALLID,
+ MGCP_DLCX_FAIL_INVALID_CONNID,
+ MGCP_DLCX_FAIL_UNHANDLED_PARAM,
+ MGCP_DLCX_FAIL_REJECTED_BY_POLICY,
+ MGCP_DLCX_DEFERRED_BY_POLICY,
+};
+
/* NOTE: When adding counters, also the dump_ratectr_* routines in vty.c must be updated. */
struct mgcp_ratectr_global {