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

[M] Change in osmo-bts[master]: trx TCH DL: transmit invalid speech blocks instead of dummy FACCH

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech blocks instead of dummy FACCH ...................................................................... trx TCH DL: transmit invalid speech blocks instead of dummy FACCH In speech TCH operation, there will always be times when a speech frame needs to be transmitted on the downlink, but there is no frame available to transmit (gap in the incoming RTP stream), or the logic of DTXd says that no frame shall be transmitted at this FN, but we are not doing physical DTXd. Previous osmo-bts-trx code sent dummy FACCH during such conditions, but this approach is bad for TCH/HS where we would like to transmit good speech frames or speech frame gaps one 20 ms frame at a time, rather than take out pairs of frames for dummy FACCH/H. Other BTS models (sysmoBTS PHY) send out invalid speech blocks with inverted CRC3 under the conditions in question - do the same in osmo-bts-trx. The present change modifies osmo-bts-trx TCH DL frame gap behavior only for TCH/FS, TCH/HS and TCH/EFS; for all other channel modes, including AMR speech, the previous behavior of sending dummy FACCH is left unchanged. Depends: Iade3310e16b906efb6892d28f474a0d15204e861 (libosmocore) Change-Id: I78106802a0aa4af39859c75d29fe0e77037899fe --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 62 insertions(+), 2 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/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index f065803..0188d85 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -472,10 +472,29 @@ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, }; + int rc; LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "No TCH or FACCH prim for transmit.\n"); - gsm0503_tch_fr_encode(bursts_p, dummy, sizeof(dummy), 1); - chan_state->dl_facch_bursts = 8; + /* If the channel mode is TCH/FS or TCH/EFS, transmit a dummy + * speech block with inverted CRC3, designed to induce a BFI + * condition in the MS receiver. In all other channel modes, + * transmit dummy FACCH like we always did before. + * + * FIXME: someone who knows AMR needs to look at this problem + * and decide what is the correct BTS Tx behavior for frame + * gaps in TCH/AFS. See OS#6049. + */ + switch (tch_mode) { + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + rc = gsm0503_tch_fr_encode(bursts_p, NULL, 0, 1); + if (rc == 0) + break; + /* fall-through */ + default: + gsm0503_tch_fr_encode(bursts_p, dummy, sizeof(dummy), 1); + chan_state->dl_facch_bursts = 8; + } goto send_burst; } diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 5772e9f..2f1194a 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -385,8 +385,23 @@ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, }; + int rc; LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); + /* If the channel mode is TCH/HS, transmit a dummy speech block + * with inverted CRC3, designed to induce a BFI condition in + * the MS receiver. In all other channel modes, transmit + * dummy FACCH like we always did before. + * + * FIXME: someone who knows AMR needs to look at this problem + * and decide what is the correct BTS Tx behavior for frame + * gaps in TCH/AHS. See OS#6049. + */ + if (tch_mode == GSM48_CMODE_SPEECH_V1) { + rc = gsm0503_tch_hr_encode(bursts_p, NULL, 0); + if (rc == 0) + goto send_burst; + } /* FACCH/H can only be scheduled at specific TDMA offset */ if (!sched_tchh_dl_facch_map[br->fn % 26]) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78106802a0aa4af39859c75d29fe0e77037899fe Gerrit-Change-Number: 33069 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: Add FPLMN read and program

by matanp

Attention is currently required from: laforge, pespin, lynxis lazus, dexter. matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32712 ) Change subject: Add FPLMN read and program ...................................................................... Patch Set 6: (1 comment) File pysim-testdata/sysmoUSIM-SJS1.ok: https://gerrit.osmocom.org/c/pysim/+/32712/comment/30503d4a_88990d23 PS5, Line 108: 62f201 # MCC: 262 MNC: 010 > I also think that changing the type of derive_mcc and derive_mnc to str is the best solution. […] Ack -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9ce8c1af691c28ea9ed69e7b5f03f0c02d1f029b Gerrit-Change-Number: 32712 Gerrit-PatchSet: 6 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 01 Jun 2023 14:46:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Comment-In-Reply-To: matanp <matan1008(a)gmail.com> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: utils: Remove format_xplmn leading zeros in MNC

by matanp

Attention is currently required from: matanp. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/33151 to look at the new patch set (#2). Change subject: utils: Remove format_xplmn leading zeros in MNC ...................................................................... utils: Remove format_xplmn leading zeros in MNC Change-Id: I803edafbd892c2b32b884d0b39fed61967a3d68b --- M pySim/utils.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 18 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/33151/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I803edafbd892c2b32b884d0b39fed61967a3d68b Gerrit-Change-Number: 33151 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: utils: Remove format_xplmn leading zeros in MNC

by matanp

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33151 ) Change subject: utils: Remove format_xplmn leading zeros in MNC ...................................................................... utils: Remove format_xplmn leading zeros in MNC Change-Id: I803edafbd892c2b32b884d0b39fed61967a3d68b --- M pySim/utils.py 1 file changed, 13 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/33151/1 diff --git a/pySim/utils.py b/pySim/utils.py index 6b8ee37..7661e45 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -594,8 +594,8 @@ plmn_chars = 6 # first three bytes (six ascii hex chars) plmn_str = threehexbytes[:plmn_chars] - res['mcc'] = dec_mcc_from_plmn(plmn_str) - res['mnc'] = dec_mnc_from_plmn(plmn_str) + res['mcc'] = dec_mcc_from_plmn_str(plmn_str) + res['mnc'] = dec_mnc_from_plmn_str(plmn_str) return res @@ -603,11 +603,10 @@ s = "" for rec_data in hexstr_to_Nbytearr(hexstr, 3): rec_info = dec_xplmn(rec_data) - if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF: + if not rec_info['mcc'] and not rec_info['mnc']: rec_str = "unused" else: - rec_str = "MCC: %03d MNC: %03d" % ( - rec_info['mcc'], rec_info['mnc']) + rec_str = "MCC: %s MNC: %s" % (rec_info['mcc'], rec_info['mnc']) s += "\t%s # %s\n" % (rec_data, rec_str) return s -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I803edafbd892c2b32b884d0b39fed61967a3d68b Gerrit-Change-Number: 33151 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[L] Change in osmocom-bb[master]: trxcon: get rid of the timer driven clock module

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32575 ) Change subject: trxcon: get rid of the timer driven clock module ...................................................................... Patch Set 2: (1 comment) File src/host/trxcon/src/trxcon_main.c: https://gerrit.osmocom.org/c/osmocom-bb/+/32575/comment/3059f615_50a8f209 PS2, Line 244: XXX: no-op TODO: print a no-op warning -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic8a5b6277c6b16392026e0557376257d71c9d230 Gerrit-Change-Number: 32575 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 01 Jun 2023 14:22:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[L] Change in osmocom-bb[master]: trxcon: get rid of the timer driven clock module

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32575 ) Change subject: trxcon: get rid of the timer driven clock module ...................................................................... Patch Set 2: (1 comment) This change is ready for review. Patchset: PS1: > needs more explanation/rationale in the commit log Done. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic8a5b6277c6b16392026e0557376257d71c9d230 Gerrit-Change-Number: 32575 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 01 Jun 2023 14:22:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: WIP: ASCI related BTS tests

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33142 ) Change subject: WIP: ASCI related BTS tests ...................................................................... Patch Set 1: (1 comment) File bts/BTS_Tests_ASCI.ttcn: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7737): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33142/comment/fe8e7e41_8191… PS1, Line 5: * (C) 2021 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> 's.m.f.c.' may be misspelled - perhaps 's.f.m.c.'? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33142 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: I3a93fa486a48957367d2c727cc0a8eea33d3bf11 Gerrit-Change-Number: 33142 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-CC: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 01 Jun 2023 14:21:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Add more parameters for ASCI tests to TestHdlrParams

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33147 ) Change subject: Add more parameters for ASCI tests to TestHdlrParams ...................................................................... Add more parameters for ASCI tests to TestHdlrParams Change-Id: I5aaea5a92fcfa737624ef46b56dcfefb74266758 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/33147/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 944e153..ad41e30 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -785,7 +785,12 @@ boolean inter_bsc_ho_in__ho_req_in_initial_sccp_cr, boolean ignore_mgw_mdcx, boolean fail_on_dlcx, - boolean ignore_ipa_media + boolean ignore_ipa_media, + boolean vgcs_setup_only, + boolean vgcs_talker_req, + boolean vgcs_talker_est, + boolean vgcs_talker_rel, + boolean vgcs_assign_fail }; /* Note: Do not use valueof() to get a value of this template, use -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33147 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: I5aaea5a92fcfa737624ef46b56dcfefb74266758 Gerrit-Change-Number: 33147 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add templates for UPLINK REQUEST

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33148 ) Change subject: BSSMAP_Templates: Add templates for UPLINK REQUEST ...................................................................... BSSMAP_Templates: Add templates for UPLINK REQUEST Change-Id: I0b02be6a87899d5c9a2ef92011e09a8897328a05 --- M library/BSSMAP_Templates.ttcn 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/33148/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 0670ce2..e6165ab 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -2426,6 +2426,34 @@ } /* Section 3.2.1.57 */ +template (value) PDU_BSSAP ts_BSSMAP_UplinkReq +modifies ts_BSSAP_BSSMAP := { + pdu := { + bssmap := { + uplinkRequest := { + messageType := '1F'O, + talkerPriority := omit, + cellIdentifier := omit, + layer3Information := omit, + mobileIdentity := omit + } + } + } +} +template (present) PDU_BSSAP tr_BSSMAP_UplinkReq +modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + uplinkRequest := { + messageType := '1F'O, + talkerPriority := omit, + cellIdentifier := omit, + layer3Information := omit, + mobileIdentity := omit + } + } + } +} template (value) PDU_BSSAP ts_BSSMAP_UplinkReq_L3(template (value) BIT2 priority, template (omit) BSSMAP_IE_CellIdentifier cell_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33148 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: I0b02be6a87899d5c9a2ef92011e09a8897328a05 Gerrit-Change-Number: 33148 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Fixes for I949f731de794b22292b01d0ddf9a75a9e7e7e71d

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33149 ) Change subject: Fixes for I949f731de794b22292b01d0ddf9a75a9e7e7e71d ...................................................................... Fixes for I949f731de794b22292b01d0ddf9a75a9e7e7e71d Change-Id: I147454b10c8f3127172ae84dd31003a7d299f24c --- M library/BSSMAP_Templates.ttcn 1 file changed, 16 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/33149/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index e6165ab..03e2d19 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -2525,9 +2525,9 @@ /* 3.2.1.58 */ template (value) PDU_BSSAP -ts_BSSMAP_UplinkReqAck(template (omit) BIT2 priority, - template (omit) BSSMAP_IE_EmergencySetIndication ems := omit, - template (omit) BSSMAP_IE_TalkerIdentity talker_id := omit) +ts_BSSMAP_UplinkReqAck(template (omit) BIT2 priority := omit, + template (omit) BSSMAP_IE_EmergencySetIndication ems := omit, + template (omit) BSSMAP_IE_TalkerIdentity talker_id := omit) modifies ts_BSSAP_BSSMAP := { pdu := { bssmap := { @@ -2541,9 +2541,9 @@ } } template (present) PDU_BSSAP -tr_BSSMAP_UplinkReqAck(template BIT2 priority, - template BSSMAP_IE_EmergencySetIndication ems := *, - template BSSMAP_IE_TalkerIdentity talker_id := *) +tr_BSSMAP_UplinkReqAck(template BIT2 priority := *, + template BSSMAP_IE_EmergencySetIndication ems := *, + template BSSMAP_IE_TalkerIdentity talker_id := *) modifies tr_BSSAP_BSSMAP := { pdu := { bssmap := { @@ -2607,7 +2607,7 @@ } } template (present) PDU_BSSAP -tr_BSSMAP_UplinkRelInd(template (present) myBSSMAP_Cause cause, template BIT2 prio) +tr_BSSMAP_UplinkRelInd(template (present) myBSSMAP_Cause cause, template BIT2 prio := *) modifies tr_BSSAP_BSSMAP := { pdu := { bssmap := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33149 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: I147454b10c8f3127172ae84dd31003a7d299f24c Gerrit-Change-Number: 33149 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2023