<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19510">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu_sock: warn about maximum transceiver number constraints<br><br>Change-Id: I600860b12758a73e1bba6d9d508cf67c3d88cf34<br>---<br>M src/common/pcu_sock.c<br>1 file changed, 15 insertions(+), 11 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/10/19510/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 0125793..ca8dd15 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -215,13 +215,17 @@</span><br><span>             info_ind->remote_ip[i] = nsvc->remote_ip;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   for (i = 0; i < 8; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-            trx = gsm_bts_trx_num(bts, i);</span><br><span style="color: hsl(0, 100%, 40%);">-          if (!trx)</span><br><span style="color: hsl(0, 100%, 40%);">-                       break;</span><br><span style="color: hsl(0, 100%, 40%);">-          info_ind->trx[i].pdch_mask = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-              info_ind->trx[i].arfcn = trx->arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">-              info_ind->trx[i].hlayer1 = trx_get_hlayer1(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+   llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+              if (trx->nr >= ARRAY_SIZE(info_ind->trx)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  LOGPTRX(trx, DPCU, LOGL_NOTICE, "PCU interface (version %u) "</span><br><span style="color: hsl(120, 100%, 40%);">+                               "cannot handle more than %zu transceivers => skipped\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                         PCU_IF_VERSION, ARRAY_SIZE(info_ind->trx));</span><br><span style="color: hsl(120, 100%, 40%);">+                        continue;</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           info_ind->trx[trx->nr].pdch_mask = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+           info_ind->trx[trx->nr].arfcn = trx->arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+           info_ind->trx[trx->nr].hlayer1 = trx_get_hlayer1(trx);</span><br><span>                 if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED ||</span><br><span>                     trx->mo.nm_state.administrative != NM_STATE_UNLOCKED) {</span><br><span>                           LOGPTRX(trx, DPCU, LOGL_INFO, "unavailable for PCU (op=%s adm=%s)\n",</span><br><span>@@ -233,14 +237,14 @@</span><br><span>                  ts = &trx->ts[j];</span><br><span>                     if (ts->mo.nm_state.operational == NM_OPSTATE_ENABLED</span><br><span>                         && ts_should_be_pdch(ts)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                         info_ind->trx[i].pdch_mask |= (1 << j);</span><br><span style="color: hsl(0, 100%, 40%);">-                                info_ind->trx[i].tsc[j] = gsm_ts_tsc(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+                          info_ind->trx[trx->nr].pdch_mask |= (1 << j);</span><br><span style="color: hsl(120, 100%, 40%);">+                             info_ind->trx[trx->nr].tsc[j] = gsm_ts_tsc(ts);</span><br><span> </span><br><span>                            LOGP(DPCU, LOGL_INFO, "trx=%d ts=%d: "</span><br><span>                                     "available (tsc=%d arfcn=%d)\n",</span><br><span>                                   trx->nr, ts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">-                                  info_ind->trx[i].tsc[j],</span><br><span style="color: hsl(0, 100%, 40%);">-                                     info_ind->trx[i].arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+                                   info_ind->trx[trx->nr].tsc[j],</span><br><span style="color: hsl(120, 100%, 40%);">+                                  info_ind->trx[trx->nr].arfcn);</span><br><span>                         }</span><br><span>            }</span><br><span>    }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19510">change 19510</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/+/19510"/><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: I600860b12758a73e1bba6d9d508cf67c3d88cf34 </div>
<div style="display:none"> Gerrit-Change-Number: 19510 </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>