[MERGED] osmo-pcu[master]: GSMTAP: Ad PTCCH as separate gsmtap category

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: GSMTAP: Ad PTCCH as separate gsmtap category
......................................................................


GSMTAP: Ad PTCCH as separate gsmtap category

This allows us to send GSMTAP for PTCCH only if requested by user/vty

Change-Id: Id720f4bebdce7f6152fbddddbe05036638c5866e
---
M src/bts.h
M src/pcu_l1_if.cpp
M src/pcu_vty.c
3 files changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/bts.h b/src/bts.h
index 66875f1..25193f9 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -51,6 +51,7 @@
 	PCU_GSMTAP_C_DL_CTRL		= 2,	/* downlink control blocks */
 	PCU_GSMTAP_C_DL_DATA_GPRS	= 3,	/* downlink GPRS data blocks */
 	PCU_GSMTAP_C_DL_DATA_EGPRS	= 4,	/* downlink EGPRS data blocks */
+	PCU_GSMTAP_C_DL_PTCCH		= 5,	/* downlink PTCCH blocks */
 
 	PCU_GSMTAP_C_UL_UNKNOWN		= 15,	/* unknown or undecodable uplink blocks */
 	PCU_GSMTAP_C_UL_DUMMY		= 16,	/* uplink dummy blocks */
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 42164e4..8ea2ad5 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -183,7 +183,8 @@
 {
 	struct gprs_rlcmac_bts *bts = bts_main_data();
 
-	gsmtap_send(bts->gsmtap, arfcn, ts, GSMTAP_CHANNEL_PTCCH, 0, fn, 0, 0, msg->data, msg->len);
+	if (bts->gsmtap_categ_mask & PCU_GSMTAP_C_DL_PTCCH)
+		gsmtap_send(bts->gsmtap, arfcn, ts, GSMTAP_CHANNEL_PTCCH, 0, fn, 0, 0, msg->data, msg->len);
 #ifdef ENABLE_DIRECT_PHY
 	if (bts->trx[trx].fl1h) {
 		l1if_pdch_req(bts->trx[trx].fl1h, ts, 1, fn, arfcn, block_nr,
diff --git a/src/pcu_vty.c b/src/pcu_vty.c
index fc57a5f..cd22e38 100644
--- a/src/pcu_vty.c
+++ b/src/pcu_vty.c
@@ -24,6 +24,7 @@
 	{ PCU_GSMTAP_C_DL_CTRL,		"dl-ctrl" },
 	{ PCU_GSMTAP_C_DL_DATA_GPRS,	"dl-data-gprs" },
 	{ PCU_GSMTAP_C_DL_DATA_EGPRS,	"dl-data-egprs" },
+	{ PCU_GSMTAP_C_DL_PTCCH,	"dl-ptcch" },
 
 	{ PCU_GSMTAP_C_UL_UNKNOWN,	"ul-unknown" },
 	{ PCU_GSMTAP_C_UL_DUMMY,	"ul-dummy" },
@@ -40,6 +41,7 @@
 	{ PCU_GSMTAP_C_DL_CTRL,		"Downlink Control Blocks" },
 	{ PCU_GSMTAP_C_DL_DATA_GPRS,	"Downlink Data Blocks (GPRS)" },
 	{ PCU_GSMTAP_C_DL_DATA_EGPRS,	"Downlink Data Blocks (EGPRS)" },
+	{ PCU_GSMTAP_C_DL_PTCCH,	"Downlink PTCCH Blocks" },
 
 	{ PCU_GSMTAP_C_UL_UNKNOWN,	"Unknown / Unparseable / Erroneous Downlink Blocks" },
 	{ PCU_GSMTAP_C_UL_DUMMY,	"Uplink Dummy Blocks" },

-- 
To view, visit https://gerrit.osmocom.org/3388
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id720f4bebdce7f6152fbddddbe05036638c5866e
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder