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

Change in osmo-uecups[master]: Move several objects outside of main.c

by daniel

Attention is currently required from: laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27747 ) Change subject: Move several objects outside of main.c ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4613361dc40518edd94f2d4128ba412337690736 Gerrit-Change-Number: 27747 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Apr 2022 08:27:08 +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]: Avoid generating zero-length packets

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 ) Change subject: Avoid generating zero-length packets ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 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: I818a113ff8d2a2f7cab2ec7d9c8661607c6331d6 Gerrit-Change-Number: 27763 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 12 Apr 2022 21:21:31 +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]: Avoid generating zero-length packets

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 ) Change subject: Avoid generating zero-length packets ...................................................................... Avoid generating zero-length packets I used the construct like f_rnd_octstring(f_rnd_int(100)) in a number of places to generate random-length packets with randomized length. The problem I didn't realize is that f_rnd_int() of course can also return '0', which would generate zero-length packets. This may be permitted in some protocols, but it leads to problems e.g. when trying to send a UDP packet of zero length (which the kernel will not do). So let's introduce * f_rnd_int_nonzero() for returning non-zero randomized integers * f_rnd_octstring_rnd_len() for returning a random-length random payload octet string * replace all f_rnd_octstring(f_rnd_int()) call sites with the new function. Change-Id: I818a113ff8d2a2f7cab2ec7d9c8661607c6331d6 Closes: OS#5528 --- M fr/FR_Tests.ttcn M library/Osmocom_Types.ttcn M pcap-client/OPCAP_CLIENT_Tests.ttcn M remsim/RemsimClient_Tests.ttcn M sccp/SCCP_Tests_RAW.ttcn M stp/STP_Tests.ttcn M stp/STP_Tests_M3UA.ttcn 7 files changed, 29 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/27763/1 diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index b7a56c3..65029c1 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -276,7 +276,7 @@ var integer ran_index := 0; var template (value) PDU_LLC llc_tx; var template (present) PDU_LLC llc_rx_exp; - var octetstring llc_payload := f_rnd_octstring(f_rnd_int(max_llc_payload_len)); + var octetstring llc_payload := f_rnd_octstring_rnd_len(max_llc_payload_len); var PDU_LLC llc_rx; timer T := 5.0; diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index b698a2e..2edec36 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -65,6 +65,11 @@ return float2int(rnd()*int2float(max)); } +/* return random integer 1 <= ret < max */ +function f_rnd_int_nonzero(integer max) return integer { + return float2int(1.0 + rnd()*int2float(max-1)); +} + /* return hexstring composed of random digits */ function f_rnd_hexstring(in integer len, in integer max := 16) return hexstring { var integer i; @@ -85,6 +90,11 @@ return ret; } +/* return ocetstring composed of random bytes, at least 1, maximum 'maxlen' bytes long */ +function f_rnd_octstring_rnd_len(in integer maxlen) return octetstring { + return f_rnd_octstring(f_rnd_int_nonzero(maxlen)); +} + /* return bitstring composed of random bits */ function f_rnd_bitstring(in integer len) return bitstring { var octetstring oct := f_rnd_octstring(len / 8 + 1); diff --git a/pcap-client/OPCAP_CLIENT_Tests.ttcn b/pcap-client/OPCAP_CLIENT_Tests.ttcn index e9fe406..1efc343 100644 --- a/pcap-client/OPCAP_CLIENT_Tests.ttcn +++ b/pcap-client/OPCAP_CLIENT_Tests.ttcn @@ -144,7 +144,7 @@ var octetstring udp_payload; /* we assume 1400 is low enough to avoid IP fragmentation */ - udp_payload := f_rnd_octstring(f_rnd_int(1400)); + udp_payload := f_rnd_octstring_rnd_len(1400); f_trafic_pkt_ab(udp_payload); f_opcap_exp_udp(udp_payload, 0); @@ -173,7 +173,7 @@ var octetstring udp_payload; /* we assume 1400 is low enough to avoid IP fragmentation */ - udp_payload := f_rnd_octstring(f_rnd_int(1400)); + udp_payload := f_rnd_octstring_rnd_len(1400); f_trafic_pkt_ab(udp_payload); /* expect packet to arrive on both simulated servers */ diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn index d7d6bc7..219573c 100644 --- a/remsim/RemsimClient_Tests.ttcn +++ b/remsim/RemsimClient_Tests.ttcn @@ -299,8 +299,8 @@ integer count := 100, integer i := 0) runs on client_test_CT { for (var integer j := 0; j < count; j := j+1) { - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); f_client2bank(cslot, bslot, c_apdu, i:=i); f_bank2client(bslot, cslot, r_apdu, i:=i); } @@ -345,8 +345,8 @@ f_set_atr(cslot, '3B9F96801FC78031A073BE21136743200718000001A5'O, i:=1); - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); /* Send C-APDU from correct ClientId/Slot to simulated bankd */ f_client2bank(cslot, bslot, c_apdu, i:=1); /* respond with R-APDU from correct bankId/Slot but stating wrong ClientId */ @@ -372,8 +372,8 @@ f_set_atr(cslot, '3B9F96801FC78031A073BE21136743200718000001A5'O, i:=1); - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); /* Send C-APDU from correct ClientId/Slot to simulated bankd */ f_client2bank(cslot, bslot, c_apdu, i:=1); /* respond with R-APDU from wrong bankId but stating correct ClientId */ diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 5013ddf..fd6bad9 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -182,7 +182,7 @@ testcase TC_udt_without_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; var SCCP_MTP3_TRANSFERind rx; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); /* Keep recommended ratio of T(iar) >= T(ias)*2, but anyway no IT should be received in this case. */ @@ -215,7 +215,7 @@ testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; var OCT3 remote_lref; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side has time to keep alive with a T(ias). Keep recommended ratio of @@ -320,7 +320,7 @@ /* Test if the IUT SCCP code processes an XUDT [treat it like UDT] and answers back. */ testcase TC_process_rx_xudt() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index 004af05..ac45b1d 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -73,7 +73,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via M3UA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -105,7 +105,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -137,7 +137,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -173,7 +173,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 31bab93..08fc9c9 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -407,7 +407,7 @@ integer idx_rx, template (omit) OCT4 rctx_receiver, OCT4 pc_rx, OCT1 si := '23'O, OCT1 ni := '00'O, OCT1 mp := '00'O, OCT1 sls := '00'O) runs on RAW_M3UA_CT { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); f_M3UA_send(idx_tx, ts_M3UA_DATA(rctx_sender, ts_M3UA_protocol_data(pc_tx, pc_rx, si, ni, mp, sls, data)), 1); f_M3UA_exp(idx_rx, tr_M3UA_DATA(rctx_receiver, @@ -482,7 +482,7 @@ const integer iter_per_asp := 5; var integer num_rx[NR_M3UA] := { 0, 0, 0 }; for (i := 0; i < 2*iter_per_asp; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var template (value) M3UA_Protocol_Data tx_pd; var template (present) M3UA_Protocol_Data rx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, '00'O, data); @@ -533,7 +533,7 @@ /* verify traffic is routed from sender to new receiver */ for (i := 0; i < 10; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var template (value) M3UA_Protocol_Data tx_pd; var template (present) M3UA_Protocol_Data rx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, '00'O, data); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 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: I818a113ff8d2a2f7cab2ec7d9c8661607c6331d6 Gerrit-Change-Number: 27763 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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 pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27762 ) Change subject: amr: fix parsing of threshold and hysteresis in amr_parse_mr_conf() ...................................................................... Patch Set 1: Code-Review+1 -- 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 19:34:55 +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/amr: add a unit test for amr_parse_mr_conf()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27761 ) Change subject: tests/amr: add a unit test for amr_parse_mr_conf() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iab7e8878e62f598959e80fcb7e729b7f496962a2 Gerrit-Change-Number: 27761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 19:34:30 +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/amr/Makefile.am: use proper binary name prefix 'amr_test_'

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27760 ) Change subject: tests/amr/Makefile.am: use proper binary name prefix 'amr_test_' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia1739bab76261ff6d50824462b8ed2e0b34fb464 Gerrit-Change-Number: 27760 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 19:34:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/27762/1 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: tests/amr/Makefile.am: use proper binary name prefix 'amr_test_'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27760 ) Change subject: tests/amr/Makefile.am: use proper binary name prefix 'amr_test_' ...................................................................... tests/amr/Makefile.am: use proper binary name prefix 'amr_test_' Both misc_test_{SOURCES,LDADD} were simply ignored because binary 'misc_test' is not listed in noinst_PROGRAMS... Change-Id: Ia1739bab76261ff6d50824462b8ed2e0b34fb464 Related: SYS#5917, OS#4984 --- M tests/amr/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/60/27760/1 diff --git a/tests/amr/Makefile.am b/tests/amr/Makefile.am index dc0f1b8..5da63ff 100644 --- a/tests/amr/Makefile.am +++ b/tests/amr/Makefile.am @@ -6,6 +6,6 @@ noinst_PROGRAMS = amr_test EXTRA_DIST = amr_test.ok -misc_test_SOURCES = amr_test.c -misc_test_LDADD = $(top_builddir)/src/common/libbts.a \ +amr_test_SOURCES = amr_test.c +amr_test_LDADD = $(top_builddir)/src/common/libbts.a \ $(LDADD) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia1739bab76261ff6d50824462b8ed2e0b34fb464 Gerrit-Change-Number: 27760 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: tests/amr: add a unit test for amr_parse_mr_conf()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27761 ) Change subject: tests/amr: add a unit test for amr_parse_mr_conf() ...................................................................... tests/amr: add a unit test for amr_parse_mr_conf() This unit test demonstrates a problem in amr_parse_mr_conf(): the threshold and hysteresis values are parsed incorrectly. They are expected to match what we have in amr_fr_bts_mode_def[]: Mode[0] = 0/13/4 Mode[1] = 2/25/4 Mode[2] = 5/37/4 This will be fixed in a follow-up patch. Change-Id: Iab7e8878e62f598959e80fcb7e729b7f496962a2 Related: SYS#5917, OS#4984 --- M tests/amr/Makefile.am M tests/amr/amr_test.c A tests/amr/amr_test.err M tests/amr/amr_test.ok M tests/testsuite.at 5 files changed, 55 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/27761/1 diff --git a/tests/amr/Makefile.am b/tests/amr/Makefile.am index 5da63ff..607d051 100644 --- a/tests/amr/Makefile.am +++ b/tests/amr/Makefile.am @@ -4,7 +4,7 @@ LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOABIS_LIBS) $(LIBOSMOTRAU_LIBS) noinst_PROGRAMS = amr_test -EXTRA_DIST = amr_test.ok +EXTRA_DIST = amr_test.ok amr_test.err amr_test_SOURCES = amr_test.c amr_test_LDADD = $(top_builddir)/src/common/libbts.a \ diff --git a/tests/amr/amr_test.c b/tests/amr/amr_test.c index 4efbf40..941212a 100644 --- a/tests/amr/amr_test.c +++ b/tests/amr/amr_test.c @@ -19,7 +19,12 @@ */ #include <osmo-bts/logging.h> +#include <osmo-bts/bts.h> +#include <osmo-bts/amr.h> + +#include <osmocom/core/application.h> #include <osmocom/core/utils.h> + #include <stdlib.h> #include <stdio.h> #include "../../src/osmo-bts-trx/sched_utils.h" @@ -143,9 +148,44 @@ } } +static void test_amr_parse_mr_conf(void) +{ + uint8_t mrc_enc[] = { 0x20, 0xa5, 0x0d, 0x46, 0x52, 0x54 }; + struct amr_multirate_conf mrc = { 0 }; + unsigned int i; + + printf("amr_parse_mr_conf() <- %s\n", osmo_hexdump(&mrc_enc[0], sizeof(mrc_enc))); + OSMO_ASSERT(amr_parse_mr_conf(&mrc, &mrc_enc[0], sizeof(mrc_enc)) > 0); + printf("amr_parse_mr_conf() -> num_modes=%u\n", mrc.num_modes); + for (i = 0; i < mrc.num_modes; i++) { + printf(" Mode[%u] = %u/%u/%u\n", + i, mrc.bts_mode[i].mode, + mrc.bts_mode[i].threshold, + mrc.bts_mode[i].hysteresis); + } + + mrc_enc[1] = 0xff; /* all codec modes active */ + printf("amr_parse_mr_conf() <- %s\n", osmo_hexdump(&mrc_enc[0], sizeof(mrc_enc))); + OSMO_ASSERT(amr_parse_mr_conf(&mrc, &mrc_enc[0], sizeof(mrc_enc)) == -EINVAL); + + mrc_enc[0] = 0xff; /* unknown version */ + printf("amr_parse_mr_conf() <- %s\n", osmo_hexdump(&mrc_enc[0], sizeof(mrc_enc))); + OSMO_ASSERT(amr_parse_mr_conf(&mrc, &mrc_enc[0], sizeof(mrc_enc)) == -EINVAL); + + printf("amr_parse_mr_conf() <- %s\n", osmo_hexdump(&mrc_enc[0], 1)); /* short read */ + OSMO_ASSERT(amr_parse_mr_conf(&mrc, &mrc_enc[0], 1) == -EINVAL); +} + int main(int argc, char **argv) { + osmo_init_logging2(NULL, &bts_log_info); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); test_amr_cmi_sched(); + test_amr_parse_mr_conf(); return EXIT_SUCCESS; } diff --git a/tests/amr/amr_test.err b/tests/amr/amr_test.err new file mode 100644 index 0000000..0b7bdaf --- /dev/null +++ b/tests/amr/amr_test.err @@ -0,0 +1,3 @@ +DRSL ERROR AMR Multirate with 8 modes len=6 not possible +DRSL ERROR AMR Multirate Version 7 unknown +DRSL ERROR AMR Multirate IE is too short (1) diff --git a/tests/amr/amr_test.ok b/tests/amr/amr_test.ok index ec1d1a0..6b42e09 100644 --- a/tests/amr/amr_test.ok +++ b/tests/amr/amr_test.ok @@ -150,3 +150,12 @@ Downlink, AMR AFS: fn_begin=91, CMI=1 Downlink, AMR AFS: fn_begin=95, CMI=0 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[3] = 7/0/0 +amr_parse_mr_conf() <- 20 ff 0d 46 52 54 +amr_parse_mr_conf() <- ff ff 0d 46 52 54 +amr_parse_mr_conf() <- ff diff --git a/tests/testsuite.at b/tests/testsuite.at index f2d17fb..7e6ec4b 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -67,5 +67,6 @@ AT_SETUP([amr]) AT_KEYWORDS([amr]) cat $abs_srcdir/amr/amr_test.ok > expout -AT_CHECK([$abs_top_builddir/tests/amr/amr_test], [], [expout], [ignore]) +cat $abs_srcdir/amr/amr_test.err > experr +AT_CHECK([$abs_top_builddir/tests/amr/amr_test], [], [expout], [experr]) AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iab7e8878e62f598959e80fcb7e729b7f496962a2 Gerrit-Change-Number: 27761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: bts: gsm_bts_alloc(): use reasonable multi-rate config defaults

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27745 ) Change subject: bts: gsm_bts_alloc(): use reasonable multi-rate config defaults ...................................................................... bts: gsm_bts_alloc(): use reasonable multi-rate config defaults The current multi-rate configuration uses the same threshold and the same hysteresis values for all modes: 32 and 8, respectively. This basically forces the AMR link adoptation loop in the BTS to stick to the initial codec mode during an lchan's lifetime. Let's use more reasonable default values from 3GPP TS 51.010-1 (version 13.11.0), sections 14.2.19.4.1 and 14.2.20.4.1 for AMR-FR and AMR-HR, respectively. ^ C/I (dB) | FR / HR | | | | | MODE4 | | = | ----+---- THR_MX_Up(3) | 20.5 / 18.0 | | | | | = ----+---- THR_MX_Dn(4) | 18.5 / 16.0 | MODE3 | | | = ----+---- THR_MX_Up(2) | 14.5 / 14.0 | | | | = | ----+---- THR_MX_Dn(3) | 12.5 / 12.0 | MODE2 | | = | ----+---- THR_MX_Up(1) | 8.5 / 10.0 | | | | | = ----+---- THR_MX_Dn(2) | 6.5 / 8.0 | MODE1 | | | | | | Change-Id: Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Related: SYS#5917, OS#4984 --- M src/osmo-bsc/bts.c 1 file changed, 59 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index c335963..f4c90e0 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -334,51 +334,93 @@ }; /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. - * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */ + * The values are taken from 3GPP TS 51.010-1 (version 13.11.0). + * See 14.2.19.4.1 and 14.2.20.4.1 for AMR-FR and AMR-HR, respectively. */ static const struct gsm48_multi_rate_conf amr_fr_mr_cfg = { .m4_75 = 1, .m5_90 = 1, - .m7_40 = 1, + .m7_95 = 1, .m12_2 = 1 }; static const struct gsm48_multi_rate_conf amr_hr_mr_cfg = { .m4_75 = 1, .m5_90 = 1, - .m7_40 = 1, + .m6_70 = 1, + .m7_95 = 1, }; memcpy(bts->mr_full.gsm48_ie, &amr_fr_mr_cfg, sizeof(bts->mr_full.gsm48_ie)); memcpy(bts->mr_half.gsm48_ie, &amr_hr_mr_cfg, sizeof(bts->mr_half.gsm48_ie)); - static const struct amr_mode amr_ms_bts_mode[] = { + /* ^ C/I (dB) | FR / HR | + * | | + * | | + * MODE4 | | + * = | ----+---- THR_MX_Up(3) | 20.5 / 18.0 | + * | | | + * | = ----+---- THR_MX_Dn(4) | 18.5 / 16.0 | + * MODE3 | | + * | = ----+---- THR_MX_Up(2) | 14.5 / 14.0 | + * | | | + * = | ----+---- THR_MX_Dn(3) | 12.5 / 12.0 | + * MODE2 | | + * = | ----+---- THR_MX_Up(1) | 8.5 / 10.0 | + * | | | + * | = ----+---- THR_MX_Dn(2) | 6.5 / 8.0 | + * MODE1 | | + * | | + * | | + */ + static const struct amr_mode amr_fr_ms_bts_mode[] = { { .mode = 0, /* 4.75k */ - .threshold = 32, - .hysteresis = 8, + .threshold = 13, /* THR_MX_Dn(2): 6.5 dB */ + .hysteresis = 4, /* THR_MX_Up(1): 8.5 dB */ }, { .mode = 2, /* 5.90k */ - .threshold = 32, - .hysteresis = 8, + .threshold = 25, /* THR_MX_Dn(3): 12.5 dB */ + .hysteresis = 4, /* THR_MX_Up(2): 14.5 dB */ }, { - .mode = 4, /* 7.40k */ - .threshold = 32, - .hysteresis = 8, + .mode = 5, /* 7.95k */ + .threshold = 37, /* THR_MX_Dn(4): 18.5 dB */ + .hysteresis = 4, /* THR_MX_Up(3): 20.5 dB */ }, { .mode = 7, /* 12.2k */ /* this is the last mode, so no threshold */ }, }; + static const struct amr_mode amr_hr_ms_bts_mode[] = { + { + .mode = 0, /* 4.75k */ + .threshold = 16, /* THR_MX_Dn(2): 8.0 dB */ + .hysteresis = 4, /* THR_MX_Up(1): 10.0 dB */ + }, + { + .mode = 2, /* 5.90k */ + .threshold = 24, /* THR_MX_Dn(3): 12.0 dB */ + .hysteresis = 4, /* THR_MX_Up(2): 14.0 dB */ + }, + { + .mode = 3, /* 6.70k */ + .threshold = 32, /* THR_MX_Dn(4): 16.0 dB */ + .hysteresis = 4, /* THR_MX_Up(3): 18.0 dB */ + }, + { + .mode = 5, /* 7.95k */ + /* this is the last mode, so no threshold */ + }, + }; - memcpy(&bts->mr_full.ms_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); - memcpy(&bts->mr_full.bts_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); - bts->mr_full.num_modes = 4; + memcpy(&bts->mr_full.ms_mode[0], &amr_fr_ms_bts_mode[0], sizeof(amr_fr_ms_bts_mode)); + memcpy(&bts->mr_full.bts_mode[0], &amr_fr_ms_bts_mode[0], sizeof(amr_fr_ms_bts_mode)); + bts->mr_full.num_modes = ARRAY_SIZE(amr_fr_ms_bts_mode); - memcpy(&bts->mr_half.ms_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); - memcpy(&bts->mr_half.bts_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); - bts->mr_half.num_modes = 3; + memcpy(&bts->mr_half.ms_mode[0], &amr_hr_ms_bts_mode[0], sizeof(amr_hr_ms_bts_mode)); + memcpy(&bts->mr_half.bts_mode[0], &amr_hr_ms_bts_mode[0], sizeof(amr_hr_ms_bts_mode)); + bts->mr_half.num_modes = ARRAY_SIZE(amr_hr_ms_bts_mode); bts_init_cbch_state(&bts->cbch_basic, bts); bts_init_cbch_state(&bts->cbch_extended, bts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f8d55d250976d8d4c9cae2d89480fd52326717 Gerrit-Change-Number: 27745 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