February 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-abis[master]: trau_pcu_ericsson: cosmetic: set hdr_good flag explictly to false

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31441 ) Change subject: trau_pcu_ericsson: cosmetic: set hdr_good flag explictly to false ...................................................................... trau_pcu_ericsson: cosmetic: set hdr_good flag explictly to false It is not necessary but we also set the data_good flags explicitly to false so lets to the same with hdr_good Change-Id: Ic710f7e63f4b7e16a3cbc9eb8bbf9ae1c7c5cb26 Related: OS#5198 --- M src/trau/trau_pcu_ericsson.c 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/trau/trau_pcu_ericsson.c b/src/trau/trau_pcu_ericsson.c index 0b0477b..2f2bf0e 100644 --- a/src/trau/trau_pcu_ericsson.c +++ b/src/trau/trau_pcu_ericsson.c @@ -1671,6 +1671,8 @@ if (trau_bits[98] == 0) ind->u.egprs.data_good[1] = true; } else { + ind->u.egprs.hdr_good = false; + /* A bad RLC/MAC header always means that the the data blocks * cannot be valid. */ ind->u.egprs.data_good[0] = false; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic710f7e63f4b7e16a3cbc9eb8bbf9ae1c7c5cb26 Gerrit-Change-Number: 31441 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in libosmo-abis[master]: trau_pcu_ericsson_test: replace 64K CS1/CS2 testvectors

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31440 ) Change subject: trau_pcu_ericsson_test: replace 64K CS1/CS2 testvectors ...................................................................... trau_pcu_ericsson_test: replace 64K CS1/CS2 testvectors The CS1/CS2 testvectors for the 64K TRAU frame decoder are valid but the contained MAC block consits of noise. At the time when the test data was sampled it was not possible to get TRAU frames with valid content from the CCU. This has changed, so lets update the testvectors with ones that contain valid data. Change-Id: I0b8aef1ce1eca5b10601a0a655f7e3b00915d3cc Related: OS#5198 --- M tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c M tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok 2 files changed, 101 insertions(+), 85 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c index 986ab79..6c28269 100644 --- a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c +++ b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c @@ -1140,8 +1140,7 @@ int rc; struct er_gprs_trau_frame frame; - /* TRAU frame with CS1 block and correct CRC. CS1 one data itsself is - * noise. */ + /* TRAU frame with valid CS1 block and correct CRC */ const ubit_t bits_cs1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1152,44 +1151,46 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, - 0, 1, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 1, 0, 1, 1, 1, - 1, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 1, 1, 1, 1, 0, - 1, 1, 1, 0, 1, 1, 1, 0, - 1, 0, 1, 0, 0, 1, 1, 1, - 1, 0, 1, 0, 0, 0, 1, 0, - 1, 0, 0, 1, 1, 0, 0, 1, - 1, 1, 1, 1, 0, 0, 0, 1, - 1, 0, 1, 0, 1, 1, 1, 0, - 0, 0, 1, 1, 0, 1, 0, 1, - 1, 0, 1, 1, 0, 0, 0, 1, + 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, - 0, 0, 1, 1, 0, 1, 0, 1, - 1, 0, 0, 1, 1, 1, 0, 1, - 1, 1, 1, 0, 0, 1, 1, 1, - 0, 1, 1, 1, 0, 0, 1, 0, - 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 1, - 1, 0, 1, 0, 1, 0, 1, 0, - 0, 1, 1, 0, 1, 1, 0, 1, - 1, 0, 0, 0, 1, 1, 0, 0, - 0, 1, 1, 1, 1, 0, 0, 0, - 1, 1, 1, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 1, - 1, 0, 0, 1, 1, 1, 0, 0, - 0, 0, 1, 1, 0, 1, 0, 1, - 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 1, 1, 1, 0, 0, + 0, 0, 0, 0, 1, 0, 1, 1, + 1, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 1, 0, 1, 0, + 1, 0, 1, 1, 1, 0, 1, 0, + 0, 0, 1, 1, 1, 0, 1, 1, + 0, 1, 1, 1, 1, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 0, 1, + 0, 1, 1, 0, 1, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + /* [...] shortened since decode won't access filler bits after + * the TRAU frame. */ }; + /* TRAU frame with valid CS2 block and correct CRC */ const ubit_t bits_cs2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1199,52 +1200,51 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 0, 1, 1, 1, 0, - 1, 1, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 1, 1, 0, 1, 0, - 1, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 1, 1, 1, 1, 0, 1, - 1, 1, 1, 0, 1, 1, 1, 1, - 1, 0, 1, 0, 0, 0, 0, 1, - 0, 1, 0, 1, 1, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 1, 0, - 1, 1, 0, 0, 1, 1, 1, 0, - 1, 0, 1, 0, 0, 0, 0, 0, - 0, 1, 0, 1, 0, 1, 1, 1, - 0, 1, 0, 0, 1, 1, 1, 1, - 1, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 0, 0, 1, 0, 0, 1, - 1, 0, 1, 1, 0, 1, 0, 1, - 0, 0, 1, 0, 0, 1, 1, 0, - 0, 0, 0, 1, 0, 1, 0, 1, - 0, 0, 1, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 0, 0, 1, 0, - 0, 0, 0, 1, 1, 0, 1, 1, - 0, 0, 0, 1, 1, 1, 0, 0, - 1, 0, 0, 0, 1, 1, 0, 0, - 0, 0, 1, 1, 1, 0, 0, 0, + 1, 0, 1, 0, 1, 1, 0, 1, + 1, 1, 0, 1, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 1, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 0, - 1, 0, 0, 1, 1, 1, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 1, - 0, 0, 0, 1, 1, 0, 1, 1, - 0, 1, 0, 0, 0, 1, 1, 1, - 0, 1, 0, 0, 1, 1, 1, 1, - 0, 1, 0, 1, 0, 0, 1, 0, - 0, 1, 1, 1, 0, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 1, 0, - 1, 0, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 1, 1, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 1, 0, + 0, 1, 0, 0, 1, 0, 0, 0, + 0, 0, 1, 0, 1, 1, 1, 0, + 1, 1, 1, 0, 0, 1, 0, 0, + 1, 1, 1, 0, 1, 0, 0, 1, + 1, 1, 1, 0, 1, 0, 1, 1, + 1, 0, 0, 1, 1, 0, 1, 1, + 1, 1, 0, 1, 1, 0, 1, 1, + 1, 1, 0, 1, 1, 0, 1, 1, + 1, 0, 0, 1, 1, 0, 0, 0, + 1, 1, 0, 1, 1, 0, 1, 0, + 1, 0, 0, 1, 1, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 1, 1, + 0, 0, 0, 1, 1, 0, 1, 1, + 1, 1, 0, 1, 1, 0, 1, 0, + 1, 1, 0, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 1, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, /* [...] shortened since decode won't access filler bits after * the TRAU frame. */ }; diff --git a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok index 6d93eed..3d9666c 100644 --- a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok +++ b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok @@ -2521,23 +2521,23 @@ ccu_data_ind.tav=00 ccu_data_ind.dbe=0 ccu_data_ind.cs_hdr=1 - ccu_data_ind.gprs.rx_lev=0 - ccu_data_ind.gprs.est_acc_del_dev=3 - ccu_data_ind.u.gprs.block_qual=7 - ccu_data_ind.u.gprs.parity_ok=0 + ccu_data_ind.gprs.rx_lev=63 + ccu_data_ind.gprs.est_acc_del_dev=0 + ccu_data_ind.u.gprs.block_qual=0 + ccu_data_ind.u.gprs.parity_ok=1 ccu_data_ind.u.data_len=23 - ccu_data_ind.data=dd9517653ed6b1367eb0e69e3b9df90356d9c6781c02e6 + ccu_data_ind.data=40074275717b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b ==> er_gprs_trau_frame_decode_64k_FT_DATA_test (CS2) - ccu_data_ind.tav=01 + ccu_data_ind.tav=02 ccu_data_ind.dbe=0 ccu_data_ind.cs_hdr=2 - ccu_data_ind.gprs.rx_lev=0 + ccu_data_ind.gprs.rx_lev=63 ccu_data_ind.gprs.est_acc_del_dev=0 - ccu_data_ind.u.gprs.block_qual=5 - ccu_data_ind.u.gprs.parity_ok=0 + ccu_data_ind.u.gprs.block_qual=0 + ccu_data_ind.u.gprs.parity_ok=1 ccu_data_ind.u.data_len=34 - ccu_data_ind.data=f3de176a2008cd15a8cb074cb692a1122461e3c470f8bff8e5a6638bcb2bb903653f + ccu_data_ind.data=00010449d09d5c5e676f6f676c6503636f6d0000010001881c802b2b2b2b2b2b2b00 ==> er_gprs_trau_frame_decode_64k_FT_DATA_test (AB) ccu_data_ind.tav=01 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0b8aef1ce1eca5b10601a0a655f7e3b00915d3cc Gerrit-Change-Number: 31440 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in libosmo-abis[master]: e1_input: cleanup TS resources when timeslot type is changed

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31323 ) Change subject: e1_input: cleanup TS resources when timeslot type is changed ...................................................................... e1_input: cleanup TS resources when timeslot type is changed There may be situations where we want to change the timeslot type by calling a different e1inp_ts_config_xyz function at some later point. In those cases we must ensure that no dynamically allocated resources remain in the type dependend union of struct e1inp_ts. Depends: libosmocore.git I0454ffe5809f21504c1e263a781c06596d452d4b Related: OS#5198 Change-Id: Icf84816460b8ceba43601594bcf504306606f4ed --- M src/e1_input.c 1 file changed, 78 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/e1_input.c b/src/e1_input.c index be98138..e3ac67e 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -361,6 +361,56 @@ return 0; } +/* Depending on its typ a timeslot may hold resources which must be cleaned up + * or reset before the type of the timeslot type may be changed. */ +static int cleanup_e1inp_ts(struct e1inp_ts *e1i_ts) +{ + int rc; + + switch (e1i_ts->type) { + case E1INP_TS_TYPE_SIGN: + /* The caller is responsible for removing all signalling links + * first. */ + if (!llist_empty(&e1i_ts->sign.sign_links)) { + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, + "timeslot still holds active signalling links -- cannot modify timeslot!\n"); + return -EINVAL; + } + return 0; + case E1INP_TS_TYPE_TRAU: + /* Call the initialization functions once more. This will + * deactivate all subchannels so that the related callbacks + * are no longer called */ + subchan_mux_init(&e1i_ts->trau.mux); + subch_demux_init(&e1i_ts->trau.demux); + return 0; + case E1INP_TS_TYPE_RAW: + msgb_queue_free(&e1i_ts->raw.tx_queue); + return 0; + case E1INP_TS_TYPE_HDLC: + msgb_queue_free(&e1i_ts->hdlc.tx_queue); + return 0; + case E1INP_TS_TYPE_I460: + /* The caller is responsible for removing all I.460 subchannels + * first. */ + rc = osmo_i460_subchan_count(&e1i_ts->i460.i460_ts); + if (rc != 0) { + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, + "timeslot still holds active I.460 subchannels -- cannot modify timeslot!\n"); + return -EINVAL; + } + return 0; + case E1INP_TS_TYPE_NONE: + return 0; + default: + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "unsupported E1 TS type %u\n", + e1i_ts->type); + return -EINVAL; + } + + return 0; +} + /* Timeslot */ int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line, int (*trau_rcv_cb)(struct subch_demux *dmx, int ch, @@ -369,6 +419,8 @@ if (ts->type == E1INP_TS_TYPE_TRAU && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_TRAU; ts->line = line; @@ -384,6 +436,8 @@ if (ts->type == E1INP_TS_TYPE_I460 && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_I460; ts->line = line; osmo_i460_ts_init(&ts->i460.i460_ts); @@ -403,6 +457,8 @@ if (ts->type == E1INP_TS_TYPE_SIGN && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_SIGN; ts->line = line; @@ -421,6 +477,8 @@ if (ts->type == E1INP_TS_TYPE_RAW && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_RAW; ts->line = line; ts->raw.recv_cb = raw_recv_cb; @@ -436,6 +494,8 @@ if (ts->type == E1INP_TS_TYPE_HDLC && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_HDLC; ts->line = line; ts->hdlc.recv_cb = hdlc_recv_cb; @@ -449,6 +509,8 @@ if (ts->type == E1INP_TS_TYPE_NONE && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_NONE; ts->line = line; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Icf84816460b8ceba43601594bcf504306606f4ed Gerrit-Change-Number: 31323 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in libosmo-abis[master]: trau_pcu_ericsson: add testvectors for MCS1 and MCS2

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31454 ) Change subject: trau_pcu_ericsson: add testvectors for MCS1 and MCS2 ...................................................................... trau_pcu_ericsson: add testvectors for MCS1 and MCS2 Change-Id: I7e7e35930a373c9db74faef24f6c404eb5516278 Related: OS#5198 --- M tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c M tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok 2 files changed, 178 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/54/31454/1 diff --git a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c index 6c28269..9e013b6 100644 --- a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c +++ b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c @@ -1249,6 +1249,112 @@ * the TRAU frame. */ }; + const ubit_t bits_mcs1[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 0, 1, 1, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 1, + 0, 0, 1, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 1, 0, + 1, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 1, 0, 0, 0, 0, 0, 1, 0, + 1, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 1, 1, 0, 0, 0, 1, 1, + 1, 0, 1, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + /* [...] shortened since decode won't access filler bits after + * the TRAU frame. */ + }; + + const ubit_t bits_mcs2[] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 0, 1, 1, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 0, + 1, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 1, + 0, 0, 1, 0, 0, 1, 0, 1, + 1, 1, 0, 1, 1, 0, 1, 1, + 0, 1, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 1, 1, 0, + 0, 0, 1, 0, 1, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 1, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 1, 0, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 1, 0, 0, 1, + 1, 1, 1, 0, 1, 1, 1, 0, + 1, 1, 0, 1, 1, 0, 1, 1, + 1, 0, 0, 1, 1, 1, 1, 0, + 1, 1, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + /* [...] shortened since decode won't access filler bits after + * the TRAU frame. */ + }; + /* TRAU frame with AB data (noise). */ const ubit_t bits_ab[] = { 0, 0, 0, 0, 0, 0, 0, 0, @@ -1336,6 +1442,40 @@ printf(" ccu_data_ind.u.data_len=%u\n", frame.u.ccu_data_ind.data_len); printf(" ccu_data_ind.data=%s\n", osmo_hexdump_nospc(frame.u.ccu_data_ind.data, frame.u.ccu_data_ind.data_len)); + printf("\n==> %s (MCS1)\n", __func__); + rc = er_gprs_trau_frame_decode_64k(&frame, bits_mcs1); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(frame.type == ER_GPRS_TRAU_FT_DATA); + printf(" ccu_data_ind.tav=%02x\n", frame.u.ccu_data_ind.tav); + printf(" ccu_data_ind.dbe=%u\n", frame.u.ccu_data_ind.dbe); + printf(" ccu_data_ind.cs_hdr=%u\n", frame.u.ccu_data_ind.cs_hdr); + printf(" ccu_data_ind.gprs.rx_lev=%u\n", frame.u.ccu_data_ind.rx_lev); + printf(" ccu_data_ind.gprs.est_acc_del_dev=%d\n", frame.u.ccu_data_ind.est_acc_del_dev); + printf(" ccu_data_ind.u.egprs.mean_bep=%u\n", frame.u.ccu_data_ind.u.egprs.mean_bep); + printf(" ccu_data_ind.u.egprs.cv_bep=%u\n", frame.u.ccu_data_ind.u.egprs.cv_bep); + printf(" ccu_data_ind.u.egprs.hdr_good=%u\n", frame.u.ccu_data_ind.u.egprs.hdr_good); + printf(" ccu_data_ind.u.egprs.data_good[0]=%u\n", frame.u.ccu_data_ind.u.egprs.data_good[0]); + printf(" ccu_data_ind.u.egprs.data_good[1]=%u\n", frame.u.ccu_data_ind.u.egprs.data_good[1]); + printf(" ccu_data_ind.u.data_len=%u\n", frame.u.ccu_data_ind.data_len); + printf(" ccu_data_ind.data=%s\n", osmo_hexdump_nospc(frame.u.ccu_data_ind.data, frame.u.ccu_data_ind.data_len)); + + printf("\n==> %s (MCS2)\n", __func__); + rc = er_gprs_trau_frame_decode_64k(&frame, bits_mcs2); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(frame.type == ER_GPRS_TRAU_FT_DATA); + printf(" ccu_data_ind.tav=%02x\n", frame.u.ccu_data_ind.tav); + printf(" ccu_data_ind.dbe=%u\n", frame.u.ccu_data_ind.dbe); + printf(" ccu_data_ind.cs_hdr=%u\n", frame.u.ccu_data_ind.cs_hdr); + printf(" ccu_data_ind.gprs.rx_lev=%u\n", frame.u.ccu_data_ind.rx_lev); + printf(" ccu_data_ind.gprs.est_acc_del_dev=%d\n", frame.u.ccu_data_ind.est_acc_del_dev); + printf(" ccu_data_ind.u.egprs.mean_bep=%u\n", frame.u.ccu_data_ind.u.egprs.mean_bep); + printf(" ccu_data_ind.u.egprs.cv_bep=%u\n", frame.u.ccu_data_ind.u.egprs.cv_bep); + printf(" ccu_data_ind.u.egprs.hdr_good=%u\n", frame.u.ccu_data_ind.u.egprs.hdr_good); + printf(" ccu_data_ind.u.egprs.data_good[0]=%u\n", frame.u.ccu_data_ind.u.egprs.data_good[0]); + printf(" ccu_data_ind.u.egprs.data_good[1]=%u\n", frame.u.ccu_data_ind.u.egprs.data_good[1]); + printf(" ccu_data_ind.u.data_len=%u\n", frame.u.ccu_data_ind.data_len); + printf(" ccu_data_ind.data=%s\n", osmo_hexdump_nospc(frame.u.ccu_data_ind.data, frame.u.ccu_data_ind.data_len)); + printf("\n==> %s (AB)\n", __func__); rc = er_gprs_trau_frame_decode_64k(&frame, bits_ab); OSMO_ASSERT(rc == 0); diff --git a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok index 3d9666c..d15b0b2 100644 --- a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok +++ b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok @@ -2539,6 +2539,34 @@ ccu_data_ind.u.data_len=34 ccu_data_ind.data=00010449d09d5c5e676f6f676c6503636f6d0000010001881c802b2b2b2b2b2b2b00 +==> er_gprs_trau_frame_decode_64k_FT_DATA_test (MCS1) + ccu_data_ind.tav=00 + ccu_data_ind.dbe=0 + ccu_data_ind.cs_hdr=7 + ccu_data_ind.gprs.rx_lev=63 + ccu_data_ind.gprs.est_acc_del_dev=0 + ccu_data_ind.u.egprs.mean_bep=7 + ccu_data_ind.u.egprs.cv_bep=0 + ccu_data_ind.u.egprs.hdr_good=1 + ccu_data_ind.u.egprs.data_good[0]=1 + ccu_data_ind.u.egprs.data_good[1]=0 + ccu_data_ind.u.data_len=27 + ccu_data_ind.data=041000930020020d00000000060d00000000001a000014001ad701 + +==> er_gprs_trau_frame_decode_64k_FT_DATA_test (MCS2) + ccu_data_ind.tav=00 + ccu_data_ind.dbe=0 + ccu_data_ind.cs_hdr=7 + ccu_data_ind.gprs.rx_lev=63 + ccu_data_ind.gprs.est_acc_del_dev=0 + ccu_data_ind.u.egprs.mean_bep=7 + ccu_data_ind.u.egprs.cv_bep=0 + ccu_data_ind.u.egprs.hdr_good=1 + ccu_data_ind.u.egprs.data_good[0]=1 + ccu_data_ind.u.egprs.data_good[1]=0 + ccu_data_ind.u.data_len=33 + ccu_data_ind.data=142080926e8b8051011210101010c44c016a0060de6de73d030000020000000000 + ==> er_gprs_trau_frame_decode_64k_FT_DATA_test (AB) ccu_data_ind.tav=01 ccu_data_ind.dbe=0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7e7e35930a373c9db74faef24f6c404eb5516278 Gerrit-Change-Number: 31454 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 ) Change subject: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 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: If47fa3e0204ce841c79a67dd78a1c53d04e4a586 Gerrit-Change-Number: 31439 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Feb 2023 10:15:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 ) Change subject: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup ...................................................................... bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup Fix that the test was torn down too early, before DLCX messages were received from OsmoBSC. This caused a race condition that sometimes failed the test with: VirtMGW-MGCP-0(1996)@e5a096d6b4ff: Dynamic test case error: Sending data on the connection of port MGCP_CLIENT to 1999:MGCP failed. (Broken pipe) Related: OS#5787 Fixes: 7a8594a8 ("bsc: TC_ho_in_fail_mgw_mdcx_timeout: new test") Change-Id: If47fa3e0204ce841c79a67dd78a1c53d04e4a586 --- M bsc/BSC_Tests.ttcn 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9a2718a..b9182e3 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6347,6 +6347,15 @@ if (g_pars.expect_ho_fail_lchan_est) { BSSAP.receive(tr_BSSMAP_HandoverFailure); setverdict(pass); + + /* When we let MGCP MDCX run into a timeout, it's still in the + * queue and additionally after BSSAP HandoverFailure, two DLCX + * get sent. */ + if (g_pars.ignore_mgw_mdcx) { + MGCP.receive(tr_MDCX); + MGCP.receive(tr_DLCX); + MGCP.receive(tr_DLCX); + } return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 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: If47fa3e0204ce841c79a67dd78a1c53d04e4a586 Gerrit-Change-Number: 31439 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 ) Change subject: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup ...................................................................... Patch Set 2: Verified+1 Code-Review+2 (1 comment) Patchset: PS2: re-apply +2 after fixing a typo in a comment -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 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: If47fa3e0204ce841c79a67dd78a1c53d04e4a586 Gerrit-Change-Number: 31439 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Feb 2023 10:15:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 ) Change subject: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup ...................................................................... Patch Set 1: (2 comments) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439/comment/2c632d48_7b00… PS1, Line 6352: DLXC > s/DLXC/DLCX/ Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439/comment/7c776fba_e38f… PS1, Line 6355: MGCP.receive(tr_MDCX); > Just to confirm: are you sure these MGCP messages always being sent in this particular order? If not […] Yes I'm sure: first the MDCX that we ignored to let it go into the timeout. Then once it reached the timeout, two DLCX. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 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: If47fa3e0204ce841c79a67dd78a1c53d04e4a586 Gerrit-Change-Number: 31439 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Feb 2023 10:14:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 to look at the new patch set (#2). Change subject: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup ...................................................................... bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup Fix that the test was torn down too early, before DLCX messages were received from OsmoBSC. This caused a race condition that sometimes failed the test with: VirtMGW-MGCP-0(1996)@e5a096d6b4ff: Dynamic test case error: Sending data on the connection of port MGCP_CLIENT to 1999:MGCP failed. (Broken pipe) Related: OS#5787 Fixes: 7a8594a8 ("bsc: TC_ho_in_fail_mgw_mdcx_timeout: new test") Change-Id: If47fa3e0204ce841c79a67dd78a1c53d04e4a586 --- M bsc/BSC_Tests.ttcn 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/31439/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 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: If47fa3e0204ce841c79a67dd78a1c53d04e4a586 Gerrit-Change-Number: 31439 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: New unit test for XOR-2G authentication

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31452 ) Change subject: New unit test for XOR-2G authentication ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7014258751624ff18c51912b6348c3cd876bb23f Gerrit-Change-Number: 31452 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 22 Feb 2023 09:18:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023