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

[M] Change in osmo-ttcn3-hacks[master]: DIAMETER_Templates: Add S6b AAR and AAA message templates

by laforge

Attention is currently required from: fixeria, lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34860?usp=email ) Change subject: DIAMETER_Templates: Add S6b AAR and AAA message templates ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34860?usp=email 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: I302d9a94e6ffbb62b6db81e1b14484355e55ebe5 Gerrit-Change-Number: 34860 Gerrit-PatchSet: 3 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 24 Oct 2023 19:11:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in pysim[master]: euicc: Add get_profiles_info command

by laforge

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34880?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: euicc: Add get_profiles_info command ...................................................................... euicc: Add get_profiles_info command Example output: pySIM-shell (02:MF/ADF.ISD-R)> get_profiles_info { "profile_info_seq": { "profile_info": { "iccid": "98940462222222222222", "isdp_aid": "a0000005591010ffffffff8900001200", "profile_state": "enabled", "service_provider_name": "foobar", "profile_name": "foobar", "profile_class": "provisioning" } } } Change-Id: I52d136f99dc0eb29905e7ca0cd0865486d3cf65b --- M docs/shell.rst M pySim/euicc.py 2 files changed, 70 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/34880/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34880?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I52d136f99dc0eb29905e7ca0cd0865486d3cf65b Gerrit-Change-Number: 34880 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in pysim[master]: utils: Fix bertlv_encode_tag() for multi-byte tags

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34851?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: utils: Fix bertlv_encode_tag() for multi-byte tags ...................................................................... utils: Fix bertlv_encode_tag() for multi-byte tags We used to support only single-byte tags in bertlv_encode_tag, let's fix that. The easy option is to simply call bertlv_parse_tag, as that already supported multi-byte tags. Change-Id: If0bd9137883c4c8b01c4dfcbb53cabeee5c1ce2b --- M pySim/utils.py 1 file changed, 28 insertions(+), 8 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 6cacdaa..7459a3f 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -262,15 +262,22 @@ remainder = inp & ~ (inp << (remain_bits - bitcnt)) return outp, remainder + def count_int_bytes(inp: int) -> int: + """count the number of bytes require to represent the given integer.""" + i = 1 + inp = inp >> 8 + while inp: + i += 1 + inp = inp >> 8 + return i + if isinstance(t, int): - # FIXME: multiple byte tags - tag = t & 0x1f - constructed = True if t & 0x20 else False - cls = t >> 6 - else: - tag = t['tag'] - constructed = t['constructed'] - cls = t['class'] + # first convert to a dict representation + tag_size = count_int_bytes(t) + t, remainder = bertlv_parse_tag(t.to_bytes(tag_size, 'big')) + tag = t['tag'] + constructed = t['constructed'] + cls = t['class'] if tag <= 30: t = tag & 0x1f if constructed: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If0bd9137883c4c8b01c4dfcbb53cabeee5c1ce2b Gerrit-Change-Number: 34851 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in pysim[master]: pySim-shell: Add 'switch_channel' command

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34848?usp=email ) ( 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pySim-shell: Add 'switch_channel' command ...................................................................... pySim-shell: Add 'switch_channel' command We've already had the 'open_channel' and 'close_channel' commands, which were sent to (and acknowledged by) the card. However, those commands didn't affect the pySim-shell state, i.e. all communication would still happen through the default channel '0'. With this patch we introduce a 'switch_channel' command, using which the user can determine which of the (previously opened) logical channels shall be used by pySim-shell. Change-Id: Ia76eb45c4925882ae6866e50b64d9610bd4d546d Closes: OS#6230 --- M docs/shell.rst M pySim-shell.py 2 files changed, 37 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/docs/shell.rst b/docs/shell.rst index dea0bb4..51fd49e 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -199,6 +199,12 @@ :module: pySim-shell :func: Iso7816Commands.close_chan_parser +switch_channel +~~~~~~~~~~~~~~ +.. argparse:: + :module: pySim-shell + :func: Iso7816Commands.switch_chan_parser + TS 102 221 commands ------------------- diff --git a/pySim-shell.py b/pySim-shell.py index 8a1ad01..2f97389 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -963,6 +963,18 @@ # this is executed only in successful case, as unsuccessful raises exception self._cmd.rs.del_lchan(opts.chan_nr) + switch_chan_parser = argparse.ArgumentParser() + switch_chan_parser.add_argument( + 'chan_nr', type=int, default=0, help='Channel Number') + + @cmd2.with_argparser(switch_chan_parser) + def do_switch_channel(self, opts): + """Switch currently active logical channel.""" + self._cmd.lchan._select_pre(self._cmd) + self._cmd.lchan = self._cmd.rs.lchan[opts.chan_nr] + self._cmd.lchan._select_post(self._cmd) + self._cmd.update_prompt() + def do_status(self, opts): """Perform the STATUS command.""" fcp_dec = self._cmd.lchan.status() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia76eb45c4925882ae6866e50b64d9610bd4d546d Gerrit-Change-Number: 34848 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in pysim[master]: pySim-shell: Include current logical channel in prompt

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34850?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pySim-shell: Include current logical channel in prompt ...................................................................... pySim-shell: Include current logical channel in prompt Now that pySim-shell can switch between logical channels, let's state the currently used logical channel in the prompt. Change-Id: I45781a6fba205eeb4ac7f58d5cb642b7131bdd88 Related: OS#6230 --- M docs/shell.rst M docs/suci-tutorial.rst M pySim-shell.py 3 files changed, 49 insertions(+), 36 deletions(-) Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index 51fd49e..811ef61 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -68,7 +68,7 @@ :: - pySIM-shell (MF)> select + pySIM-shell (00:MF)> select .. 2fe2 a0000000871004 EF.ARR MF 2f00 3f00 ADF.ISIM EF.DIR 2f05 7f10 ADF.USIM EF.ICCID @@ -85,7 +85,7 @@ :: - pySIM-shell (MF)> select ADF.USIM + pySIM-shell (00:MF)> select ADF.USIM { "file_descriptor": { "file_descriptor_byte": { @@ -103,7 +103,7 @@ "security_attrib_compact": "00", "pin_status_template_do": "90017083010183018183010A83010B" } - pySIM-shell (MF/ADF.USIM)> + pySIM-shell (00:MF/ADF.USIM)> status @@ -116,7 +116,7 @@ :: - pySIM-shell (MF/ADF.ISIM)> status + pySIM-shell (00:MF/ADF.ISIM)> status { "file_descriptor": { "file_descriptor_byte": { @@ -261,7 +261,7 @@ Example: :: - pySIM-shell (MF)> dir + pySIM-shell (00:MF)> dir MF 3f00 .. ADF.USIM DF.SYSTEM EF.DIR EF.UMPC @@ -295,7 +295,7 @@ Example: :: - pySIM-shell (MF)> tree --help + pySIM-shell (00:MF)> tree --help EF.DIR 2f00 Application Directory EF.ICCID 2fe2 ICC Identification EF.PL 2f05 Preferred Languages @@ -467,7 +467,7 @@ :: - pySIM-shell (MF/ADF.USIM/EF.AD)> read_binary_decoded + pySIM-shell (00:MF/ADF.USIM/EF.AD)> read_binary_decoded { "ms_operation_mode": "normal", "specific_facilities": { @@ -475,8 +475,8 @@ }, "len_of_mnc_in_imsi": 2 } - pySIM-shell (MF/ADF.USIM/EF.AD)> update_binary_decoded --json-path specific_facilities.ofm false - pySIM-shell (MF/ADF.USIM/EF.AD)> read_binary_decoded + pySIM-shell (00:MF/ADF.USIM/EF.AD)> update_binary_decoded --json-path specific_facilities.ofm false + pySIM-shell (00:MF/ADF.USIM/EF.AD)> read_binary_decoded { "ms_operation_mode": "normal", "specific_facilities": { @@ -731,7 +731,7 @@ :: - pySIM-shell (MF/ADF.ARA-M)> aram_get_all + pySIM-shell (00:MF/ADF.ARA-M)> aram_get_all [ { "ResponseAllRefArDO": [ @@ -783,7 +783,7 @@ For example, to store an Android UICC carrier privilege rule for the SHA1 hash of the certificate used to sign the CoIMS android app of Supreeth Herle (https://github.com/herlesupreeth/CoIMS_Wiki) you can use the following command: :: - pySIM-shell (MF/ADF.ARA-M)> aram_store_ref_ar_do --aid FFFFFFFFFFFF --device-app-id E46872F28B350B7E1F140DE535C2A8D5804F0BE3 --android-permissions 0000000000000001 --apdu-always + pySIM-shell (00:MF/ADF.ARA-M)> aram_store_ref_ar_do --aid FFFFFFFFFFFF --device-app-id E46872F28B350B7E1F140DE535C2A8D5804F0BE3 --android-permissions 0000000000000001 --apdu-always aram_delete_all @@ -845,10 +845,10 @@ :: - pySIM-shell (MF/EF.ICCID)> set numeric_path True + pySIM-shell (00:MF/EF.ICCID)> set numeric_path True numeric_path - was: False now: True - pySIM-shell (3f00/2fe2)> set numeric_path False + pySIM-shell (00:3f00/2fe2)> set numeric_path False numeric_path - was: True now: False - pySIM-shell (MF/EF.ICCID)> help set + pySIM-shell (00:MF/EF.ICCID)> help set diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst index fc6e911..b4c950f 100644 --- a/docs/suci-tutorial.rst +++ b/docs/suci-tutorial.rst @@ -55,13 +55,13 @@ Using PC/SC reader interface Autodetected card type: sysmoISIM-SJA2 Welcome to pySim-shell! - pySIM-shell (MF)> + pySIM-shell (00:MF)> Enter the ADM PIN: :: - pySIM-shell (MF)> verify_adm XXXXXXXX + pySIM-shell (00:MF)> verify_adm XXXXXXXX Otherwise, write commands will fail with ``SW Mismatch: Expected 9000 and got 6982.`` @@ -70,16 +70,16 @@ :: - pySIM-shell (MF)> select MF - pySIM-shell (MF)> select ADF.USIM - pySIM-shell (MF/ADF.USIM)> select DF.5GS - pySIM-shell (MF/ADF.USIM/DF.5GS)> select EF.SUCI_Calc_Info + pySIM-shell (00:MF)> select MF + pySIM-shell (00:MF)> select ADF.USIM + pySIM-shell (00:MF/ADF.USIM)> select DF.5GS + pySIM-shell (00:MF/ADF.USIM/DF.5GS)> select EF.SUCI_Calc_Info By default, the file is present but empty: :: - pySIM-shell (MF/ADF.USIM/DF.5GS/EF.SUCI_Calc_Info)> read_binary_decoded + pySIM-shell (00:MF/ADF.USIM/DF.5GS/EF.SUCI_Calc_Info)> read_binary_decoded missing Protection Scheme Identifier List data object tag 9000: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> {} @@ -106,7 +106,7 @@ :: - pySIM-shell (MF/ADF.USIM/DF.5GS/EF.SUCI_Calc_Info)> update_binary_decoded '{ "prot_scheme_id_list": [ {"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}, {"priority": 2, "identifier": 0, "key_index": 0}], "hnet_pubkey_list": [ {"hnet_pubkey_identifier": 27, "hnet_pubkey": "0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5A8D38864820197C3394B92613B20B91633CBD897119273BF8E4A6F4EEC0A650"}]}' + pySIM-shell (00:MF/ADF.USIM/DF.5GS/EF.SUCI_Calc_Info)> update_binary_decoded '{ "prot_scheme_id_list": [ {"priority": 0, "identifier": 2, "key_index": 1}, {"priority": 1, "identifier": 1, "key_index": 2}, {"priority": 2, "identifier": 0, "key_index": 0}], "hnet_pubkey_list": [ {"hnet_pubkey_identifier": 27, "hnet_pubkey": "0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1"}, {"hnet_pubkey_identifier": 30, "hnet_pubkey": "5A8D38864820197C3394B92613B20B91633CBD897119273BF8E4A6F4EEC0A650"}]}' WARNING: These are TEST KEYS with publicly known/specified private keys, and hence unsafe for live/secure deployments! For use in production networks, you need to generate your own set[s] of keys. @@ -119,11 +119,11 @@ :: - pySIM-shell (MF)> select MF - pySIM-shell (MF)> select ADF.USIM - pySIM-shell (MF/ADF.USIM)> select DF.5GS - pySIM-shell (MF/ADF.USIM/DF.5GS)> select EF.Routing_Indicator - pySIM-shell (MF/ADF.USIM/DF.5GS/EF.Routing_Indicator)> read_binary_decoded + pySIM-shell (00:MF)> select MF + pySIM-shell (00:MF)> select ADF.USIM + pySIM-shell (00:MF/ADF.USIM)> select DF.5GS + pySIM-shell (00:MF/ADF.USIM/DF.5GS)> select EF.Routing_Indicator + pySIM-shell (00:MF/ADF.USIM/DF.5GS/EF.Routing_Indicator)> read_binary_decoded 9000: ffffffff -> {'raw': 'ffffffff'} The Routing Indicator is a four-byte file but the actual Routing @@ -132,7 +132,7 @@ :: - pySIM-shell (MF/ADF.USIM/DF.5GS/EF.Routing_Indicator)> update_binary 17ffffff + pySIM-shell (00:MF/ADF.USIM/DF.5GS/EF.Routing_Indicator)> update_binary 17ffffff You can also set the routing indicator to **0x0**, which is *valid* and means “routing indicator not specified”, leaving it to the modem. @@ -144,10 +144,10 @@ :: - pySIM-shell (MF)> select MF - pySIM-shell (MF)> select ADF.USIM - pySIM-shell (MF/ADF.USIM)> select EF.UST - pySIM-shell (MF/ADF.USIM/EF.UST)> read_binary_decoded + pySIM-shell (00:MF)> select MF + pySIM-shell (00:MF)> select ADF.USIM + pySIM-shell (00:MF/ADF.USIM)> select EF.UST + pySIM-shell (00:MF/ADF.USIM/EF.UST)> read_binary_decoded 9000: beff9f9de73e0408400170730000002e00000000 -> [2, 3, 4, 5, 6, 9, 10, 11, 12, 13, 14, 15, 17, 18, 19, 20, 21, 25, 27, 28, 29, 33, 34, 35, 38, 39, 42, 43, 44, 45, 46, 51, 60, 71, 73, 85, 86, 87, 89, 90, 93, 94, 95, 122, 123, 124, 126] .. list-table:: From TS31.102 @@ -173,9 +173,9 @@ :: - pySIM-shell (MF/ADF.USIM/EF.UST)> ust_service_deactivate 124 - pySIM-shell (MF/ADF.USIM/EF.UST)> ust_service_activate 124 - pySIM-shell (MF/ADF.USIM/EF.UST)> ust_service_deactivate 125 + pySIM-shell (00:MF/ADF.USIM/EF.UST)> ust_service_deactivate 124 + pySIM-shell (00:MF/ADF.USIM/EF.UST)> ust_service_activate 124 + pySIM-shell (00:MF/ADF.USIM/EF.UST)> ust_service_deactivate 125 In this case, UST Service 124 is already enabled and you’re good to go. The sysmoISIM-SJA2 does not support on-SIM calculation, so service 125 must diff --git a/pySim-shell.py b/pySim-shell.py index 2f97389..022b276 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -291,7 +291,7 @@ def update_prompt(self): if self.lchan: path_str = self.lchan.selected_file.fully_qualified_path_str(not self.numeric_path) - self.prompt = 'pySIM-shell (%s)> ' % (path_str) + self.prompt = 'pySIM-shell (%02u:%s)> ' % (self.lchan.lchan_nr, path_str) else: if self.card: self.prompt = 'pySIM-shell (no card profile)> ' -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34850?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I45781a6fba205eeb4ac7f58d5cb642b7131bdd88 Gerrit-Change-Number: 34850 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF

by Jenkins Builder

Attention is currently required from: dexter, osmith, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF ...................................................................... Patch Set 7: (1 comment) File src/common/pcu_sock.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12085): https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/d867ea3e_37c79262 PS7, Line 248: return PCU_IF_BTS_MODEL_TRX; code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Oct 2023 15:23:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF

by dexter

Attention is currently required from: dexter, osmith, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: pcuif_proto: signal BTS model via PCUIF ...................................................................... pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 51 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: Make RLC timing data configurable

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email ) Change subject: Make RLC timing data configurable ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/net_init.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/972c5b9b_d5c3c520 PS2, Line 51: { .T = 3142, .default_val = 20, > > So we really need to add a osmo_tdef group per bts object. You can have a look at > asp->cfg. […] Have a look also ag libosmo-sccp "inst->tdefs" inside osmo_sccp_instance_create(), and related sccp_timer_cmd in sccp_vty.c -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675 Gerrit-Change-Number: 31878 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Oct 2023 15:13:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: clean up last remains of old PCUIF v10

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34707?usp=email ) Change subject: pcuif_proto: clean up last remains of old PCUIF v10 ...................................................................... pcuif_proto: clean up last remains of old PCUIF v10 There are still some remains that are related to the old PCUIF v10 protocol version. Let's clean those up. Related: OS#5927 Depends: osmo-pcu.git I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Change-Id: I04f7108c94c99c9920192177087748e8b89b3106 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 14 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index a620993..15e3e20 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -12,7 +12,6 @@ /* msg_type */ #define PCU_IF_MSG_DATA_REQ 0x00 /* send data to given channel */ -#define PCU_IF_MSG_DATA_CNF 0x01 /* confirm (e.g. transmission on PCH) */ #define PCU_IF_MSG_DATA_IND 0x02 /* receive data from given channel */ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ #define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ @@ -29,8 +28,6 @@ /* sapi */ #define PCU_IF_SAPI_RACH 0x01 /* channel request on CCCH */ -#define PCU_IF_SAPI_AGCH 0x02 /* assignment on AGCH */ -#define PCU_IF_SAPI_PCH 0x03 /* paging/assignment on PCH */ #define PCU_IF_SAPI_BCCH 0x04 /* SI on BCCH */ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ @@ -256,7 +253,6 @@ union { struct gsm_pcu_if_data data_req; - struct gsm_pcu_if_data data_cnf; struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 79b39c4..6116c9e 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -53,8 +53,6 @@ static const char *sapi_string[] = { [PCU_IF_SAPI_RACH] = "RACH", - [PCU_IF_SAPI_AGCH] = "AGCH", - [PCU_IF_SAPI_PCH] = "PCH", [PCU_IF_SAPI_BCCH] = "BCCH", [PCU_IF_SAPI_PDTCH] = "PDTCH", [PCU_IF_SAPI_PRACH] = "PRACH", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34707?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I04f7108c94c99c9920192177087748e8b89b3106 Gerrit-Change-Number: 34707 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: clean up last remains of old PCUIF v10

by dexter

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34707?usp=email ) Change subject: pcuif_proto: clean up last remains of old PCUIF v10 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34707?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I04f7108c94c99c9920192177087748e8b89b3106 Gerrit-Change-Number: 34707 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 Oct 2023 15:10:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2023