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

Change in docker-playground[master]: osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27797 ) Change subject: osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params ...................................................................... osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params The default AMR link adaptation parameters have been changed in the recent osmo-bsc, so set the old expected default explicitly. Change-Id: Ic1c46d54ef97278100bd52156ad5627418ef5c97 Related: osmo-bsc.git Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917 --- M osmo-bsc-latest/osmo-bsc.cfg M osmo-bsc-master/osmo-bsc.cfg 2 files changed, 24 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg index 861bcc8..a128946 100644 --- a/osmo-bsc-latest/osmo-bsc.cfg +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -90,6 +90,18 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr + amr tch-f modes 0 2 4 7 + amr tch-f threshold ms 32 32 32 + amr tch-f hysteresis ms 8 8 8 + amr tch-f threshold bts 32 32 32 + amr tch-f hysteresis bts 8 8 8 + amr tch-f start-mode auto + amr tch-h modes 0 2 4 + amr tch-h threshold ms 32 32 + amr tch-h hysteresis ms 8 8 + amr tch-h threshold bts 32 32 + amr tch-h hysteresis bts 8 8 + amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index 5731014..0ca91ef 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -93,6 +93,18 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr + amr tch-f modes 0 2 4 7 + amr tch-f threshold ms 32 32 32 + amr tch-f hysteresis ms 8 8 8 + amr tch-f threshold bts 32 32 32 + amr tch-f hysteresis bts 8 8 8 + amr tch-f start-mode auto + amr tch-h modes 0 2 4 + amr tch-h threshold ms 32 32 + amr tch-h hysteresis ms 8 8 + amr tch-h threshold bts 32 32 + amr tch-h hysteresis bts 8 8 + amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1c46d54ef97278100bd52156ad5627418ef5c97 Gerrit-Change-Number: 27797 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in docker-playground[master]: osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27797 ) Change subject: osmo-bsc-{master,latest}/osmo-bsc.cfg: set AMR link adaptation params ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1c46d54ef97278100bd52156ad5627418ef5c97 Gerrit-Change-Number: 27797 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Apr 2022 04:53:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc/osmo-bsc.cfg: explicitly set AMR link adaptation parameters

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27796 ) Change subject: bsc/osmo-bsc.cfg: explicitly set AMR link adaptation parameters ...................................................................... bsc/osmo-bsc.cfg: explicitly set AMR link adaptation parameters The default AMR link adaptation parameters have been changed in the recent osmo-bsc, so set the old expected default explicitly. Change-Id: I320d91a35bc50bdfe87c0384035a10b8672ef23c Related: osmo-bsc.git Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917 --- M bsc/osmo-bsc.cfg 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index f5c9c16..63a82b0 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -95,6 +95,18 @@ si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 codec-support fr hr efr amr + amr tch-f modes 0 2 4 7 + amr tch-f threshold ms 32 32 32 + amr tch-f hysteresis ms 8 8 8 + amr tch-f threshold bts 32 32 32 + amr tch-f hysteresis bts 8 8 8 + amr tch-f start-mode auto + amr tch-h modes 0 2 4 + amr tch-h threshold ms 32 32 + amr tch-h hysteresis ms 8 8 + amr tch-h threshold bts 32 32 + amr tch-h hysteresis bts 8 8 + amr tch-h start-mode auto gprs mode gprs gprs routing area 0 gprs network-control-order nc0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I320d91a35bc50bdfe87c0384035a10b8672ef23c Gerrit-Change-Number: 27796 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> 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-ttcn3-hacks[master]: bsc/osmo-bsc.cfg: explicitly set AMR link adaptation parameters

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27796 ) Change subject: bsc/osmo-bsc.cfg: explicitly set AMR link adaptation parameters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I320d91a35bc50bdfe87c0384035a10b8672ef23c Gerrit-Change-Number: 27796 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Apr 2022 04:53:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27781 ) Change subject: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' ...................................................................... tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' When using 'check_PROGRAMS', autoconf/automake generates smarter Makefiles, so that the test programs are not being compiled during the normal 'make all', but only during 'make check'. Change-Id: I18ebb7395024a490da743c0bcb20959e6e9c7017 --- M tests/agch/Makefile.am M tests/amr/Makefile.am M tests/cipher/Makefile.am M tests/handover/Makefile.am M tests/meas/Makefile.am M tests/misc/Makefile.am M tests/paging/Makefile.am M tests/power/Makefile.am M tests/sysmobts/Makefile.am M tests/ta_control/Makefile.am M tests/tx_power/Makefile.am 11 files changed, 11 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/tests/agch/Makefile.am b/tests/agch/Makefile.am index 0c4fce4..f1c58f6 100644 --- a/tests/agch/Makefile.am +++ b/tests/agch/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCODEC_LIBS) -noinst_PROGRAMS = agch_test +check_PROGRAMS = agch_test EXTRA_DIST = agch_test.ok agch_test_SOURCES = agch_test.c $(srcdir)/../stubs.c diff --git a/tests/amr/Makefile.am b/tests/amr/Makefile.am index 607d051..7922535 100644 --- a/tests/amr/Makefile.am +++ b/tests/amr/Makefile.am @@ -3,7 +3,7 @@ $(LIBOSMOABIS_CFLAGS) $(LIBOSMOTRAU_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) $(LIBOSMOTRAU_LIBS) -noinst_PROGRAMS = amr_test +check_PROGRAMS = amr_test EXTRA_DIST = amr_test.ok amr_test.err amr_test_SOURCES = amr_test.c diff --git a/tests/cipher/Makefile.am b/tests/cipher/Makefile.am index 3c23718..a69321e 100644 --- a/tests/cipher/Makefile.am +++ b/tests/cipher/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCODEC_LIBS) -noinst_PROGRAMS = cipher_test +check_PROGRAMS = cipher_test EXTRA_DIST = cipher_test.ok cipher_test_SOURCES = cipher_test.c $(srcdir)/../stubs.c diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 53d09c9..e83af78 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) -noinst_PROGRAMS = handover_test +check_PROGRAMS = handover_test EXTRA_DIST = handover_test.ok handover_test_SOURCES = handover_test.c $(srcdir)/../stubs.c diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am index c04106e..6c41dd8 100644 --- a/tests/meas/Makefile.am +++ b/tests/meas/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) -noinst_PROGRAMS = meas_test +check_PROGRAMS = meas_test noinst_HEADERS = sysmobts_fr_samples.h meas_testcases.h EXTRA_DIST = meas_test.ok diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index f232c49..7a884fd 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -3,7 +3,7 @@ $(LIBOSMOABIS_CFLAGS) $(LIBOSMOTRAU_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) $(LIBOSMOTRAU_LIBS) -noinst_PROGRAMS = misc_test +check_PROGRAMS = misc_test EXTRA_DIST = misc_test.ok misc_test_SOURCES = misc_test.c $(srcdir)/../stubs.c diff --git a/tests/paging/Makefile.am b/tests/paging/Makefile.am index 74d9826..f4ae659 100644 --- a/tests/paging/Makefile.am +++ b/tests/paging/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCODEC_LIBS) -noinst_PROGRAMS = paging_test +check_PROGRAMS = paging_test EXTRA_DIST = paging_test.ok paging_test_SOURCES = paging_test.c $(srcdir)/../stubs.c diff --git a/tests/power/Makefile.am b/tests/power/Makefile.am index e428178..f7bb060 100644 --- a/tests/power/Makefile.am +++ b/tests/power/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) -noinst_PROGRAMS = ms_power_loop_test bs_power_loop_test +check_PROGRAMS = ms_power_loop_test bs_power_loop_test EXTRA_DIST = ms_power_loop_test.ok ms_power_loop_test.err \ bs_power_loop_test.ok bs_power_loop_test.err diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am index 53180d1..3a6dcaa 100644 --- a/tests/sysmobts/Makefile.am +++ b/tests/sysmobts/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) -noinst_PROGRAMS = sysmobts_test +check_PROGRAMS = sysmobts_test EXTRA_DIST = sysmobts_test.ok sysmobts_test_SOURCES = sysmobts_test.c $(top_srcdir)/src/osmo-bts-sysmo/utils.c \ diff --git a/tests/ta_control/Makefile.am b/tests/ta_control/Makefile.am index 4c89dd2..67455ea 100644 --- a/tests/ta_control/Makefile.am +++ b/tests/ta_control/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) -noinst_PROGRAMS = ta_control_test +check_PROGRAMS = ta_control_test EXTRA_DIST = ta_control_test.ok ta_control_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD) diff --git a/tests/tx_power/Makefile.am b/tests/tx_power/Makefile.am index cd7ccc2..feee7f4 100644 --- a/tests/tx_power/Makefile.am +++ b/tests/tx_power/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) -noinst_PROGRAMS = tx_power_test +check_PROGRAMS = tx_power_test EXTRA_DIST = tx_power_test.ok tx_power_test.err tx_power_test_SOURCES = tx_power_test.c $(srcdir)/../stubs.c -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I18ebb7395024a490da743c0bcb20959e6e9c7017 Gerrit-Change-Number: 27781 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

Change in osmo-bts[master]: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27781 ) Change subject: tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' ...................................................................... Patch Set 2: Code-Review+2 This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I18ebb7395024a490da743c0bcb20959e6e9c7017 Gerrit-Change-Number: 27781 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Apr 2022 22:21:19 +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 laforge

laforge has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved 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-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

laforge has submitted this change. ( 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(-) 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 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-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+2 -- 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:25:02 +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 laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27801 ) Change subject: RIFO: Add a test for bounds checking ...................................................................... Patch Set 1: Code-Review+2 -- 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-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:25:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022