<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24439">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] gsm_data: rework and rename gsm_lchan_name_compute()<br><br>Change-Id: Id5cc40db04a654d94f5f75d4aad45439d66528cc<br>Related: SYS#4895, OS#4941<br>---<br>M include/osmo-bts/gsm_data.h<br>M src/common/bts_trx.c<br>M src/common/gsm_data.c<br>3 files changed, 11 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index cd63f6f..93eb2f0 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -512,7 +512,7 @@</span><br><span> const char *gsm_lchant_name(enum gsm_chan_t c);</span><br><span> char *gsm_ts_name(const struct gsm_bts_trx_ts *ts);</span><br><span> char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts);</span><br><span style="color: hsl(0, 100%, 40%);">-char *gsm_lchan_name_compute(const struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+void gsm_lchan_name_update(struct gsm_lchan *lchan);</span><br><span> const char *gsm_lchans_name(enum gsm_lchan_state s);</span><br><span> </span><br><span> static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)</span><br><span>diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c</span><br><span>index ee03b9a..3d295e5 100644</span><br><span>--- a/src/common/bts_trx.c</span><br><span>+++ b/src/common/bts_trx.c</span><br><span>@@ -96,15 +96,13 @@</span><br><span> </span><br><span>               for (l = 0; l < TS_MAX_LCHAN; l++) {</span><br><span>                      struct gsm_lchan *lchan;</span><br><span style="color: hsl(0, 100%, 40%);">-                        char *name;</span><br><span>                  lchan = &ts->lchan[l];</span><br><span> </span><br><span>                    lchan->ts = ts;</span><br><span>                   lchan->nr = l;</span><br><span>                    lchan->type = GSM_LCHAN_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+                      gsm_lchan_name_update(lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                       name = gsm_lchan_name_compute(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-                   lchan->name = talloc_strdup(trx, name);</span><br><span>                   INIT_LLIST_HEAD(&lchan->sapi_cmds);</span><br><span>                   INIT_LLIST_HEAD(&lchan->dl_tch_queue);</span><br><span>                }</span><br><span>diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c</span><br><span>index 6b57851..6328783 100644</span><br><span>--- a/src/common/gsm_data.c</span><br><span>+++ b/src/common/gsm_data.c</span><br><span>@@ -165,14 +165,17 @@</span><br><span>   return ts2str;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-char *gsm_lchan_name_compute(const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+void gsm_lchan_name_update(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    struct gsm_bts_trx_ts *ts = lchan->ts;</span><br><span style="color: hsl(120, 100%, 40%);">+     const struct gsm_bts_trx_ts *ts = lchan->ts;</span><br><span style="color: hsl(120, 100%, 40%);">+       const struct gsm_bts_trx *trx = ts->trx;</span><br><span style="color: hsl(120, 100%, 40%);">+   char *name;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d,ss=%d)",</span><br><span style="color: hsl(0, 100%, 40%);">-                ts->trx->bts->nr, ts->trx->nr, ts->nr, lchan->nr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        return ts2str;</span><br><span style="color: hsl(120, 100%, 40%);">+        name = talloc_asprintf(trx, "(bts=%u,trx=%u,ts=%u,ss=%u)",</span><br><span style="color: hsl(120, 100%, 40%);">+                         trx->bts->nr, trx->nr, ts->nr, lchan->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (lchan->name != NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+           talloc_free(lchan->name);</span><br><span style="color: hsl(120, 100%, 40%);">+  lchan->name = name;</span><br><span> }</span><br><span> </span><br><span> /* See Table 10.5.25 of GSM04.08 */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24439">change 24439</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/+/24439"/><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: Id5cc40db04a654d94f5f75d4aad45439d66528cc </div>
<div style="display:none"> Gerrit-Change-Number: 24439 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>