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

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

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... Patch Set 2: (1 comment) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/33069/comment/320f8fa7_2f92e7c3 PS1, Line 500: what is the correct BTS Tx behavior for frame : * gaps in TCH/AFS > Please read the comment I just added under that ticket. […] I just suggested a possible solution seeing a FIXME comment in your patch. It's not a high priority for me either, and unfortunately I don't have access to my nanoBTS units anymore to confirm that it behaves as I described. This can be easily checked by establishing a silent call from osmo-msc and looking at the Um interface captures. -- 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: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 May 2023 19:15:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by falconia

falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Why is Gerrit showing "Merge Conflict" on my latest patchset 2? The commit I pushed to refs/for/mast […] It looks like it just resolved itself - the "Merge Conflict" heading disappeared, replaced with the expected "Active". -- 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: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 May 2023 19:09:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: SJA5: Add TUAK + XOR-2G algorithm definitions for EF_[U]SIM_AUTH_KEY

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33077 ) Change subject: SJA5: Add TUAK + XOR-2G algorithm definitions for EF_[U]SIM_AUTH_KEY ...................................................................... SJA5: Add TUAK + XOR-2G algorithm definitions for EF_[U]SIM_AUTH_KEY Change-Id: I62a7255d991fa1ed09a7c9bcf8be4b68acfa61a7 --- M pySim/sysmocom_sja2.py 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/33077/1 diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 20504a7..d1f643e 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -186,7 +186,7 @@ CfgByte = BitStruct(Padding(1), 'only_4bytes_res_in_3g'/Bit, 'use_sres_deriv_func_2_in_3g'/Bit, 'use_opc_instead_of_op'/Bit, - 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, xor=15)) + 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, tuak=6, xor=15)) self._construct = Struct('cfg'/CfgByte, 'key'/HexAdapter(Bytes(16)), 'op_opc' /HexAdapter(Bytes(16))) @@ -198,7 +198,7 @@ CfgByte = BitStruct(Padding(1), 'only_4bytes_res_in_3g'/Bit, 'use_sres_deriv_func_2_in_3g'/Bit, 'use_opc_instead_of_op'/Bit, - 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) + 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3, xor=14)) self._construct = Struct('cfg'/CfgByte, 'key'/HexAdapter(Bytes(16)), 'op_opc' /HexAdapter(Bytes(16))) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I62a7255d991fa1ed09a7c9bcf8be4b68acfa61a7 Gerrit-Change-Number: 33077 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: SJA5: Proper encode/decode of TUAK data in EF.USIM_AUTH_KEY

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33078 ) Change subject: SJA5: Proper encode/decode of TUAK data in EF.USIM_AUTH_KEY ...................................................................... SJA5: Proper encode/decode of TUAK data in EF.USIM_AUTH_KEY Unfortunately, TUAK requires a number of additional (and differently-sized) parameters, so the format of EF.USIM_AUTH_KEY differs significantly depending on TUAK or non-TUAK case. Change-Id: I0dcfe05777510fb34973dc2259b137133d8e199d --- M pySim/sysmocom_sja2.py 1 file changed, 46 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/78/33078/1 diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index d1f643e..8b1fc04 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -183,13 +183,43 @@ class EF_USIM_AUTH_KEY(TransparentEF): def __init__(self, fid='af20', name='EF.USIM_AUTH_KEY'): super().__init__(fid, name=name, desc='USIM authentication key') + Algorithm = Enum(Nibble, milenage=4, sha1_aka=5, tuak=6, xor=15) CfgByte = BitStruct(Padding(1), 'only_4bytes_res_in_3g'/Bit, - 'use_sres_deriv_func_2_in_3g'/Bit, - 'use_opc_instead_of_op'/Bit, - 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, tuak=6, xor=15)) + 'sres_deriv_func_2_in_3g'/Mapping(Bit, {1:0, 2:1}), + 'use_opc_instead_of_op'/Mapping(Bit, {False:0, True:1}), + 'algorithm'/Algorithm) self._construct = Struct('cfg'/CfgByte, 'key'/HexAdapter(Bytes(16)), 'op_opc' /HexAdapter(Bytes(16))) + # TUAK has a rather different layout for the data, so we define a different + # construct below and use explicit _{decode,encode}_bin() methods for separating + # the TUAK and non-TUAK situation + CfgByteTuak = BitStruct(Padding(1), + 'key_length'/Mapping(Bit, {128:0, 256:1}), + 'sres_deriv_func_in_3g'/Mapping(Bit, {1:0, 2:1}), + 'use_opc_instead_of_op'/Mapping(Bit, {False:0, True:1}), + 'algorithm'/Algorithm) + TuakCfgByte = BitStruct(Padding(1), + 'ck_and_ik_size'/Mapping(Bit, {128:0, 256:1}), + 'mac_size'/Mapping(BitsInteger(3), {64:0, 128:1, 256:2}), + 'res_size'/Mapping(BitsInteger(3), {32:0, 64:1, 128:2, 256:3})) + self._constr_tuak = Struct('cfg'/CfgByteTuak, + 'tuak_cfg'/TuakCfgByte, + 'num_of_keccak_iterations'/Int8ub, + 'op_opc'/HexAdapter(Bytes(32)), + 'k'/HexAdapter(Bytes(32))) + + def _decode_bin(self, raw_bin_data: bytearray) -> dict: + if raw_bin_data[0] & 0x0F == 0x06: + return parse_construct(self._constr_tuak, raw_bin_data) + else: + return parse_construct(self._construct, raw_bin_data) + + def _encode_bin(self, abstract_data: dict) -> bytearray: + if abstract_data['cfg']['algorithm'] == 'tuak': + return self._constr_tuak.build(abstract_data) + else: + return self._construct.build(abstract_data) class EF_USIM_AUTH_KEY_2G(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0dcfe05777510fb34973dc2259b137133d8e199d Gerrit-Change-Number: 33078 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

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

by falconia

falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Why is Gerrit showing "Merge Conflict" on my latest patchset 2? The commit I pushed to refs/for/master for PS2 applies directly on top of current master branch tip, how can it be a merge conflict? Would it be possible to get a Gerrit admin to look at this issue? -- 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: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 May 2023 19:08:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by fixeria

Attention is currently required from: falconia. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/33069/comment/a0385618_8ed5f398 PS1, Line 505: gsm0503_tch_fr_encode > I will look into implementing your suggestion in the next revision of my patch. Done -- 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: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 29 May 2023 19:03:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by falconia

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/33069 to look at the new patch set (#2). Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... trx TCH DL: transmit invalid speech frames 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 frames 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/69/33069/2 -- 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: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

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

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... Patch Set 1: (2 comments) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/33069/comment/fa2297b7_925e210c PS1, Line 500: what is the correct BTS Tx behavior for frame : * gaps in TCH/AFS > I guess we could indicate a bad frame via AMR's in-band signalling? Just an idea. […] Please read the comment I just added under that ticket. Basically the short version is that I consider myself qualified only to work on FR/HR/EFR, i.e., make code improvements for these 3 codecs and review other developers' changes where they affect these non-AMR codecs. When it comes to AMR, I do not feel so qualified, hence I have to defer to other developers for whom AMR is a higher priority than it is for me. If you (fixeria) or any other developer has a solution in mind for AMR (doing something better than transmitting dummy FACCH, especially on TCH/H), perhaps you can implement it as a follow-on patch after my fix for FR/HR/EFR? https://gerrit.osmocom.org/c/osmo-bts/+/33069/comment/600dc842_02da4934 PS1, Line 505: gsm0503_tch_fr_encode > I suggest using a switch here: […] I will look into implementing your suggestion in the next revision of my patch. -- 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: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 May 2023 18:39:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: osmo-bts-trx: visualize rx_tch[fh]_fn() functions

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33076 ) Change subject: osmo-bts-trx: visualize rx_tch[fh]_fn() functions ...................................................................... osmo-bts-trx: visualize rx_tch[fh]_fn() functions Change-Id: I373dbbc3d427858f76d07ff85633e07fe2600770 Related: OS#1572 --- A doc/trx_sched_tch.txt M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 3 files changed, 112 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/33076/1 diff --git a/doc/trx_sched_tch.txt b/doc/trx_sched_tch.txt new file mode 100644 index 0000000..f8c79ff --- /dev/null +++ b/doc/trx_sched_tch.txt @@ -0,0 +1,98 @@ +== rx_tchf_fn(): TCH/FS, TCH/EFS, TCH/AFS, TCH/F2.4, and FACCH/F + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | | | | | a | b | c | d | Rx bid={0,1,2,3}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | Rx bid={0,1,2,3}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 4 + | + |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchf_fn(): TCH/F14.4, TCH/F9.6, TCH/F4.8 + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | | | | | a | b | c | d | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | w | x | Rx bid={0,1,2,3}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 4 +| +|<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A +| |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B +@ decoding from here + + +== rx_tchh_fn(): TCH/HS, TCH/AHS + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 + | + |<~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchh_fn(): FACCH/H + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1} ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode ++---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---|---+---+---+---+---+---+---+---+ << 2 + | + |<~~~~~~~~~~~~~~~~~~~~~>| frame A + | |<~~~~~~~~~~~~~~~~~~~~~>| frame B + @ decoding from here + + +== rx_tchh_fn(): TCH/H4.8, TCH/H2.4 + + 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | | | a | b | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | | | a | b | c | d | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | | | a | b | c | d | e | f | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | | | a | b | c | d | e | f | g | h | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| | | a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | | | Rx bid={0,1} +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| a | b | c | d | e | f | g | h | i | j | k | l | m | n | o | p | q | r | s | t | u | v | | | Rx bid={0,1}, decode +|---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ << 2 +| +|<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame A +| |<~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>| frame B +@ decoding from here diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 596912b..fa06736 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -70,7 +70,8 @@ extern const uint8_t sched_tchh_dl_amr_cmi_map[26]; -/*! \brief a single TCH/F burst was received by the PHY, process it */ +/* Process a single Uplink TCH/F burst received by the PHY. + * This function is visualized in file 'doc/trx_sched_tch.txt'. */ int rx_tchf_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) { struct l1sched_chan_state *chan_state = &l1ts->chan_state[bi->chan]; diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 11d8b33..d7a19a3 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -127,7 +127,8 @@ [18] = 1, /* TCH/H(1): B2(18 ... 11) */ }; -/*! \brief a single TCH/H burst was received by the PHY, process it */ +/* Process a single Uplink TCH/H burst received by the PHY. + * This function is visualized in file 'doc/trx_sched_tch.txt'. */ int rx_tchh_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) { struct l1sched_chan_state *chan_state = &l1ts->chan_state[bi->chan]; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I373dbbc3d427858f76d07ff85633e07fe2600770 Gerrit-Change-Number: 33076 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Stop READY timer upon receiving force_stdby IE

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32998 ) Change subject: gmm: Stop READY timer upon receiving force_stdby IE ...................................................................... gmm: Stop READY timer upon receiving force_stdby IE Change-Id: I44d0f69571f6425fef74a10602001aca4ecb5716 --- M src/gmm/gmm.c M tests/gmm/gmm_prim_test.err 2 files changed, 28 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 1944b86..ade4059 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -779,6 +779,8 @@ gmme->t3312_assigned_sec = periodic_rau_sec >= 0 ? periodic_rau_sec : 0; if (gmme->t3312_assigned_sec == 0) gprs_gmm_gmme_t3312_stop(gmme); + if (aa->force_stby) + gprs_gmm_gmme_ready_timer_stop(gmme); gsm48_parse_ra(&gmme->ra, (const uint8_t *)&aa->ra_id); if (len > sizeof(*gh) + sizeof(*aa)) { @@ -906,6 +908,9 @@ LOGGMME(gmme, LOGL_INFO, "Rx GMM DETACH ACCEPT (MO) force_standby_indicated=%s\n", force_standby_indicated ? "true" : "false"); + if (force_standby_indicated) + gprs_gmm_gmme_ready_timer_stop(gmme); + /* TODO: submit GMMSM-RELEASE-IND */ /* Submit LLGMM-ASSIGN-REQ as per TS 24.007 Annex C.3 */ @@ -949,6 +954,8 @@ gmme->t3312_assigned_sec = periodic_rau_sec >= 0 ? periodic_rau_sec : 0; if (gmme->t3312_assigned_sec == 0) gprs_gmm_gmme_t3312_stop(gmme); + if (raack->force_stby) + gprs_gmm_gmme_ready_timer_stop(gmme); gsm48_parse_ra(&gmme->ra, (const uint8_t *)&raack->ra_id); if (len > sizeof(*gh) + sizeof(*raack)) { @@ -1053,6 +1060,7 @@ * The IDENTITY RESPONSE message shall contain the identification parameters as requested by the network" */ uint8_t id_type; + bool force_standby_indicated; if (len < sizeof(struct gsm48_hdr) + 1) { LOGGMME(gmme, LOGL_ERROR, "Rx GMM IDENTITY REQUEST with wrong size %u\n", len); @@ -1060,8 +1068,12 @@ } id_type = gh->data[0] & 0xf; - LOGGMME(gmme, LOGL_INFO, "Rx GMM IDENTITY REQUEST mi_type=%s\n", - gsm48_mi_type_name(id_type)); + force_standby_indicated = (gh->data[0] >> 4) == 0x01; + LOGGMME(gmme, LOGL_INFO, "Rx GMM IDENTITY REQUEST mi_type=%s force_stdby=%u\n", + gsm48_mi_type_name(id_type), force_standby_indicated); + + if (force_standby_indicated) + gprs_gmm_gmme_ready_timer_stop(gmme); return gprs_gmm_tx_id_resp(gmme, id_type); } @@ -1173,6 +1185,9 @@ /* TODO: 9.4.9.7 Replayed MS Radio Access Capability */ } + if (acreq->force_stby) + gprs_gmm_gmme_ready_timer_stop(gmme); + gmme->auth_ciph.gea = acreq->ciph_alg; gmme->auth_ciph.req.ac_ref_nr = acreq->ac_ref_nr; gmme->auth_ciph.req.imeisv_requested = acreq->imeisv_req; diff --git a/tests/gmm/gmm_prim_test.err b/tests/gmm/gmm_prim_test.err index dea0ca7..64af93b 100644 --- a/tests/gmm/gmm_prim_test.err +++ b/tests/gmm/gmm_prim_test.err @@ -7,7 +7,7 @@ DLGLOBAL INFO Rx from lower layers: GMRR-LLC_TRANSMITTED.indication DLGLOBAL INFO GMM_MS{Deregistered}: state_chg to RegisteredInitiated DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication -DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM IDENTITY REQUEST mi_type=IMEI +DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM IDENTITY REQUEST mi_type=IMEI force_stdby=0 DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM IDENTITY RESPONSE DLGLOBAL INFO Rx from lower layers: GMRR-LLC_TRANSMITTED.indication DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication @@ -60,7 +60,7 @@ DLGLOBAL INFO Rx from lower layers: GMRR-LLC_TRANSMITTED.indication DLGLOBAL INFO GMM_MS{Deregistered}: state_chg to RegisteredInitiated DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication -DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM IDENTITY REQUEST mi_type=IMEI +DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Rx GMM IDENTITY REQUEST mi_type=IMEI force_stdby=0 DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-00001234:TLLI-80001234) Tx GMM IDENTITY RESPONSE DLGLOBAL INFO Rx from lower layers: GMRR-LLC_TRANSMITTED.indication DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I44d0f69571f6425fef74a10602001aca4ecb5716 Gerrit-Change-Number: 32998 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023