- gerrit-log - lists.osmocom.org

Change in simtrace2[master]: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP
by laforge 06 Apr '22

06 Apr '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/27651 ) Change subject: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP ...................................................................... simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP Previously, only simtrace2-sniff generated GSMTAP protocol traces. Let's add the same functionality to simtrace2-cardem-pcsc. Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Closes: OS#5513 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/51/27651/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8e143ba..20fbc69 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -164,6 +164,9 @@ msgb_free(tmsg); return rc; } + /* send via GSMTAP for wireshark tracing */ + osmo_st2_gsmtap_send_apdu(GSMTAP_SIM_APDU, tmsg->data, msgb_length(tmsg)); + msgb_apdu_sw(tmsg) = msgb_get_u16(tmsg); ac.sw[0] = msgb_apdu_sw(tmsg) >> 8; ac.sw[1] = msgb_apdu_sw(tmsg) & 0xff; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Gerrit-Change-Number: 27651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition
by osmith 06 Apr '22

06 Apr '22

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27646 ) Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Apr 2022 16:15:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: rsl: Fix tlv_parse of IPAC_DLCX_IND message
by pespin 06 Apr '22

06 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27644 ) Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message ...................................................................... rsl: Fix tlv_parse of IPAC_DLCX_IND message The IE was missing in rsl_att_tlvdef. Related: SYS#5915 Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 --- M src/gsm/rsl.c M tests/abis/abis_test.c M tests/abis/abis_test.ok 3 files changed, 49 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index f535b7f..dd5a116 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -133,6 +133,7 @@ [RSL_IE_IPAC_LOCAL_PORT] = { TLV_TYPE_FIXED, 2 }, [RSL_IE_IPAC_SPEECH_MODE] = { TLV_TYPE_TV }, [RSL_IE_IPAC_LOCAL_IP] = { TLV_TYPE_FIXED, 4 }, + [RSL_IE_IPAC_CONN_STAT] = { TLV_TYPE_TLV, 28 }, [RSL_IE_IPAC_CONN_ID] = { TLV_TYPE_FIXED, 2 }, [RSL_IE_IPAC_RTP_CSD_FMT] = { TLV_TYPE_TV }, [RSL_IE_IPAC_RTP_JIT_BUF] = { TLV_TYPE_FIXED, 2 }, diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 2151e92..8ba5f17 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -193,6 +193,52 @@ msgb_free(msg); } +/* Test decode IPAC_DLCX_IND obtained from SYS#5915 */ +static void test_dec_ipac_dlc_indx() +{ +/* Radio Signalling Link (RSL) + 0111 111. = Message discriminator: ip.access Vendor Specific messages (63) + .... ...0 = T bit: Not considered transparent by BTS + .111 0110 = Message type: ip.access DLCX INDication (0x76) + Channel number IE + Element identifier: Channel Number (0x01) + 0000 1... = C-bits: Bm + ACCH (1) + .... .110 = Time slot number (TN): 6 + Element identifier: Connection Identifier (0xf8) + ip.access Connection ID: 0 + Element identifier: Connection Statistics (0xf6) + [1 byte length here, val = 28 (0x1c)] + Packets Sent: 1202 + Octets Sent: 45052 + Packets Received: 556 + Octets Received: 24580 + Packets Lost: 0 + Inter-arrival Jitter: 0 + Average Tx Delay: 0 + Cause IE + Element identifier: Cause (0x1a) + Length: 1 + 0... .... = Extension: No Extension + .000 .... = Class: Normal event (0) + .000 1111 = Cause Value: normal event, unspecified (15) +*/ + const uint8_t hex[] = { + 0x7e, 0x76, 0x01, 0x0e, 0xf8, 0x00, 0x00, 0xf6, 0x1c, 0x00, 0x00, 0x04, 0xb2, 0x00, 0x00, 0xaf, + 0xfc, 0x00, 0x00, 0x02, 0x2c, 0x00, 0x00, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x01, 0x0f + }; + struct abis_rsl_dchan_hdr *dh = (struct abis_rsl_dchan_hdr *)&hex[0]; + + struct tlv_parsed tp; + int rc; + + printf("Testing decoding IPAC_DLCX_IND\n"); + + rc = rsl_tlv_parse(&tp, dh->data, sizeof(hex) - sizeof(*dh)); + + OSMO_ASSERT(rc == 3); +} + int main(int argc, char **argv) { void *ctx = talloc_named_const(NULL, 0, "abis_test"); @@ -202,6 +248,7 @@ test_simple_sw_config(); test_simple_sw_short(); test_dual_sw_config(); + test_dec_ipac_dlc_indx(); printf("OK.\n"); diff --git a/tests/abis/abis_test.ok b/tests/abis/abis_test.ok index e6b626b..2ee647b 100644 --- a/tests/abis/abis_test.ok +++ b/tests/abis/abis_test.ok @@ -38,4 +38,5 @@ file_id: 09 07 05 file_ver: 06 07 08 test_dual_sw_config(): OK +Testing decoding IPAC_DLCX_IND OK. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmocore[master]: rsl: Fix tlv_parse of IPAC_DLCX_IND message
by pespin 06 Apr '22

06 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27644 ) Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Apr 2022 16:04:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition
by pespin 06 Apr '22

06 Apr '22

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27646 to look at the new patch set (#4). Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition ...................................................................... jenkins: Validate gsm 08.58 IEs are added to tlv_definition It was recently found that several IEs which were added in the header file were not actually added to the tlv_definition, and hence the tlv parser failed to decode them. Let's make sure we don't foget to add new IEs in the future. Related: SYS#5915 Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 --- M contrib/jenkins_common.sh M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 3 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/27646/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in libosmocore[master]: rsl: Fix tlv_parse of IPAC_DLCX_IND message
by pespin 06 Apr '22

06 Apr '22

Attention is currently required from: pespin, fixeria. Hello osmith, Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27644 to look at the new patch set (#2). Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message ...................................................................... rsl: Fix tlv_parse of IPAC_DLCX_IND message The IE was missing in rsl_att_tlvdef. Related: SYS#5915 Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 --- M src/gsm/rsl.c M tests/abis/abis_test.c M tests/abis/abis_test.ok 3 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/27644/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: add altstep as_dl_sacch_lapdm_ab
by fixeria 05 Apr '22

05 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27519 ) Change subject: BTS_Tests: add altstep as_dl_sacch_lapdm_ab ...................................................................... BTS_Tests: add altstep as_dl_sacch_lapdm_ab Change-Id: I3ba17683892e8aa1694bb6dd32d8b37660020026 --- M bts/BTS_Tests.ttcn 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1d3dfe7..3a3d7cc 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -917,6 +917,27 @@ } } +/* This altstep triggers on receipt of a Downlink SACCH containing a L2 payload + * that matches the given LAPDm frame, as well as the given SACCH L1 header. */ +private altstep as_dl_sacch_lapdm_ab(out SacchL1Header l1h, out LapdmFrameAB frame, + template (present) LapdmFrameAB tr_frame := ?, + template (present) SacchL1Header tr_l1h := ?, + template (present) GsmSapi sapi := ?) +runs on ConnHdlr { + var L1ctlDlMessage dl_msg; + template (present) RslLinkId link_id := tr_RslLinkID_SACCH(sapi); + template (present) L1ctlDataReq tr_data := { + l1header := tr_l1h, + l2_payload := decmatch tr_frame + }; + + [] as_l1ctl_dl_msg(dl_msg, decmatch tr_data, g_chan_nr, link_id) { + var octetstring data := dl_msg.payload.data_ind.payload; + l1h := dec_SacchL1Header(substr(data, 0, 2)); + frame := dec_LapdmFrameAB(substr(data, 2, lengthof(data) - 2)); + } +} + /* This altstep is built on top of as_dl_dcch_lapdm_ab(), and triggers on receipt * of a LAPDm AB frame with a L3 payload matching the given template. The L3 * payload is treated as PDU_ML3_NW_MS. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27519 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: I3ba17683892e8aa1694bb6dd32d8b37660020026 Gerrit-Change-Number: 27519 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-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: add altstep as_dl_sacch_lapdm_ab
by fixeria 05 Apr '22

05 Apr '22

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27519 ) Change subject: BTS_Tests: add altstep as_dl_sacch_lapdm_ab ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: I am adding it for the sake of completeness. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27519 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: I3ba17683892e8aa1694bb6dd32d8b37660020026 Gerrit-Change-Number: 27519 Gerrit-PatchSet: 1 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-Comment-Date: Tue, 05 Apr 2022 13:52:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: rx_{tchh,tchf}_fn(): use AMR CMI lookup tables
by fixeria 05 Apr '22

05 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27557 ) Change subject: osmo-bts-trx: rx_{tchh,tchf}_fn(): use AMR CMI lookup tables ...................................................................... osmo-bts-trx: rx_{tchh,tchf}_fn(): use AMR CMI lookup tables 3GPP TS 45.009 defines that Codec Mode Indications shall be sent with speech frames having specific TDMA frame numbers of their *first* bursts, which are defined in tables 3.2.1.3-{1,2,3,4}. Performance-wise it's batter to have these tables implemented as arrays, rather then using the 'switch' statement. We can simplify things even further and have TDMA frame numbers corresponding to the *last* bursts in them. This eliminates the need of doing an additional last-to-first mapping, so that bi->fn can be used. Change-Id: I46def864729c8f9063af201750456771ea5558d5 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/sched_utils.h 3 files changed, 20 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index c8ad383..6a9a0f0 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -131,8 +131,7 @@ * the first FN 4,13,21 defines that CMR is included in frame. * NOTE: A frame ends 7 FN after start. */ - fn_begin = trx_sched_lookup_fn(chan_state, 8); - amr_is_cmr = !ul_amr_fn_is_cmi(fn_begin); + amr_is_cmr = !sched_tchf_ul_amr_cmi_map[bi->fn % 26]; /* The AFS_ONSET frame itself does not result into an RTP frame * since it only contains a recognition pattern that marks the diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 1778d36..369e35b 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -165,16 +165,7 @@ break; } - /* Calculate the frame number where the block begins. Note that - * we need to traverse the measurement histort back by 6 bursts, - * not by 4 bursts. The reason for this is that the burst shift - * buffer we use for decoding is 6 bursts wide (one SACCH block) but - * TCH/H blocks are only 4 bursts wide. The decoder functions look - * at the beginning of the buffer while we shift into it at the end, - * this means that TCH/H blocks always decoded delayed by two frame - * number positions late. */ - fn_begin = trx_sched_lookup_fn(chan_state, 6); - fn_is_cmi = ul_amr_fn_is_cmi(fn_begin); + fn_is_cmi = sched_tchh_ul_amr_cmi_map[bi->fn % 26]; /* See comment in function rx_tchf_fn() */ amr = 2; diff --git a/src/osmo-bts-trx/sched_utils.h b/src/osmo-bts-trx/sched_utils.h index f76e49b..398083d 100644 --- a/src/osmo-bts-trx/sched_utils.h +++ b/src/osmo-bts-trx/sched_utils.h @@ -37,6 +37,24 @@ return 10000 * n_errors / n_bits_total; } +/* 3GPP TS 45.009, table 3.2.1.3-{1,3}: AMR on Uplink TCH/F */ +static const uint8_t sched_tchf_ul_amr_cmi_map[26] = { + [7] = 1, /* TCH/F: first=0 / last=7 */ + [16] = 1, /* TCH/F: first=8 / last=16 */ + [24] = 1, /* TCH/F: first=17 / last=24 */ +}; + +/* 3GPP TS 45.009, table 3.2.1.3-{2,4}: AMR on Uplink TCH/H */ +static const uint8_t sched_tchh_ul_amr_cmi_map[26] = { + [6] = 1, /* TCH/H(0): first=0 / last=6 */ + [15] = 1, /* TCH/H(0): first=8 / last=15 */ + [23] = 1, /* TCH/H(0): first=17 / last=23 */ + + [7] = 1, /* TCH/H(1): first=1 / last=7 */ + [16] = 1, /* TCH/H(1): first=9 / last=16 */ + [24] = 1, /* TCH/H(1): first=18 / last=24 */ +}; + /*! determine whether an uplink AMR block is CMI according to 3GPP TS 45.009. * \param[in] fn_begin frame number of the beginning of the block. * \returns true in case of CMI; false otherwise. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I46def864729c8f9063af201750456771ea5558d5 Gerrit-Change-Number: 27557 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: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bts[master]: osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
by fixeria 05 Apr '22

05 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27555 ) Change subject: osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts ...................................................................... osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts The idea of this change is to avoid attempting to decode the burst buffer unless it's filled up completely. This eliminates expected decoding errors in the beginning of lchan's lifetime. Moreover this allows us to be sure that the measurement history is complete, so that we can abuse it to store TDMA frame numbers later. Note that even in the absence of NOPE indications (TRXDv0 case) we can still be sure that the burst mask has no gaps due to lost bursts, because they are compensated by trx_sched_calc_frame_loss(). Change-Id: I56bebe1374eb803e3c1e9f08dda4da50a074ab0b --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 14 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index a689a1f..9a168af 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -85,7 +85,7 @@ if (bi->bid == 0) { memcpy(*bursts_p, *bursts_p + 464, 464); memset(*bursts_p + 464, 0, 464); - *mask = 0x0; + *mask = *mask << 4; } /* update mask */ @@ -106,13 +106,13 @@ if (bi->bid != 3) return 0; - /* check for complete set of bursts */ - if ((*mask & 0xf) != 0xf) { - LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, - "Received incomplete frame (%u/%u)\n", - bi->fn % l1ts->mf_period, l1ts->mf_period); + /* fill up the burst buffer so that we have 8 bursts in there */ + if (OSMO_UNLIKELY((*mask & 0xff) != 0xff)) { + LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi, + "UL burst buffer is not filled up: mask=0x%02x != 0xff\n", + *mask); + return 0; /* TODO: send BFI */ } - *mask = 0x0; /* decode * also shift buffer by 4 bursts for interleaving */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 6b49974..627291e 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -92,7 +92,7 @@ memcpy(*bursts_p, *bursts_p + 232, 232); memcpy(*bursts_p + 232, *bursts_p + 464, 232); memset(*bursts_p + 464, 0, 232); - *mask = 0x0; + *mask = *mask << 2; } /* update mask */ @@ -113,13 +113,13 @@ if (bi->bid != 1) return 0; - /* check for complete set of bursts */ - if ((*mask & 0x3) != 0x3) { - LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, - "Received incomplete frame (%u/%u)\n", - bi->fn % l1ts->mf_period, l1ts->mf_period); + /* fill up the burst buffer so that we have 6 bursts in there */ + if (OSMO_UNLIKELY((*mask & 0x3f) != 0x3f)) { + LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi, + "UL burst buffer is not filled up: mask=0x%02x != 0x3f\n", + *mask); + return 0; /* TODO: send BFI */ } - *mask = 0x0; /* skip decoding of the last 4 bursts of FACCH/H */ if (chan_state->ul_ongoing_facch) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I56bebe1374eb803e3c1e9f08dda4da50a074ab0b Gerrit-Change-Number: 27555 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log