April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-e1d[master]: RIFO: Fix operator precedence issue in the math for bucket_for_fn

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27799 ) Change subject: RIFO: Fix operator precedence issue in the math for bucket_for_fn ...................................................................... RIFO: Fix operator precedence issue in the math for bucket_for_fn Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Iff91cfe93e8c7b53998b1b4dd73684292c105cc8 --- M src/octoi/frame_rifo.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c index ae10ff2..7e8ddf7 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -47,7 +47,7 @@ { uint32_t next_out_bucket = (rifo->next_out - rifo->buf) / BYTES_PER_FRAME; /* offset in frames compared to next_out */ - uint32_t offset = fn - rifo->next_out_fn % FRAMES_PER_FIFO; + uint32_t offset = (fn - rifo->next_out_fn) % FRAMES_PER_FIFO; return (next_out_bucket + offset) % FRAMES_PER_FIFO; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iff91cfe93e8c7b53998b1b4dd73684292c105cc8 Gerrit-Change-Number: 27799 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: Minor typo/comment fixes

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27798 ) Change subject: RIFO: Minor typo/comment fixes ...................................................................... RIFO: Minor typo/comment fixes Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I9b6181f9136b7963681c472b017d005022d27e6e --- M src/octoi/frame_rifo.c M tests/rifo/rifo_test.c 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c index fbcbbfa..ae10ff2 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -2,7 +2,7 @@ * frame_rifo.c * * This is for the IP -> E1 direction, where IP packets may arrive with - * re-ordering. So this "Random [order] In, First Out' is reconstructing + * re-ordering. So this "Random [order] In, First Out" is reconstructing * the original order. * * (C) 2022 by Harald Welte <laforge(a)osmocom.org> diff --git a/tests/rifo/rifo_test.c b/tests/rifo/rifo_test.c index 5dac5ba..22ffa73 100644 --- a/tests/rifo/rifo_test.c +++ b/tests/rifo/rifo_test.c @@ -146,5 +146,4 @@ // re-run all tests at the edge of a framenumber rollover init_next_out_fn = 0xFFFFFFFF - 5; run_all_tests(); - } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b6181f9136b7963681c472b017d005022d27e6e Gerrit-Change-Number: 27798 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: Fix issue in frame number bounds checking

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27800 ) Change subject: RIFO: Fix issue in frame number bounds checking ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie9024f84f79b458248786bca2343a1f8bffb9994 Gerrit-Change-Number: 27800 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 14 Apr 2022 20:24:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: Fix operator precedence issue in the math for bucket_for_fn

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27799 ) Change subject: RIFO: Fix operator precedence issue in the math for bucket_for_fn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iff91cfe93e8c7b53998b1b4dd73684292c105cc8 Gerrit-Change-Number: 27799 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 14 Apr 2022 20:23:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: Minor typo/comment fixes

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27798 ) Change subject: RIFO: Minor typo/comment fixes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b6181f9136b7963681c472b017d005022d27e6e Gerrit-Change-Number: 27798 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 14 Apr 2022 20:23:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: Add a test for bounds checking

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27801 ) Change subject: RIFO: Add a test for bounds checking ...................................................................... RIFO: Add a test for bounds checking This tests exactly one frame before and one frame after what should be accepted to make sure those are rejected Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I048e1b8c2b918f7ca4b4327b89bf04430a2838bc --- M tests/rifo/rifo_test.c M tests/rifo/rifo_test.ok 2 files changed, 89 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/01/27801/1 diff --git a/tests/rifo/rifo_test.c b/tests/rifo/rifo_test.c index 22ffa73..c9500d6 100644 --- a/tests/rifo/rifo_test.c +++ b/tests/rifo/rifo_test.c @@ -125,6 +125,46 @@ } } +static void bound_check(void) +{ + uint8_t frame[32]; + struct frame_rifo rifo; + frame_rifo_init(&rifo); + rifo.next_out_fn = init_next_out_fn; + + printf("\nTEST: %s, starting at FN: %u\n", __func__, init_next_out_fn); + + // Put 1 frame and get it + memset(frame, 0xa5, sizeof(frame)); + frame_rifo_in(&rifo, frame, init_next_out_fn); + frame_rifo_out(&rifo, frame); + + // Put 11 frames at absolute frame numbers 791-801 + const uint8_t in[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; + for (int i = 0; i < sizeof(in); i++) { + memset(frame, in[i], sizeof(frame)); + rifo_in(&rifo, frame, init_next_out_fn + in[i] + 791); + } + + // Add frame at start offset + memset(frame, 0xa5, sizeof(frame)); + rifo_in(&rifo, frame, init_next_out_fn); + + // Skip the first 790 frames + for (int i = 0; i < 790; i++) { + memset(frame, 0xff, sizeof(frame)); + // Note: frame_rifo_out instead of rifo_out + // (just to ignore the output) + frame_rifo_out(&rifo, frame); + } + + // Try to read the 10 real frames + for (int i = 0; i < 10; i++) { + memset(frame, 0xff, sizeof(frame)); + rifo_out(&rifo, frame); + } +} + void run_all_tests(void) { missing_frames(0); @@ -132,6 +172,7 @@ reordered_in(); correct_order(); too_old_frames(); + bound_check(); } int main(int argc, char **argv) diff --git a/tests/rifo/rifo_test.ok b/tests/rifo/rifo_test.ok index cf1b778..c578724 100644 --- a/tests/rifo/rifo_test.ok +++ b/tests/rifo/rifo_test.ok @@ -99,6 +99,30 @@ RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 +TEST: bound_check, starting at FN: 0 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 791)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 792)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 793)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 794)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 795)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 796)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 797)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 798)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 799)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 800)=0 +RIFO_IN(0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a, 801)=-34 +RIFO_IN(a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5, 0)=-34 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 + TEST: missing_frames, starting at FN: 4294967290 RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 4294967290)=0 RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 4294967292)=0 @@ -198,3 +222,27 @@ RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 RIFO_OUT(ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)=-1 + +TEST: bound_check, starting at FN: 4294967290 +RIFO_IN(0000000000000000000000000000000000000000000000000000000000000000, 785)=0 +RIFO_IN(0101010101010101010101010101010101010101010101010101010101010101, 786)=0 +RIFO_IN(0202020202020202020202020202020202020202020202020202020202020202, 787)=0 +RIFO_IN(0303030303030303030303030303030303030303030303030303030303030303, 788)=0 +RIFO_IN(0404040404040404040404040404040404040404040404040404040404040404, 789)=0 +RIFO_IN(0505050505050505050505050505050505050505050505050505050505050505, 790)=0 +RIFO_IN(0606060606060606060606060606060606060606060606060606060606060606, 791)=0 +RIFO_IN(0707070707070707070707070707070707070707070707070707070707070707, 792)=0 +RIFO_IN(0808080808080808080808080808080808080808080808080808080808080808, 793)=0 +RIFO_IN(0909090909090909090909090909090909090909090909090909090909090909, 794)=0 +RIFO_IN(0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a, 795)=-34 +RIFO_IN(a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5, 4294967290)=-34 +RIFO_OUT(0000000000000000000000000000000000000000000000000000000000000000)=0 +RIFO_OUT(0101010101010101010101010101010101010101010101010101010101010101)=0 +RIFO_OUT(0202020202020202020202020202020202020202020202020202020202020202)=0 +RIFO_OUT(0303030303030303030303030303030303030303030303030303030303030303)=0 +RIFO_OUT(0404040404040404040404040404040404040404040404040404040404040404)=0 +RIFO_OUT(0505050505050505050505050505050505050505050505050505050505050505)=0 +RIFO_OUT(0606060606060606060606060606060606060606060606060606060606060606)=0 +RIFO_OUT(0707070707070707070707070707070707070707070707070707070707070707)=0 +RIFO_OUT(0808080808080808080808080808080808080808080808080808080808080808)=0 +RIFO_OUT(0909090909090909090909090909090909090909090909090909090909090909)=0 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I048e1b8c2b918f7ca4b4327b89bf04430a2838bc Gerrit-Change-Number: 27801 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: Minor typo/comment fixes

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27798 ) Change subject: RIFO: Minor typo/comment fixes ...................................................................... RIFO: Minor typo/comment fixes Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I9b6181f9136b7963681c472b017d005022d27e6e --- M src/octoi/frame_rifo.c M tests/rifo/rifo_test.c 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/98/27798/1 diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c index fbcbbfa..ae10ff2 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -2,7 +2,7 @@ * frame_rifo.c * * This is for the IP -> E1 direction, where IP packets may arrive with - * re-ordering. So this "Random [order] In, First Out' is reconstructing + * re-ordering. So this "Random [order] In, First Out" is reconstructing * the original order. * * (C) 2022 by Harald Welte <laforge(a)osmocom.org> diff --git a/tests/rifo/rifo_test.c b/tests/rifo/rifo_test.c index 5dac5ba..22ffa73 100644 --- a/tests/rifo/rifo_test.c +++ b/tests/rifo/rifo_test.c @@ -146,5 +146,4 @@ // re-run all tests at the edge of a framenumber rollover init_next_out_fn = 0xFFFFFFFF - 5; run_all_tests(); - } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I9b6181f9136b7963681c472b017d005022d27e6e Gerrit-Change-Number: 27798 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: Fix issue in frame number bounds checking

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27800 ) Change subject: RIFO: Fix issue in frame number bounds checking ...................................................................... RIFO: Fix issue in frame number bounds checking You can't have a 'min' and 'max' FN because of the wrap around this needs to be checked "all at once". Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Ie9024f84f79b458248786bca2343a1f8bffb9994 --- M src/octoi/frame_rifo.c M src/octoi/frame_rifo.h 2 files changed, 5 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/00/27800/1 diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c index 7e8ddf7..9f25cf0 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -112,7 +112,7 @@ uint32_t bucket; uint8_t *dst; - if (fn > frame_rifo_max_in_fn(rifo) && fn < frame_rifo_min_in_fn(rifo)) + if (!frame_rifo_fn_in_range(rifo, fn)) { return -ERANGE; } diff --git a/src/octoi/frame_rifo.h b/src/octoi/frame_rifo.h index f107537..6988710 100644 --- a/src/octoi/frame_rifo.h +++ b/src/octoi/frame_rifo.h @@ -13,16 +13,11 @@ indexed by physical offset in buf */ }; -/* maximum frame number we currently can store in the rifo */ -static inline uint32_t frame_rifo_max_in_fn(const struct frame_rifo *ff) +/* can this frame number be stores in the rifo */ +static inline bool frame_rifo_fn_in_range(const struct frame_rifo *ff, uint32_t fn) { - return ff->next_out_fn + FRAMES_PER_FIFO - 1; -} - -/* minimum frame number we currently can store in the rifo */ -static inline uint32_t frame_rifo_min_in_fn(const struct frame_rifo *ff) -{ - return ff->next_out_fn - 1; + uint32_t d = fn - ff->next_out_fn; + return d < FRAMES_PER_FIFO; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie9024f84f79b458248786bca2343a1f8bffb9994 Gerrit-Change-Number: 27800 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: RIFO: Fix operator precedence issue in the math for bucket_for_fn

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27799 ) Change subject: RIFO: Fix operator precedence issue in the math for bucket_for_fn ...................................................................... RIFO: Fix operator precedence issue in the math for bucket_for_fn Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Iff91cfe93e8c7b53998b1b4dd73684292c105cc8 --- M src/octoi/frame_rifo.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/99/27799/1 diff --git a/src/octoi/frame_rifo.c b/src/octoi/frame_rifo.c index ae10ff2..7e8ddf7 100644 --- a/src/octoi/frame_rifo.c +++ b/src/octoi/frame_rifo.c @@ -47,7 +47,7 @@ { uint32_t next_out_bucket = (rifo->next_out - rifo->buf) / BYTES_PER_FRAME; /* offset in frames compared to next_out */ - uint32_t offset = fn - rifo->next_out_fn % FRAMES_PER_FIFO; + uint32_t offset = (fn - rifo->next_out_fn) % FRAMES_PER_FIFO; return (next_out_bucket + offset) % FRAMES_PER_FIFO; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iff91cfe93e8c7b53998b1b4dd73684292c105cc8 Gerrit-Change-Number: 27799 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: amr: fix parsing of threshold and hysteresis in amr_parse_mr_conf()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27762 ) Change subject: amr: fix parsing of threshold and hysteresis in amr_parse_mr_conf() ...................................................................... amr: fix parsing of threshold and hysteresis in amr_parse_mr_conf() Change-Id: I8febb60b0ad91903c7869871f41d1c123dbe5ce3 Related: SYS#5917, OS#4984 --- M src/common/amr.c M tests/amr/amr_test.ok 2 files changed, 12 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/common/amr.c b/src/common/amr.c index 53ce24d..acf1c37 100644 --- a/src/common/amr.c +++ b/src/common/amr.c @@ -200,19 +200,22 @@ } } + /* skip the first two octets of the IE */ + mr_conf += 2; + if (num_codecs >= 2) { - amr_mrc->bts_mode[0].threshold = mr_conf[1] & 0x3F; - amr_mrc->bts_mode[0].hysteresis = mr_conf[2] >> 4; + amr_mrc->bts_mode[0].threshold = mr_conf[0] & 0x3F; + amr_mrc->bts_mode[0].hysteresis = mr_conf[1] >> 4; } if (num_codecs >= 3) { amr_mrc->bts_mode[1].threshold = - ((mr_conf[2] & 0xF) << 2) | (mr_conf[3] >> 6); - amr_mrc->bts_mode[1].hysteresis = (mr_conf[3] >> 2) & 0xF; + ((mr_conf[1] & 0xF) << 2) | (mr_conf[2] >> 6); + amr_mrc->bts_mode[1].hysteresis = (mr_conf[2] >> 2) & 0xF; } if (num_codecs >= 4) { amr_mrc->bts_mode[2].threshold = - ((mr_conf[3] & 0x3) << 4) | (mr_conf[4] >> 4); - amr_mrc->bts_mode[2].hysteresis = mr_conf[4] & 0xF; + ((mr_conf[2] & 0x3) << 4) | (mr_conf[3] >> 4); + amr_mrc->bts_mode[2].hysteresis = mr_conf[3] & 0xF; } return num_codecs; diff --git a/tests/amr/amr_test.ok b/tests/amr/amr_test.ok index 6b42e09..f0d1830 100644 --- a/tests/amr/amr_test.ok +++ b/tests/amr/amr_test.ok @@ -152,9 +152,9 @@ Downlink, AMR AFS: fn_begin=99, CMI=1 amr_parse_mr_conf() <- 20 a5 0d 46 52 54 amr_parse_mr_conf() -> num_modes=4 - Mode[0] = 0/37/0 - Mode[1] = 2/53/1 - Mode[2] = 5/37/2 + Mode[0] = 0/13/4 + Mode[1] = 2/25/4 + Mode[2] = 5/37/4 Mode[3] = 7/0/0 amr_parse_mr_conf() <- 20 ff 0d 46 52 54 amr_parse_mr_conf() <- ff ff 0d 46 52 54 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8febb60b0ad91903c7869871f41d1c123dbe5ce3 Gerrit-Change-Number: 27762 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022