<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19375">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fixup<br><br>Change-Id: I9731ab29b00bf91cb94b427de423bfbde6b292c8<br>---<br>M src/osmo-bsc/acc.c<br>M tests/acc/acc_test.ok<br>2 files changed, 24 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/19375/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c</span><br><span>index 0da6528..6fb7ee9 100644</span><br><span>--- a/src/osmo-bsc/acc.c</span><br><span>+++ b/src/osmo-bsc/acc.c</span><br><span>@@ -68,7 +68,7 @@</span><br><span> </span><br><span> static void acc_mgr_enable_rotation_cond(struct acc_mgr *acc_mgr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (acc_mgr->allowed_permanent_count &&</span><br><span style="color: hsl(120, 100%, 40%);">+ if (acc_mgr->allowed_permanent_count && acc_mgr->allowed_subset_mask_count &&</span><br><span> acc_mgr->allowed_permanent_count != acc_mgr->allowed_subset_mask_count) {</span><br><span> if (!osmo_timer_pending(&acc_mgr->rotate_timer))</span><br><span> osmo_timer_schedule(&acc_mgr->rotate_timer, acc_mgr->rotation_time_sec, 0);</span><br><span>@@ -296,6 +296,9 @@</span><br><span> void acc_mgr_set_len_allowed_adm(struct acc_mgr *acc_mgr, uint8_t len_allowed_adm)</span><br><span> {</span><br><span> uint8_t old_len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(len_allowed_adm <= 10);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (acc_mgr->len_allowed_adm == len_allowed_adm)</span><br><span> return;</span><br><span> </span><br><span>@@ -310,6 +313,9 @@</span><br><span> void acc_mgr_set_len_allowed_ramp(struct acc_mgr *acc_mgr, uint8_t len_allowed_ramp)</span><br><span> {</span><br><span> uint8_t old_len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(len_allowed_ramp <= 10);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (acc_mgr->len_allowed_ramp == len_allowed_ramp)</span><br><span> return;</span><br><span> </span><br><span>diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok</span><br><span>index c6ea655..42cacc2 100644</span><br><span>--- a/tests/acc/acc_test.ok</span><br><span>+++ b/tests/acc/acc_test.ok</span><br><span>@@ -20,7 +20,7 @@</span><br><span> pcu_info_update(): t2=0x00 t3=0xff</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x01 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfe</span><br><span>@@ -47,7 +47,7 @@</span><br><span> pcu_info_update(): t2=0x00 t3=0x0f</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x00 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xf0</span><br><span>@@ -71,7 +71,7 @@</span><br><span> pcu_info_update(): t2=0x02 t3=0xbf</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x100 (active_len=1, ramp_len=10, adm_len=1, perm_len=5, rotation=on)</span><br><span> pcu_info_update(): t2=0x02 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x100 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x100 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=10, adm_len=1, perm_len=5, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfd</span><br><span>@@ -92,7 +92,7 @@</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=6, perm_len=5, rotation=off)</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x140 (active_len=2, ramp_len=10, adm_len=2, perm_len=5, rotation=on)</span><br><span> pcu_info_update(): t2=0x02 t3=0xbf</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x05a (active_len=4, ramp_len=10, adm_len=4, perm_len=5, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xa5</span><br><span>@@ -128,7 +128,7 @@</span><br><span> pcu_info_update(): t2=0x00 t3=0xff</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x01 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfe</span><br><span>@@ -155,7 +155,7 @@</span><br><span> pcu_info_update(): t2=0x00 t3=0x0f</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x00 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xf0</span><br><span>@@ -178,7 +178,7 @@</span><br><span> pcu_info_update(): t2=0x01 t3=0xbf</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=4, rotation=on)</span><br><span> pcu_info_update(): t2=0x01 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=4, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfb</span><br><span>@@ -198,7 +198,7 @@</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=6, adm_len=10, perm_len=4, rotation=off)</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x240 (active_len=2, ramp_len=2, adm_len=10, perm_len=4, rotation=on)</span><br><span> pcu_info_update(): t2=0x01 t3=0xbf</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=10, perm_len=4, rotation=off)</span><br><span> pcu_info_update(): t2=0x01 t3=0xb3</span><br><span>@@ -279,7 +279,7 @@</span><br><span> pcu_info_update(): t2=0x00 t3=0xff</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x01 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfe</span><br><span>@@ -306,7 +306,7 @@</span><br><span> pcu_info_update(): t2=0x00 t3=0x0f</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x00 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xf0</span><br><span>@@ -326,7 +326,7 @@</span><br><span> pcu_info_update(): t2=0x01 t3=0xbf</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x200 (active_len=1, ramp_len=1, adm_len=4, perm_len=4, rotation=on)</span><br><span> pcu_info_update(): t2=0x01 t3=0xff</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x004 (active_len=1, ramp_len=1, adm_len=4, perm_len=4, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfb</span><br><span>@@ -339,7 +339,7 @@</span><br><span> do_allowed_len_ramp_loop(4)</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x240 (active_len=2, ramp_len=2, adm_len=4, perm_len=4, rotation=on)</span><br><span> pcu_info_update(): t2=0x01 t3=0xbf</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=4, perm_len=4, rotation=off)</span><br><span> pcu_info_update(): t2=0x01 t3=0xb3</span><br><span>@@ -416,7 +416,7 @@</span><br><span> ===test_acc_ramp_fixed===</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_fixed()</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfe</span><br><span>@@ -453,7 +453,7 @@</span><br><span> BTS allocation OK in test_acc_ramp_fixed2()</span><br><span> (bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x00 t3=0x07</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x3f8 -> 0x000 (active_len=0, ramp_len=0, adm_len=7, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x3f8 -> 0x000 (active_len=0, ramp_len=0, adm_len=7, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x007 (active_len=3, ramp_len=3, adm_len=7, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xf8</span><br><span>@@ -471,7 +471,7 @@</span><br><span> *** Barring some ACCs ***</span><br><span> (bts=0) ACC: New ACC allowed subset 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off)</span><br><span> pcu_info_update(): t2=0x02 t3=0xa5</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=5, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=5, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=5, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfd</span><br><span>@@ -501,7 +501,7 @@</span><br><span> ===test_acc_ramp_dynamic===</span><br><span> (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off)</span><br><span> BTS allocation OK in test_acc_ramp_dynamic()</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfe</span><br><span>@@ -539,7 +539,7 @@</span><br><span> *** Barring one ACC ***</span><br><span> (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off)</span><br><span> pcu_info_update(): t2=0x02 t3=0x00</span><br><span style="color: hsl(0, 100%, 40%);">-(bts=0) ACC: updated ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=on)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0) ACC: updated ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off)</span><br><span> pcu_info_update(): t2=0x03 t3=0xff</span><br><span> (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on)</span><br><span> pcu_info_update(): t2=0x03 t3=0xfe</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19375">change 19375</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-bsc/+/19375"/><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-Change-Id: I9731ab29b00bf91cb94b427de423bfbde6b292c8 </div>
<div style="display:none"> Gerrit-Change-Number: 19375 </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>