<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/20476">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/cbch-sniff: fix: use Osmocom specific RSL channel number<br><br>This way the layer1 can activate proper CBCH task and send us<br>CBCH block with proper RSL channel number, so they do not end<br>up being routed to LAPDm and rejected there.<br><br>Change-Id: Ib1d5c99587202a9d94aeb7b63de7ae8c4fb15af0<br>---<br>M src/host/layer23/src/misc/app_cbch_sniff.c<br>1 file changed, 13 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/76/20476/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/misc/app_cbch_sniff.c b/src/host/layer23/src/misc/app_cbch_sniff.c</span><br><span>index 58b3324..ed85cef 100644</span><br><span>--- a/src/host/layer23/src/misc/app_cbch_sniff.c</span><br><span>+++ b/src/host/layer23/src/misc/app_cbch_sniff.c</span><br><span>@@ -34,6 +34,8 @@</span><br><span> #include <osmocom/core/signal.h></span><br><span> #include <osmocom/gsm/rsl.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_08_58.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <l1ctl_proto.h></span><br><span> </span><br><span> struct osmocom_ms *g_ms;</span><br><span>@@ -41,6 +43,8 @@</span><br><span> </span><br><span> static int try_cbch(struct osmocom_ms *ms, struct gsm48_sysinfo *s)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+    uint8_t chan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>   if (!s->si1 || !s->si4)</span><br><span>                return 0;</span><br><span>    if (!s->chan_nr) {</span><br><span>@@ -48,6 +52,13 @@</span><br><span>           return 0;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Convert received channel number to Osmocom specific one;</span><br><span style="color: hsl(120, 100%, 40%);">+    * this way the layer1 can activate proper CBCH task. */</span><br><span style="color: hsl(120, 100%, 40%);">+      if (s->chan_nr != RSL_CHAN_SDCCH4_ACCH)</span><br><span style="color: hsl(120, 100%, 40%);">+            chan_nr = RSL_CHAN_OSMO_CBCH8 | (s->chan_nr & 0x07);</span><br><span style="color: hsl(120, 100%, 40%);">+   else</span><br><span style="color: hsl(120, 100%, 40%);">+          chan_nr = RSL_CHAN_OSMO_CBCH4;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     if (s->h) {</span><br><span>               LOGP(DRR, LOGL_INFO, "chan_nr = 0x%02x TSC = %d  MAIO = %d  "</span><br><span>                      "HSN = %d  hseq (%d): %s\n",</span><br><span>@@ -56,13 +67,13 @@</span><br><span>                         osmo_hexdump((unsigned char *) s->hopping, s->hopp_len * 2));</span><br><span>          return l1ctl_tx_dm_est_req_h1(ms,</span><br><span>                    s->maio, s->hsn, s->hopping, s->hopp_len,</span><br><span style="color: hsl(0, 100%, 40%);">-                   s->chan_nr, s->tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+                     chan_nr, s->tsc,</span><br><span>                  GSM48_CMODE_SIGN, 0);</span><br><span>        } else {</span><br><span>             LOGP(DRR, LOGL_INFO, "chan_nr = 0x%02x TSC = %d  ARFCN = %d\n",</span><br><span>                    s->chan_nr, s->tsc, s->arfcn);</span><br><span>              return l1ctl_tx_dm_est_req_h0(ms, s->arfcn,</span><br><span style="color: hsl(0, 100%, 40%);">-                  s->chan_nr, s->tsc, GSM48_CMODE_SIGN, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+                       chan_nr, s->tsc, GSM48_CMODE_SIGN, 0);</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/osmocom-bb/+/20476">change 20476</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/osmocom-bb/+/20476"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib1d5c99587202a9d94aeb7b63de7ae8c4fb15af0 </div>
<div style="display:none"> Gerrit-Change-Number: 20476 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>