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

[M] Change in pysim[master]: docs: add SUPI/SUCI usage example

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32688 ) Change subject: docs: add SUPI/SUCI usage example ...................................................................... Patch Set 1: (11 comments) File docs/suci-tutorial.rst: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/a8b9a9cf_4475c2a2 PS1, Line 62: pySIM-shell (MF)> select ADF.USIM trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/c41ab59b_15a003b9 PS1, Line 63: pySIM-shell (MF/ADF.USIM)> select DF.5GS trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/614eb908_a4895651 PS1, Line 64: pySIM-shell (MF/ADF.USIM/DF.5GS)> select EF.SUCI_Calc_Info trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/405d0d04_42d4fd35 PS1, Line 70: pySIM-shell (MF/ADF.USIM/DF.5GS/EF.SUCI_Calc_Info)> read_binary_decoded trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/a015d12a_7cd042e3 PS1, Line 108: pySIM-shell (MF)> select ADF.USIM trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/b3d612cf_658a27fd PS1, Line 109: pySIM-shell (MF/ADF.USIM)> select DF.5GS trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/6dae7c7c_9632f172 PS1, Line 110: pySIM-shell (MF/ADF.USIM/DF.5GS)> select EF.Routing_Indicator trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/8a65e22a_03d6b9d8 PS1, Line 111: pySIM-shell (MF/ADF.USIM/DF.5GS/EF.Routing_Indicator)> read_binary_decoded trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/30f0b619_d04e3d05 PS1, Line 135: pySIM-shell (MF)> select ADF.USIM trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/5877be31_7124d73c PS1, Line 136: pySIM-shell (MF/ADF.USIM)> select EF.UST trailing whitespace Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6943): https://gerrit.osmocom.org/c/pysim/+/32688/comment/0b49e326_b5cbd162 PS1, Line 137: pySIM-shell (MF/ADF.USIM/EF.UST)> read_binary_decoded trailing whitespace -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2908ea9df7e78c596554731085902e2ab7278328 Gerrit-Change-Number: 32688 Gerrit-PatchSet: 1 Gerrit-Owner: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 11 May 2023 11:07:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: docs: add SUPI/SUCI usage example

by merlinchlosta

merlinchlosta has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/32688 ) Change subject: docs: add SUPI/SUCI usage example ...................................................................... docs: add SUPI/SUCI usage example Change-Id: I2908ea9df7e78c596554731085902e2ab7278328 --- M docs/shell.rst A docs/suci-tutorial.rst 2 files changed, 198 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/88/32688/1 diff --git a/docs/shell.rst b/docs/shell.rst index 9ffbac3..2d85c71 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -36,6 +36,13 @@ :module: pySim-shell :func: option_parser +Usage Examples +-------------- +.. toctree:: + :maxdepth: 1 + :caption: Tutorials for pySIM-shell: + + suci-tutorial cmd2 basics diff --git a/docs/suci-tutorial.rst b/docs/suci-tutorial.rst new file mode 100644 index 0000000..a8e98ee --- /dev/null +++ b/docs/suci-tutorial.rst @@ -0,0 +1,182 @@ + +Guide: Enabling 5G SUCI +======================== + +SUPI/SUCI Concealment is a feature of 5G-Standalone (SA) to encrypt the +IMSI/SUPI with a network operator public key. pySIM supports writing these +5G-specific files to USIM cards. + +In short, you can enable SUCI with these steps: + +* activate USIM **Service 124** +* store the public keys in **SUCI_Calc_Info** +* set the **Routing Indicator** (required) + +If you want to disable the feature, you can just disable USIM Service 124. + +Technical References +~~~~~~~~~~~~~~~~~~~~ + +This guide covers the basic workflow of provisioning SIM cards with the 5G SUCI feature. For detailed information on the SUCI feature and file contents, the following documents are helpful: + +* USIM files and structure: `TS 31.102 <https://www.etsi.org/deliver/etsi_ts/131100_131199/131102/16.06.00_60/ts_13…>`__ +* USIM tests (incl. file content examples) `TS 31.121 <https://www.etsi.org/deliver/etsi_ts/131100_131199/131121/16.01.00_60/ts_13…>`__ + +For specific information on sysmocom SIM cards, refer to Section 9.1 of the `sysmoUSIM User +Manual <https://www.sysmocom.de/manuals/sysmousim-manual.pdf>`__. + +-------------- + +Admin Keys +---------- + +Start pySIM-shell and enter the admin key for your card. If you bought +the SIM card from your network operator and don’t have the admin key, +you cannot change SIM contents. + +Launch pySIM: + +:: + + $ ./pySim-shell.py -p 0 + + Using PC/SC reader interface + Autodetected card type: sysmoISIM-SJA2 + Welcome to pySim-shell! + pySIM-shell (MF)> + +Enter the ADM keys: + +:: + + pySIM-shell (MF)> verify_adm XXXXXXXX + +Otherwise, write commands will fail with ``SW Mismatch: Expected 9000 and got 6982.`` + +Key Provisioning +---------------- + +:: + + 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 + +By default, the file is present but empty: + +:: + + pySIM-shell (MF/ADF.USIM/DF.5GS/EF.SUCI_Calc_Info)> read_binary_decoded + missing Protection Scheme Identifier List data object tag + 9000: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> {} + +The following JSON config defines the testfile from `TS 31.121 <https://www.etsi.org/deliver/etsi_ts/131100_131199/131121/16.01.00_60/ts_13…>`__ Section 4.9.4 with +test keys from `TS 33.501 <hhttps://www.etsi.org/deliver/etsi_ts/133500_133599/133501/16.05.00_60/ts_1…>`__ Annex C.4. Highest priority (``0``) has a +Profile-B (``identifier: 2``) key in key slot ``1``, which means the key +with ``hnet_pubkey_identifier: 27``. + +.. code:: json + + { + "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"}] + } + +Write the config to file (must be single-line input as for now): + +:: + + 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"}]}' + +Routing Indicator +----------------- + +The Routing Indicator must be present for the SUCI feature. By default, +the file is **invalid**: + +:: + + 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 + 9000: ffffffff -> {'raw': 'ffffffff'} + +The Routing Indicator is a four-byte file but the actual Routing +Indicator goes into bytes 0 and 1 (the other bytes are reserved). To set +the Routing Indicator to 0x71: + +:: + + pySIM-shell (MF/ADF.USIM/DF.5GS/EF.Routing_Indicator)> update_binary 0071ffff + +(the encoding might be different, see `this +comment <https://gist.github.com/mrlnc/01d6300f1904f154d969ff205136b753?permalink_co…>`__) +You can also set the routing indicator to **0x0**, which is *valid* and +means “routing indicator not specified”, leaving it to the modem. + +Service Table +------------- + +First, check out the USIM Service Table (UST): + +:: + + 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 + 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 + :widths: 15 40 + :header-rows: 1 + + * - Service No. + - Description + * - 122 + - 5GS Mobility Management Information + * - 123 + - 5G Security Parameters + * - 124 + - Subscription identifier privacy support + * - 125 + - SUCI calculation by the USIM + * - 126 + - UAC Access Identities support + * - 129 + - 5GS Operator PLMN List + +If you’d like to enable/disable any service: + +:: + + 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 + +In this case, Service 124 is already enabled and you’re good to go. The +sysmocom ISIM does not support on-SIM calculation, so service 125 must +be disabled. + +USIM Error with 5G and sysmocom-ISIM +------------------------------------ + +sysmocom-ISIMs come 5GS-enabled. By default however, the USIM +configuration is not **valid** for 5G networks: Service 124 is enabled, +but SUCI Calc Info and the Routing Indicator are empty files (hence +invalid). + +At least for Qualcomm’s X55 modem, this results in an USIM error and the +whole modem shutting 5G down. If you don’t need SUCI concealment but the +smartphone refuses to connect to any 5G network, try to disable the +service 124. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2908ea9df7e78c596554731085902e2ab7278328 Gerrit-Change-Number: 32688 Gerrit-PatchSet: 1 Gerrit-Owner: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: codec: add osmo_gsm611_silence_frame[] datum

by laforge

Attention is currently required from: falconia. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32684 ) Change subject: codec: add osmo_gsm611_silence_frame[] datum ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf31051ea783435268944286a71d2b0ac342a4b5 Gerrit-Change-Number: 32684 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Thu, 11 May 2023 10:37:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[L] Change in libosmocore[master]: codec: replace GSM-FR ECU with new implementation

by laforge

Attention is currently required from: falconia, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32685 ) Change subject: codec: replace GSM-FR ECU with new implementation ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Adding @pmaier, I know close to nothing about those ECUs. My general comment to this is that the current ECU interface is not set in stone. If you think there's a way to bring it more in-line with what the specs intend to do, and it's not rewriting half of osmo-bts, I'd be interested to hear/read about it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0200e423ca6165c1313ec9a4effc3f3047f5f032 Gerrit-Change-Number: 32685 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 11 May 2023 10:37:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: cards: Add support for Gialer SIM cards

by laforge

Attention is currently required from: matanp. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32686 ) Change subject: cards: Add support for Gialer SIM cards ...................................................................... Patch Set 1: (2 comments) File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/32686/comment/328a7833_23be1b4c PS1, Line 1668: def autodetect(kls, scc): isn't it possible to auto-detect the cards based on ATR or some other criteria? https://gerrit.osmocom.org/c/pysim/+/32686/comment/74774617_d27882db PS1, Line 1700: are you sure there aren't various other files you'd need to program? Like EF.AD for 2/3-digit MNC, etc. Also, the product homepage states the product is a USIM, but you'r eonly adding GSM Ki here, no K/OPC. Is that intended? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icd2021aec630ac018f66ab565e03112047389e17 Gerrit-Change-Number: 32686 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Thu, 11 May 2023 10:17:12 +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]: paging: rename all IMM.ASS references to MACBLOCK

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32687 ) Change subject: paging: rename all IMM.ASS references to MACBLOCK ...................................................................... paging: rename all IMM.ASS references to MACBLOCK The paging interface towards the PCU has a confusing API. In fact what the PCU does when it wants to page or do an immediate assignment is sending a ready formatted macblock to the BTS. The BTS then puts this macblock in the paging queue and then eventually it justs sends it without looking at the contents. For the code in paging.c it is not imortant if the macblock is an immediate assignment, it only cares if the paging record contains a macblock or paging parameters. Related: OS##5927 Change-Id: Ifab37fdedaba98b160718113767e4ef6ee7d16ad --- M include/osmo-bts/paging.h M src/common/paging.c M src/common/pcu_sock.c 3 files changed, 48 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/32687/1 diff --git a/include/osmo-bts/paging.h b/include/osmo-bts/paging.h index fb50323..b413606 100644 --- a/include/osmo-bts/paging.h +++ b/include/osmo-bts/paging.h @@ -35,9 +35,10 @@ int paging_add_identity(struct paging_state *ps, uint8_t paging_group, const uint8_t *identity_lv, uint8_t chan_needed); -/* Add an IMM.ASS message to the paging queue */ -int paging_add_imm_ass(struct paging_state *ps, - const uint8_t *data, uint8_t len); +/* Add a ready formatted MACBLOCK message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a + * PAGING COMMAND (from the PCU) */ +int paging_add_macblock(struct paging_state *ps, + const uint8_t *data, uint8_t len); /* generate paging message for given gsm time */ int paging_gen_msg(struct paging_state *ps, uint8_t *out_buf, struct gsm_time *gt, diff --git a/src/common/paging.c b/src/common/paging.c index 26ba9b0..c7a6607 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -48,8 +48,8 @@ #define MAX_BS_PA_MFRMS 9 enum paging_record_type { - PAGING_RECORD_PAGING, - PAGING_RECORD_IMM_ASS + PAGING_RECORD_NORMAL, + PAGING_RECORD_MACBLOCK }; struct paging_record { @@ -63,7 +63,7 @@ } paging; struct { uint8_t msg[GSM_MACBLOCK_LEN]; - } imm_ass; + } macblock; } u; }; @@ -88,9 +88,9 @@ /* The prioritization of cs pagings is controlled by a hysteresis. When the * fill state of the paging queue exceeds the upper fill level - * THRESHOLD_CONGESTED [%], then PS pagings (immediate assignments) will be - * dropped until fill state of the paging queue drops under the lower fill - * level THRESHOLD_CLEAR [%]. */ + * THRESHOLD_CONGESTED [%], then PS pagings (immediate assignments and pagings + * from the PCU) will be dropped until fill state of the paging queue drops + * under the lower fill level THRESHOLD_CLEAR [%]. */ #define THRESHOLD_CONGESTED 66 /* (percent of num_paging_max) */ #define THRESHOLD_CLEAR 50 /* (percent of num_paging_max) */ @@ -230,7 +230,7 @@ /* Check if we already have this identity */ llist_for_each_entry(pr, group_q, list) { - if (pr->type != PAGING_RECORD_PAGING) + if (pr->type != PAGING_RECORD_NORMAL) continue; if (identity_lv[0] == pr->u.paging.identity_lv[0] && !memcmp(identity_lv+1, pr->u.paging.identity_lv+1, @@ -245,7 +245,7 @@ pr = talloc_zero(ps, struct paging_record); if (!pr) return -ENOMEM; - pr->type = PAGING_RECORD_PAGING; + pr->type = PAGING_RECORD_NORMAL; if (*identity_lv + 1 > sizeof(pr->u.paging.identity_lv)) { talloc_free(pr); @@ -267,8 +267,9 @@ return 0; } -/* Add an IMM.ASS message to the paging queue */ -int paging_add_imm_ass(struct paging_state *ps, +/* Add a ready formatted MACBLOCK message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a + * PAGING COMMAND (from the PCU) */ +int paging_add_macblock(struct paging_state *ps, const uint8_t *data, uint8_t len) { struct llist_head *group_q; @@ -285,7 +286,7 @@ } if (len != GSM_MACBLOCK_LEN + 3) { - LOGP(DPAG, LOGL_ERROR, "IMM.ASS invalid length %d\n", len); + LOGP(DPAG, LOGL_ERROR, "macblock with invalid length %d (GSM_MACBLOCK_LEN + 3)\n", len); return -EINVAL; } len -= 3; @@ -300,11 +301,11 @@ pr = talloc_zero(ps, struct paging_record); if (!pr) return -ENOMEM; - pr->type = PAGING_RECORD_IMM_ASS; + pr->type = PAGING_RECORD_MACBLOCK; - LOGP(DPAG, LOGL_INFO, "Add IMM.ASS to queue (group=%u)\n", + LOGP(DPAG, LOGL_INFO, "Add macblock to paging queue (group=%u)\n", paging_group); - memcpy(pr->u.imm_ass.msg, data, GSM_MACBLOCK_LEN); + memcpy(pr->u.macblock.msg, data, GSM_MACBLOCK_LEN); /* enqueue the new message to the HEAD of the queue */ llist_add(&pr->list, group_q); @@ -599,7 +600,7 @@ *is_empty = 1; } else { struct paging_record *pr[4]; - unsigned int num_pr = 0, imm_ass = 0; + unsigned int num_pr = 0, macblock = 0; time_t now = time(NULL); unsigned int i, num_imsi = 0; @@ -611,9 +612,9 @@ break; pr[i] = dequeue_pr(group_q); - /* check for IMM.ASS */ - if (pr[i]->type == PAGING_RECORD_IMM_ASS) { - imm_ass = 1; + /* check for MACBLOCK */ + if (pr[i]->type == PAGING_RECORD_MACBLOCK) { + macblock = 1; break; } @@ -624,16 +625,16 @@ num_imsi++; } - /* if we have an IMMEDIATE ASSIGNMENT */ - if (imm_ass) { - /* re-add paging records */ + /* if we have a MACBLOCK (from the PCU), we send a conformation back */ + if (macblock) { + /* re-add normal paging records */ for (i = 0; i < num_pr; i++) llist_add(&pr[i]->list, group_q); - /* get message and free record */ - memcpy(out_buf, pr[num_pr]->u.imm_ass.msg, + /* get MACBLOCK message and free record */ + memcpy(out_buf, pr[num_pr]->u.macblock.msg, GSM_MACBLOCK_LEN); - pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.imm_ass.msg, + pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.msg, GSM_MACBLOCK_LEN); talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 2fb0524..00debad 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -675,7 +675,7 @@ switch (data_req->sapi) { case PCU_IF_SAPI_PCH: - paging_add_imm_ass(bts->paging_state, data_req->data, data_req->len); + paging_add_macblock(bts->paging_state, data_req->data, data_req->len); break; case PCU_IF_SAPI_AGCH: msg = msgb_alloc(data_req->len, "pcu_agch"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifab37fdedaba98b160718113767e4ef6ee7d16ad Gerrit-Change-Number: 32687 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: cards: Add support for Gialer SIM cards

by matanp

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/32686 ) Change subject: cards: Add support for Gialer SIM cards ...................................................................... cards: Add support for Gialer SIM cards Change-Id: Icd2021aec630ac018f66ab565e03112047389e17 --- M pySim/cards.py 1 file changed, 53 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/32686/1 diff --git a/pySim/cards.py b/pySim/cards.py index b48a80c..c3c0e9a 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1657,10 +1657,53 @@ return +class GialerSim(SimCard): + """ + Gialer sim cards (www.gialer.com). + """ + + name = 'gialersim' + + @classmethod + def autodetect(kls, scc): + return None + + def program(self, p): + # Authenticate + self._scc.verify_chv(0xc, h2b('3834373936313533')) + + # EF.ICCID + self._scc.select_path(['3f00', '2fe2']) + self._scc.update_binary('2fe2', enc_iccid(p['iccid'])) + + # EF.IMSI + self._scc.select_path(['3f00', '7f20', '6f07']) + self._scc.update_binary('6f07', enc_imsi(p['imsi'])) + + # EF.ACC + if p.get('acc') is not None: + self._scc.update_binary('6f78', lpad(p['acc'], 4)) + + # EF.SMSP + if p.get('smsp'): + self._scc.select_path(['3f00', '7f10', '6f42']) + self._scc.update_record('6f42', 1, lpad(p['smsp'], 80)) + + self._scc.select_path(['3f00', '0001']) + self._scc.update_binary('0001', p['ki']) + + # EF.HPLMN + r = self._scc.select_path(['3f00', '7f20', '6f30']) + size = int(r[-1][4:8], 16) + hplmn = enc_plmn(p['mcc'], p['mnc']) + self._scc.update_binary('6f30', hplmn + 'ff' * (size - 3)) + + # In order for autodetection ... _cards_classes = [FakeMagicSim, SuperSim, MagicSim, GrcardSim, SysmoSIMgr1, SysmoSIMgr2, SysmoUSIMgr1, SysmoUSIMSJS1, - FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2] + FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2, + GialerSim] def card_detect(ctype, scc): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icd2021aec630ac018f66ab565e03112047389e17 Gerrit-Change-Number: 32686 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: hnbgw: put copyright into define

by laforge

Attention is currently required from: osmith, neels, fixeria, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32679 ) Change subject: hnbgw: put copyright into define ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I13b2569a369724e0298b064a0876b95d6dafd9d0 Gerrit-Change-Number: 32679 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 11 May 2023 09:45:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmo-bts[master]: common+trx: make uplink ECU optional

by falconia

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/32110 to look at the new patch set (#4). Change subject: common+trx: make uplink ECU optional ...................................................................... common+trx: make uplink ECU optional Current osmo-bts-trx includes a provision for invoking ECUs from libosmocodec in the UL path from the channel decoder to the RTP output; no other models currently do likewise, but there is no particular reason why this ECU invokation couldn't be moved into model-independent code. However, the approach of applying an ECU to the UL output of a BTS directly inside that BTS runs counter to standard GSM architecture; instead the places where ECUs are to be implemented in the classic architecture are as follows: * At the decoding input of speech transcoders, be they TRAUs or network edge TCs; * In the Rx DTX handler block of every GSM MS; * Possibly in the downlink path of TRAUs (the component preparing the DL frame stream going to a BTS PHY) in the case of TFO. In the RTP-based RAN environment, the following two scenarios are most relevant: 1) In a call with only one GSM leg (the other leg is in the outside world), the best possible ECU would be one that is absorbed into the Rx DTX handler block at the decoding input of the network edge transcoder. 2) In a TrFO call from one GSM MS to another, the best approach is for the network to not apply any ECUs at all, and let all bad frame handling take place in the receiving MS on each end of the call. In neither scenario is there anything to be gained from applying an ECU at the point of UL RTP output from the BTS - therefore, having one unconditionally included in a BTS with no way to disable it is bad. Provide a vty option to enable or disable BTS-internal application of an ECU to UL RTP output. To avoid upsetting existing users, the default is left unchanged: the built-in ECU *is* applied to the uplink. However, given that this current default is counter to standard GSM architecture, it may be worth considering changing it in the future. Related: OS#6027 Change-Id: I0acca9c6d7da966a623287563e0789db9e0fae8e --- M include/osmo-bts/bts.h M src/common/vty.c M src/osmo-bts-trx/l1_if.c M tests/osmo-bts.vty 4 files changed, 93 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/10/32110/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0acca9c6d7da966a623287563e0789db9e0fae8e Gerrit-Change-Number: 32110 Gerrit-PatchSet: 4 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[L] Change in libosmocore[master]: codec: replace GSM-FR ECU with new implementation

by falconia

Attention is currently required from: falconia. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/32685 to look at the new patch set (#2). Change subject: codec: replace GSM-FR ECU with new implementation ...................................................................... codec: replace GSM-FR ECU with new implementation The original GSM-FR ECU implementation from 2017 exhibits a lot of defects, as detailed in OS#6027. Replace it with a new implementation based on Themyscira libgsmfrp (a complete Rx DTX handler for GSM-FR), but reduced to just the ECU function, without the comfort noise generator function. (These two functions are coupled together in the classic GSM architecture, but not in libosmocodec ECU model.) Related: OS#6027 Change-Id: I0200e423ca6165c1313ec9a4effc3f3047f5f032 --- M include/osmocom/codec/ecu.h M src/codec/Makefile.am M src/codec/ecu_fr.c A src/codec/ecu_fr_old.c M tests/codec/codec_ecu_fr_test.c M tests/codec/codec_ecu_fr_test.ok 6 files changed, 466 insertions(+), 163 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/32685/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0200e423ca6165c1313ec9a4effc3f3047f5f032 Gerrit-Change-Number: 32685 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023