commit 432ee9d150f35f54e88af6ff1e12adf31e9c5db1
author Pau Espin Pedrol <pespin@sysmocom.de> Fri Sep 23 18:18:02 2022 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Sun Sep 25 00:06:00 2022 +0200
tree fae54cb8792fdd925f3d51feea6f855fe1359597
parent b4a59475d25ce68ed1561e54e66e30abe944c669

osmux: Improve per-conn tx rate counters

Change-Id: If030f5d921bdfcfcd00b015b4a9e48bb3b04e721

src/libosmo-mgcp/mgcp_osmux.c

diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 790c425..6ae0d8e 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -219,14 +219,14 @@
 	struct msgb *msg;
 
 	if (!conn->end.output_enabled) {
-		rtpconn_osmux_rate_ctr_inc(conn, OSMUX_DROPPED_AMR_PAYLOADS_CTR);
+		rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_DROPPED_CTR);
 		return -1;
 	}
 
 	if (conn->osmux.state != OSMUX_STATE_ENABLED) {
 		LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "forwarding RTP to Osmux conn not yet enabled, dropping (cid=%d)\n",
 		conn->osmux.remote_cid);
-		rtpconn_osmux_rate_ctr_inc(conn, OSMUX_DROPPED_AMR_PAYLOADS_CTR);
+		rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_DROPPED_CTR);
 		return -1;
 	}
 
@@ -241,6 +241,12 @@
 		/* batch full, build and deliver it */
 		osmux_xfrm_input_deliver(conn->osmux.in);
 	}
+	if (ret < 0) {
+		rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_DROPPED_CTR);
+	} else {
+		rtpconn_osmux_rate_ctr_inc(conn, OSMUX_RTP_PACKETS_TX_CTR);
+		rtpconn_osmux_rate_ctr_add(conn, OSMUX_AMR_OCTETS_TX_CTR, buf_len - sizeof(struct rtp_hdr));
+	}
 	return 0;
 }