<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/22893">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSMTAP: move 'struct gsmtap_inst' and masks to 'struct gsm_bts'<br><br>Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481<br>---<br>M include/osmo-bts/bts.h<br>M include/osmo-bts/l1sap.h<br>M src/common/l1sap.c<br>M src/common/main.c<br>M src/common/vty.c<br>5 files changed, 29 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/22893/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index f6389ad..3adafcc 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -343,6 +343,13 @@</span><br><span> char *sock_path;</span><br><span> } pcu;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* GSMTAP Um logging (disabled by default) */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsmtap_inst *inst;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t sapi_mask;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sapi_acch;</span><br><span style="color: hsl(120, 100%, 40%);">+ } gsmtap;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */</span><br><span> struct osmo_tdef *T_defs; /* Timer defines */</span><br><span> </span><br><span>diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h</span><br><span>index af58d5e..fe77431 100644</span><br><span>--- a/include/osmo-bts/l1sap.h</span><br><span>+++ b/include/osmo-bts/l1sap.h</span><br><span>@@ -127,10 +127,6 @@</span><br><span> extern uint16_t l1sap_log_ctx_sapi;</span><br><span> extern const struct value_string l1sap_common_sapi_names[];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern struct gsmtap_inst *gsmtap;</span><br><span style="color: hsl(0, 100%, 40%);">-extern uint32_t gsmtap_sapi_mask;</span><br><span style="color: hsl(0, 100%, 40%);">-extern uint8_t gsmtap_sapi_acch;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int add_l1sap_header(struct gsm_bts_trx *trx, struct msgb *rmsg,</span><br><span> struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn,</span><br><span> uint16_t ber10k, int16_t lqual_cb, int8_t rssi,</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 9b3b087..eb652db 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -346,10 +346,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsmtap_inst *gsmtap = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t gsmtap_sapi_mask = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t gsmtap_sapi_acch = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* send primitive as gsmtap */</span><br><span> static int gsmtap_ph_data(const struct osmo_phsap_prim *l1sap,</span><br><span> uint8_t *chan_type, uint8_t *ss, uint32_t fn,</span><br><span>@@ -491,7 +487,8 @@</span><br><span> int8_t signal_dbm;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!gsmtap)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsmtap_inst *inst = trx->bts->gsmtap.inst;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!inst)</span><br><span> return 0;</span><br><span> </span><br><span> switch (OSMO_PRIM_HDR(&l1sap->oph)) {</span><br><span>@@ -524,10 +521,10 @@</span><br><span> if (len == 0)</span><br><span> return 0;</span><br><span> if ((chan_type & GSMTAP_CHANNEL_ACCH)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!gsmtap_sapi_acch)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx->bts->gsmtap.sapi_acch)</span><br><span> return 0;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!((1 << (chan_type & 31)) & gsmtap_sapi_mask))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!((1 << (chan_type & 31)) & trx->bts->gsmtap.sapi_mask))</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -536,7 +533,7 @@</span><br><span> if (is_fill_frame(chan_type, data, len))</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_send(gsmtap, trx->arfcn | uplink, tn, chan_type, ss, fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_send(inst, trx->arfcn | uplink, tn, chan_type, ss, fn,</span><br><span> signal_dbm, 0 /* TODO: SNR */, data, len);</span><br><span> </span><br><span> return 0;</span><br><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index 76e0d43..38f517c 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -321,12 +321,12 @@</span><br><span> }</span><br><span> </span><br><span> if (gsmtap_ip) {</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!gsmtap) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->gsmtap.inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_bts->gsmtap.inst == NULL) {</span><br><span> fprintf(stderr, "Failed during gsmtap_init()\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_source_add_sink(gsmtap);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_source_add_sink(g_bts->gsmtap.inst);</span><br><span> }</span><br><span> </span><br><span> if (bts_init(g_bts) < 0) {</span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 976ccfa..f2c7954 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -316,7 +316,7 @@</span><br><span> bts->agch_queue.high_level, VTY_NEWLINE);</span><br><span> </span><br><span> for (i = 0; i < sizeof(uint32_t) * 8; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsmtap_sapi_mask & ((uint32_t) 1 << i)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap.sapi_mask & ((uint32_t) 1 << i)) {</span><br><span> sapi_buf = get_value_string_or_null(gsmtap_sapi_names, i);</span><br><span> if (sapi_buf == NULL)</span><br><span> continue;</span><br><span>@@ -324,7 +324,7 @@</span><br><span> vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE);</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsmtap_sapi_acch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->gsmtap.sapi_acch) {</span><br><span> sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, GSMTAP_CHANNEL_ACCH));</span><br><span> vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE);</span><br><span> }</span><br><span>@@ -1832,12 +1832,14 @@</span><br><span> "Enable all kinds of messages (all SAPI)\n"</span><br><span> "Disable all kinds of messages (all SAPI)\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (argv[0][0] == 'e') {</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_sapi_mask = UINT32_MAX;</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_sapi_acch = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.sapi_mask = UINT32_MAX;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.sapi_acch = 1;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_sapi_mask = 0x00;</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_sapi_acch = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.sapi_mask = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.sapi_acch = 0;</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -1846,15 +1848,16 @@</span><br><span> DEFUN(cfg_bts_gsmtap_sapi, cfg_bts_gsmtap_sapi_cmd,</span><br><span> "HIDDEN", "HIDDEN")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span> int sapi;</span><br><span> </span><br><span> sapi = get_string_value(gsmtap_sapi_names, argv[0]);</span><br><span> OSMO_ASSERT(sapi >= 0);</span><br><span> </span><br><span> if (sapi == GSMTAP_CHANNEL_ACCH)</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_sapi_acch = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.sapi_acch = 1;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_sapi_mask |= (1 << sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.sapi_mask |= (1 << sapi);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -1862,15 +1865,16 @@</span><br><span> DEFUN(cfg_trx_no_gsmtap_sapi, cfg_bts_no_gsmtap_sapi_cmd,</span><br><span> "HIDDEN", "HIDDEN")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span> int sapi;</span><br><span> </span><br><span> sapi = get_string_value(gsmtap_sapi_names, argv[0]);</span><br><span> OSMO_ASSERT(sapi >= 0);</span><br><span> </span><br><span> if (sapi == GSMTAP_CHANNEL_ACCH)</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_sapi_acch = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.sapi_acch = 0;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_sapi_mask &= ~(1 << sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gsmtap.sapi_mask &= ~(1 << sapi);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/22893">change 22893</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-bts/+/22893"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1c5cb8561dfdcbfd1b23ab28cf95aea7a18c7481 </div>
<div style="display:none"> Gerrit-Change-Number: 22893 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>