<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/8102">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: dyn ts init: undup logging for gprs = none<br><br>Reshuffle the decision not to activate PDCH when GPRS is off:<br>Even though all current callers should avoid passing a PDCH activation in case<br>GPRS is off, it's a better idea to not assert on it and crash osmo-bsc.<br><br>Move the decision to omit PDCH activation and logging about it into the actual<br>functions that do PDCH activation. If PDCH activation is skipped, the lchan<br>then just stays as it was, and that's what it should anyway be doing.<br><br>Change-Id: Ib26642f08044d71a2469e6dbabf1e6fbcb02044d<br>---<br>M src/libbsc/abis_rsl.c<br>M src/libbsc/bsc_dyn_ts.c<br>2 files changed, 20 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c</span><br><span>index 167ef6b..ffbf630 100644</span><br><span>--- a/src/libbsc/abis_rsl.c</span><br><span>+++ b/src/libbsc/abis_rsl.c</span><br><span>@@ -2495,6 +2495,16 @@</span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static bool check_gprs_enabled(struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none': not activating PDCH.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_ts_and_pchan_name(ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act)</span><br><span> {</span><br><span> struct msgb *msg = rsl_msgb_alloc();</span><br><span>@@ -2512,8 +2522,9 @@</span><br><span> }</span><br><span> </span><br><span> if (act){</span><br><span style="color: hsl(0, 100%, 40%);">- /* Callers should heed the GPRS mode. */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts->trx->bts->gprs.mode != BTS_GPRS_NONE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!check_gprs_enabled(ts))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msg_type = RSL_MT_IPAC_PDCH_ACT;</span><br><span> ts->flags |= TS_F_PDCH_ACT_PENDING;</span><br><span> } else {</span><br><span>@@ -2647,8 +2658,6 @@</span><br><span> int rc = -EIO;</span><br><span> </span><br><span> OSMO_ASSERT(ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH);</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DRSL, "%s starting switchover to %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_ts_and_pchan_name(ts), gsm_pchan_name(to_pchan));</span><br><span> </span><br><span> if (ts->dyn.pchan_is != ts->dyn.pchan_want) {</span><br><span> LOGP(DRSL, LOGL_ERROR,</span><br><span>@@ -2680,6 +2689,12 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (to_pchan == GSM_PCHAN_PDCH && !check_gprs_enabled(ts))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DRSL, "%s starting switchover to %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_ts_and_pchan_name(ts), gsm_pchan_name(to_pchan));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Record that we're busy switching. */</span><br><span> ts->dyn.pchan_want = to_pchan;</span><br><span> </span><br><span>diff --git a/src/libbsc/bsc_dyn_ts.c b/src/libbsc/bsc_dyn_ts.c</span><br><span>index aa3c252..6a1cff7 100644</span><br><span>--- a/src/libbsc/bsc_dyn_ts.c</span><br><span>+++ b/src/libbsc/bsc_dyn_ts.c</span><br><span>@@ -27,31 +27,14 @@</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none':"</span><br><span style="color: hsl(0, 100%, 40%);">- " not activating PDCH.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_ts_and_pchan_name(ts));</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_DEBUG, "%s: trying to PDCH ACT\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_ts_and_pchan_name(ts));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> rc = rsl_ipacc_pdch_activate(ts, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != 0 && rc != -ENOTSUP)</span><br><span> LOGP(DRSL, LOGL_ERROR, "%s %s: PDCH ACT failed\n",</span><br><span> gsm_ts_name(ts), gsm_pchan_name(ts->pchan));</span><br><span> }</span><br><span> </span><br><span> void tchf_tchh_pdch_ts_init(struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none':"</span><br><span style="color: hsl(0, 100%, 40%);">- " not activating PDCH.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_ts_and_pchan_name(ts));</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> dyn_ts_switchover_start(ts, GSM_PCHAN_PDCH);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/8102">change 8102</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/8102"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib26642f08044d71a2469e6dbabf1e6fbcb02044d </div>
<div style="display:none"> Gerrit-Change-Number: 8102 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>