This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19375 ) Change subject: fixup ...................................................................... fixup Change-Id: I9731ab29b00bf91cb94b427de423bfbde6b292c8 --- M src/osmo-bsc/acc.c M tests/acc/acc_test.ok 2 files changed, 24 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/19375/1 diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c index 0da6528..6fb7ee9 100644 --- a/src/osmo-bsc/acc.c +++ b/src/osmo-bsc/acc.c @@ -68,7 +68,7 @@ static void acc_mgr_enable_rotation_cond(struct acc_mgr *acc_mgr) { - if (acc_mgr->allowed_permanent_count && + if (acc_mgr->allowed_permanent_count && acc_mgr->allowed_subset_mask_count && acc_mgr->allowed_permanent_count != acc_mgr->allowed_subset_mask_count) { if (!osmo_timer_pending(&acc_mgr->rotate_timer)) osmo_timer_schedule(&acc_mgr->rotate_timer, acc_mgr->rotation_time_sec, 0); @@ -296,6 +296,9 @@ void acc_mgr_set_len_allowed_adm(struct acc_mgr *acc_mgr, uint8_t len_allowed_adm) { uint8_t old_len; + + OSMO_ASSERT(len_allowed_adm <= 10); + if (acc_mgr->len_allowed_adm == len_allowed_adm) return; @@ -310,6 +313,9 @@ void acc_mgr_set_len_allowed_ramp(struct acc_mgr *acc_mgr, uint8_t len_allowed_ramp) { uint8_t old_len; + + OSMO_ASSERT(len_allowed_ramp <= 10); + if (acc_mgr->len_allowed_ramp == len_allowed_ramp) return; diff --git a/tests/acc/acc_test.ok b/tests/acc/acc_test.ok index c6ea655..42cacc2 100644 --- a/tests/acc/acc_test.ok +++ b/tests/acc/acc_test.ok @@ -20,7 +20,7 @@ pcu_info_update(): t2=0x00 t3=0xff (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=10, adm_len=1, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -47,7 +47,7 @@ pcu_info_update(): t2=0x00 t3=0x0f (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=10, adm_len=2, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=10, adm_len=4, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf0 @@ -71,7 +71,7 @@ pcu_info_update(): t2=0x02 t3=0xbf (bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x100 (active_len=1, ramp_len=10, adm_len=1, perm_len=5, rotation=on) pcu_info_update(): t2=0x02 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x100 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x100 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=10, adm_len=1, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xfd @@ -92,7 +92,7 @@ (bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x15a (active_len=5, ramp_len=10, adm_len=6, perm_len=5, rotation=off) (bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x140 (active_len=2, ramp_len=10, adm_len=2, perm_len=5, rotation=on) pcu_info_update(): t2=0x02 t3=0xbf -(bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x140 -> 0x000 (active_len=0, ramp_len=10, adm_len=0, perm_len=5, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x05a (active_len=4, ramp_len=10, adm_len=4, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xa5 @@ -128,7 +128,7 @@ pcu_info_update(): t2=0x00 t3=0xff (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -155,7 +155,7 @@ pcu_info_update(): t2=0x00 t3=0x0f (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf0 @@ -178,7 +178,7 @@ pcu_info_update(): t2=0x01 t3=0xbf (bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=4, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x004 (active_len=1, ramp_len=1, adm_len=10, perm_len=4, rotation=on) pcu_info_update(): t2=0x03 t3=0xfb @@ -198,7 +198,7 @@ (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x24c (active_len=4, ramp_len=6, adm_len=10, perm_len=4, rotation=off) (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x240 (active_len=2, ramp_len=2, adm_len=10, perm_len=4, rotation=on) pcu_info_update(): t2=0x01 t3=0xbf -(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=4, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=10, perm_len=4, rotation=off) pcu_info_update(): t2=0x01 t3=0xb3 @@ -279,7 +279,7 @@ pcu_info_update(): t2=0x00 t3=0xff (bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x200 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -306,7 +306,7 @@ pcu_info_update(): t2=0x00 t3=0x0f (bts=0) ACC: updated ACC allowed active subset 0x3f0 -> 0x300 (active_len=2, ramp_len=2, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x300 -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x00f (active_len=4, ramp_len=4, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf0 @@ -326,7 +326,7 @@ pcu_info_update(): t2=0x01 t3=0xbf (bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x200 (active_len=1, ramp_len=1, adm_len=4, perm_len=4, rotation=on) pcu_info_update(): t2=0x01 t3=0xff -(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x200 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x004 (active_len=1, ramp_len=1, adm_len=4, perm_len=4, rotation=on) pcu_info_update(): t2=0x03 t3=0xfb @@ -339,7 +339,7 @@ do_allowed_len_ramp_loop(4) (bts=0) ACC: updated ACC allowed active subset 0x24c -> 0x240 (active_len=2, ramp_len=2, adm_len=4, perm_len=4, rotation=on) pcu_info_update(): t2=0x01 t3=0xbf -(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x240 -> 0x000 (active_len=0, ramp_len=0, adm_len=4, perm_len=4, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x24c (active_len=4, ramp_len=4, adm_len=4, perm_len=4, rotation=off) pcu_info_update(): t2=0x01 t3=0xb3 @@ -416,7 +416,7 @@ ===test_acc_ramp_fixed=== (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_fixed() -(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -453,7 +453,7 @@ BTS allocation OK in test_acc_ramp_fixed2() (bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x3f8 (active_len=7, ramp_len=10, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x00 t3=0x07 -(bts=0) ACC: updated ACC allowed active subset 0x3f8 -> 0x000 (active_len=0, ramp_len=0, adm_len=7, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x3f8 -> 0x000 (active_len=0, ramp_len=0, adm_len=7, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x007 (active_len=3, ramp_len=3, adm_len=7, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xf8 @@ -471,7 +471,7 @@ *** Barring some ACCs *** (bts=0) ACC: New ACC allowed subset 0x15a (active_len=5, ramp_len=10, adm_len=10, perm_len=5, rotation=off) pcu_info_update(): t2=0x02 t3=0xa5 -(bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=5, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x15a -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=5, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x002 (active_len=1, ramp_len=1, adm_len=10, perm_len=5, rotation=on) pcu_info_update(): t2=0x03 t3=0xfd @@ -501,7 +501,7 @@ ===test_acc_ramp_dynamic=== (bts=0) ACC: New ACC allowed subset 0x3ff (active_len=10, ramp_len=10, adm_len=10, perm_len=10, rotation=off) BTS allocation OK in test_acc_ramp_dynamic() -(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x3ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=10, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=10, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe @@ -539,7 +539,7 @@ *** Barring one ACC *** (bts=0) ACC: New ACC allowed subset 0x1ff (active_len=9, ramp_len=10, adm_len=10, perm_len=9, rotation=off) pcu_info_update(): t2=0x02 t3=0x00 -(bts=0) ACC: updated ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=on) +(bts=0) ACC: updated ACC allowed active subset 0x1ff -> 0x000 (active_len=0, ramp_len=0, adm_len=10, perm_len=9, rotation=off) pcu_info_update(): t2=0x03 t3=0xff (bts=0) ACC: New ACC allowed subset 0x001 (active_len=1, ramp_len=1, adm_len=10, perm_len=9, rotation=on) pcu_info_update(): t2=0x03 t3=0xfe -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9731ab29b00bf91cb94b427de423bfbde6b292c8 Gerrit-Change-Number: 19375 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200723/f20f1bdd/attachment.htm>