<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25841">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Reset CBCH state after BTS shutdown<br><br>Related: OS#5273<br>Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe<br>---<br>M include/osmo-bts/cbch.h<br>M src/common/cbch.c<br>M src/common/nm_bts_fsm.c<br>3 files changed, 23 insertions(+), 0 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/41/25841/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/cbch.h b/include/osmo-bts/cbch.h</span><br><span>index 6bba5fa..d5521f0 100644</span><br><span>--- a/include/osmo-bts/cbch.h</span><br><span>+++ b/include/osmo-bts/cbch.h</span><br><span>@@ -21,3 +21,5 @@</span><br><span> /* call-back from bts model specific code when it wants to obtain a CBCH</span><br><span>  * block for a given gsm_time.  outbuf must have 23 bytes of space. */</span><br><span> int bts_cbch_get(struct gsm_bts *bts, uint8_t *outbuf, struct gsm_time *g_time);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_cbch_reset(struct gsm_bts *bts);</span><br><span>diff --git a/src/common/cbch.c b/src/common/cbch.c</span><br><span>index ebea60b..addd68c 100644</span><br><span>--- a/src/common/cbch.c</span><br><span>+++ b/src/common/cbch.c</span><br><span>@@ -322,3 +322,22 @@</span><br><span> </span><br><span>   return rc;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void bts_smscb_state_reset(struct bts_smscb_state *bts_ss)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       struct smscb_msg *scm, *tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+  llist_for_each_entry_safe(scm, tmp, &bts_ss->queue, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+            llist_del(&scm->list);</span><br><span style="color: hsl(120, 100%, 40%);">+         talloc_free(scm);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+     bts_ss->queue_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     rate_ctr_group_reset(bts_ss->ctrs);</span><br><span style="color: hsl(120, 100%, 40%);">+        TALLOC_FREE(bts_ss->cur_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+      TALLOC_FREE(bts_ss->default_msg);</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%);">+void bts_cbch_reset(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        bts_smscb_state_reset(&bts->smscb_basic);</span><br><span style="color: hsl(120, 100%, 40%);">+      bts_smscb_state_reset(&bts->smscb_extended);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c</span><br><span>index c9dcd4c..063ffe8 100644</span><br><span>--- a/src/common/nm_bts_fsm.c</span><br><span>+++ b/src/common/nm_bts_fsm.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include <osmo-bts/rsl.h></span><br><span> #include <osmo-bts/nm_common_fsm.h></span><br><span> #include <osmo-bts/phy_link.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/cbch.h></span><br><span> </span><br><span> #define X(s) (1 << (s))</span><br><span> </span><br><span>@@ -60,6 +61,7 @@</span><br><span>   /* Reset state: */</span><br><span>   bts->si_valid = 0;</span><br><span>        TALLOC_FREE(bts->mo.nm_attr);</span><br><span style="color: hsl(120, 100%, 40%);">+      bts_cbch_reset(bts);</span><br><span> </span><br><span>     bts->mo.setattr_success = false;</span><br><span>  bts->mo.opstart_success = false;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25841">change 25841</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/+/25841"/><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: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe </div>
<div style="display:none"> Gerrit-Change-Number: 25841 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>