aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorVadim Yanitskiy <vyanitskiy@sysmocom.de>2021-02-13 05:03:36 +0100
committerVadim Yanitskiy <vyanitskiy@sysmocom.de>2021-02-13 05:15:37 +0100
commit6b93f0f366da5091db791df7c6bf7170a1438ec4 (patch)
tree97d8f2d5af8af393bd836c405560b0df8439036f /include
parent9eb37bc3cb94900a818cfca0a5b5b8f1724afce8 (diff)
GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts'
Diffstat (limited to 'include')
-rw-r--r--include/osmo-bts/bts.h7
-rw-r--r--include/osmo-bts/l1sap.h4
2 files changed, 7 insertions, 4 deletions
diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h
index f6389ade..3adafcc0 100644
--- a/include/osmo-bts/bts.h
+++ b/include/osmo-bts/bts.h
@@ -343,6 +343,13 @@ struct gsm_bts {
char *sock_path;
} pcu;
+ /* GSMTAP Um logging (disabled by default) */
+ struct {
+ struct gsmtap_inst *inst;
+ uint32_t sapi_mask;
+ uint8_t sapi_acch;
+ } gsmtap;
+
struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */
struct osmo_tdef *T_defs; /* Timer defines */
diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index af58d5e3..fe774312 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -127,10 +127,6 @@ enum l1sap_common_sapi {
extern uint16_t l1sap_log_ctx_sapi;
extern const struct value_string l1sap_common_sapi_names[];
-extern struct gsmtap_inst *gsmtap;
-extern uint32_t gsmtap_sapi_mask;
-extern uint8_t gsmtap_sapi_acch;
-
int add_l1sap_header(struct gsm_bts_trx *trx, struct msgb *rmsg,
struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn,
uint16_t ber10k, int16_t lqual_cb, int8_t rssi,