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

[S] Change in osmo-bts[master]: license: fix typos

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32409 ) Change subject: license: fix typos ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I450919973bbd31bce44c0b6606f457581e2f71df Gerrit-Change-Number: 32409 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 23 Apr 2023 12:50:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_rsl: include osmo_ortp.h explicitly

by msuraev

msuraev has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32276 ) Change subject: abis_rsl: include osmo_ortp.h explicitly ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I11297f2ba2ff431153e541c745cf59b7fbb733c0 Gerrit-Change-Number: 32276 Gerrit-PatchSet: 5 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 2 months

1
0
0 0

[S] Change in libosmocore[master]: libosmocore.map: add missing symbols needed for osmo-qcdiag

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32408 ) Change subject: libosmocore.map: add missing symbols needed for osmo-qcdiag ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e84546b484db4822554681b31625d0520617d2b Gerrit-Change-Number: 32408 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 22 Apr 2023 21:10:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[M] Change in osmo-bsc[2023q1]: SCCP N-PCSTATE: trigger MSC status on PC availability

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32385 ) Change subject: SCCP N-PCSTATE: trigger MSC status on PC availability ...................................................................... SCCP N-PCSTATE: trigger MSC status on PC availability Backport of 8f8af409743ee03b4a620a21d22facda304f3e68 to 2023q1, with this tweak in osmo_bsc_sigtran.c: - handle_pcstate_ind(osmo_sccp_get_ss7(sccp), &scu_prim->u.pcstate); + handle_pcstate_ind(osmo_sccp_get_ss7(osmo_sccp_get_sccp(scu)), &scu_prim->u.pcstate); because the patch that introduced local variable 'sccp' is not merged here yet: 'Optimize subscr_conns lookup' 85062ccad31e9fb73e0256a5ee556c6ae0a16449 I667d3ec1dad0ab7bc0fa4799d9611f3a914d07e5 Related: SYS#6319 Related: Ia1aea4e33230d6a685b72ea5ba20dd9c7d265d44 osmo-ttcn3-hacks Related: Ib4a5330df30a73e744c316898817b2fa3271d75e osmo-ttcn3-hacks Change-Id: I3a0869598b8395601a16d78dbc46eec400c0ea84 --- M include/osmocom/bsc/bssmap_reset.h M src/osmo-bsc/bssmap_reset.c M src/osmo-bsc/osmo_bsc_sigtran.c 3 files changed, 135 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/include/osmocom/bsc/bssmap_reset.h b/include/osmocom/bsc/bssmap_reset.h index fcd850b..c0de13c 100644 --- a/include/osmocom/bsc/bssmap_reset.h +++ b/include/osmocom/bsc/bssmap_reset.h @@ -28,4 +28,5 @@ struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg); bool bssmap_reset_is_conn_ready(const struct bssmap_reset *bssmap_reset); void bssmap_reset_resend_reset(struct bssmap_reset *bssmap_reset); +void bssmap_reset_set_disconnected(struct bssmap_reset *bssmap_reset); void bssmap_reset_term_and_free(struct bssmap_reset *bssmap_reset); diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c index fa6684d..ac304a5 100644 --- a/src/osmo-bsc/bssmap_reset.c +++ b/src/osmo-bsc/bssmap_reset.c @@ -251,6 +251,12 @@ osmo_fsm_inst_state_chg_ms(bssmap_reset->fi, BSSMAP_RESET_ST_DISC, 1, 0); } +void bssmap_reset_set_disconnected(struct bssmap_reset *bssmap_reset) +{ + /* Go to disconnected state, with the normal RESET timeout to re-send RESET. */ + bssmap_reset_fsm_state_chg(bssmap_reset->fi, BSSMAP_RESET_ST_DISC); +} + static __attribute__((constructor)) void bssmap_reset_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&bssmap_reset_fsm) == 0); diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 04c2e99..2b5554a 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -36,6 +36,7 @@ #include <osmocom/bsc/gsm_data.h> #include <osmocom/bsc/bts.h> #include <osmocom/bsc/paging.h> +#include <osmocom/bsc/bssmap_reset.h> #include <osmocom/mgcp_client/mgcp_common.h> /* A pointer to a list with all involved MSCs @@ -119,7 +120,7 @@ &msc->a.msc_addr, msg); } -/* Find an MSC by its sigtran point code */ +/* Find an MSC by its remote SCCP address */ static struct bsc_msc_data *get_msc_by_addr(const struct osmo_sccp_addr *msc_addr) { struct osmo_ss7_instance *ss7; @@ -134,6 +135,21 @@ return NULL; } +/* Find an MSC by its remote sigtran point code on a given cs7 instance. */ +static struct bsc_msc_data *get_msc_by_pc(struct osmo_ss7_instance *cs7, uint32_t pc) +{ + struct bsc_msc_data *msc; + llist_for_each_entry(msc, msc_list, entry) { + if (msc->a.cs7_instance != cs7->cfg.id) + continue; + if ((msc->a.msc_addr.presence & OSMO_SCCP_ADDR_T_PC) == 0) + continue; + if (msc->a.msc_addr.pc == pc) + return msc; + } + return NULL; +} + /* Received data from MSC, use the connection id which MSC it is */ static int handle_data_from_msc(struct gsm_subscriber_connection *conn, struct msgb *msg) { @@ -206,6 +222,89 @@ return rc; } +static void handle_pcstate_ind(struct osmo_ss7_instance *cs7, const struct osmo_scu_pcstate_param *pcst) +{ + struct bsc_msc_data *msc; + bool connected; + bool disconnected; + + LOGP(DMSC, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u sp_status=%d remote_sccp_status=%d\n", + pcst->affected_pc, pcst->sp_status, pcst->remote_sccp_status); + + /* If we don't care about that point-code, ignore PCSTATE. */ + msc = get_msc_by_pc(cs7, pcst->affected_pc); + if (!msc) + return; + + /* See if this marks the point code to have become available, or to have been lost. + * + * I want to detect two events: + * - connection event (both indicators say PC is reachable). + * - disconnection event (at least one indicator says the PC is not reachable). + * + * There are two separate incoming indicators with various possible values -- the incoming events can be: + * + * - neither connection nor disconnection indicated -- just indicating congestion + * connected == false, disconnected == false --> do nothing. + * - both incoming values indicate that we are connected + * --> trigger connected + * - both indicate we are disconnected + * --> trigger disconnected + * - one value indicates 'connected', the other indicates 'disconnected' + * --> trigger disconnected + * + * Congestion could imply that we're connected, but it does not indicate that a PC's reachability changed, so no need to + * trigger on that. + */ + connected = false; + disconnected = false; + + switch (pcst->sp_status) { + case OSMO_SCCP_SP_S_ACCESSIBLE: + connected = true; + break; + case OSMO_SCCP_SP_S_INACCESSIBLE: + disconnected = true; + break; + default: + case OSMO_SCCP_SP_S_CONGESTED: + /* Neither connecting nor disconnecting */ + break; + } + + switch (pcst->remote_sccp_status) { + case OSMO_SCCP_REM_SCCP_S_AVAILABLE: + if (!disconnected) + connected = true; + break; + case OSMO_SCCP_REM_SCCP_S_UNAVAILABLE_UNKNOWN: + case OSMO_SCCP_REM_SCCP_S_UNEQUIPPED: + case OSMO_SCCP_REM_SCCP_S_INACCESSIBLE: + disconnected = true; + connected = false; + break; + default: + case OSMO_SCCP_REM_SCCP_S_CONGESTED: + /* Neither connecting nor disconnecting */ + break; + } + + if (disconnected && a_reset_conn_ready(msc)) { + LOGP(DMSC, LOGL_NOTICE, + "(msc%d) now unreachable: N-PCSTATE ind: pc=%u sp_status=%d remote_sccp_status=%d\n", + msc->nr, pcst->affected_pc, pcst->sp_status, pcst->remote_sccp_status); + /* A previously usable MSC has disconnected. Kick the BSSMAP back to DISC state. */ + bssmap_reset_set_disconnected(msc->a.bssmap_reset); + } else if (connected && !a_reset_conn_ready(msc)) { + LOGP(DMSC, LOGL_NOTICE, + "(msc%d) now available: N-PCSTATE ind: pc=%u sp_status=%d remote_sccp_status=%d\n", + msc->nr, pcst->affected_pc, pcst->sp_status, pcst->remote_sccp_status); + /* A previously unusable MSC has become reachable. Trigger immediate BSSMAP RESET -- we would resend a + * RESET either way, but we might as well do it now to speed up connecting. */ + bssmap_reset_resend_reset(msc->a.bssmap_reset); + } +} + /* Callback function, called by the SCCP stack when data arrives */ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *_scu) { @@ -271,6 +370,10 @@ } break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_PCSTATE, PRIM_OP_INDICATION): + handle_pcstate_ind(osmo_sccp_get_ss7(osmo_sccp_get_sccp(scu)), &scu_prim->u.pcstate); + break; + default: LOGP(DMSC, LOGL_ERROR, "Unhandled SIGTRAN operation %s on primitive %u\n", get_value_string(osmo_prim_op_names, oph->operation), oph->primitive); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2023q1 Gerrit-Change-Id: I3a0869598b8395601a16d78dbc46eec400c0ea84 Gerrit-Change-Number: 32385 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmocore[master]: libosmocore.map: add missing symbols needed for osmo-qcdiag

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32408 ) Change subject: libosmocore.map: add missing symbols needed for osmo-qcdiag ...................................................................... libosmocore.map: add missing symbols needed for osmo-qcdiag Change 213fc420e broke osmo-qcdiag: /usr/bin/ld: diagchar_hdlc.o: in function `osmo_crc16_ccitt_byte': src/diagchar_hdlc.c:46: undefined reference to `osmo_crc16_ccitt_table' /usr/bin/ld: warning: creating DT_TEXTREL in a PIE collect2: error: ld returned 1 exit status make: *** [Makefile:8: osmo-qcdiag-log] Error 1 Change-Id: I7e84546b484db4822554681b31625d0520617d2b Fixes: 213fc420e "Add libosmocore.map" --- M src/core/libosmocore.map 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/32408/1 diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index bd1b3d9..095a4c0 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -161,6 +161,8 @@ osmo_counters_for_each; osmo_crc16; osmo_crc16_ccitt; +osmo_crc16_ccitt_table; +osmo_crc16_table; osmo_crc16gen_check_bits; osmo_crc16gen_compute_bits; osmo_crc16gen_set_bits; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e84546b484db4822554681b31625d0520617d2b Gerrit-Change-Number: 32408 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in pysim[master]: ts_51_011: fix EF_ServiceTable: use self for static method

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/32406 ) Change subject: ts_51_011: fix EF_ServiceTable: use self for static method ...................................................................... ts_51_011: fix EF_ServiceTable: use self for static method Even though _bit_byte_offset_for_service() is a @staticmethod, it's still available via self, just like any non-static method. Change-Id: I3590dda341d534deb1b7f4743ea31ab16dbd6912 --- M pySim/ts_51_011.py 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/06/32406/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 3dc21c8..222bdaf 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -670,16 +670,14 @@ bin_len = 0 for srv in in_json.keys(): service_nr = int(srv) - (byte_offset, bit_offset) = EF_ServiceTable._bit_byte_offset_for_service( - service_nr) + (byte_offset, bit_offset) = self._bit_byte_offset_for_service(service_nr) if byte_offset >= bin_len: bin_len = byte_offset+1 # encode the actual data out = bytearray(b'\x00' * bin_len) for srv in in_json.keys(): service_nr = int(srv) - (byte_offset, bit_offset) = EF_ServiceTable._bit_byte_offset_for_service( - service_nr) + (byte_offset, bit_offset) = self._bit_byte_offset_for_service(service_nr) bits = 0 if in_json[srv]['allocated'] == True: bits |= 1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3590dda341d534deb1b7f4743ea31ab16dbd6912 Gerrit-Change-Number: 32406 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[M] Change in pysim[master]: Add very basic profile for R-UIM (CDMA) cards

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/32407 ) Change subject: Add very basic profile for R-UIM (CDMA) cards ...................................................................... Add very basic profile for R-UIM (CDMA) cards R-UIM (CDMA) cards are pretty much like the normal GSM SIM cards and "speak" the same 2G APDU protocol, except that they have their own file hierarchy under MF(3f00)/DF.CDMA(7f25). They also have DF.TELECOM(7f10) and even DF.GSM(7f20) with a limited subset of active EFs. The content of DF.CDMA is specified in 3GPP2 C.S0023-D. This patch adds a very limited card profile for R-UIM, including auto- detecion and a few EF definitions under DF.CDMA. This may be useful for people willing to explore or backup their R-UIMs. To me this was useful for playing with an R-UIM card from Skylink [1] - a Russian MNO, which provided 450 MHz CDMA coverage until 2016. [1] https://en.wikipedia.org/wiki/Sky_Link_(Russia) Change-Id: Iacdebdbc514d1cd1910d173d81edd28578ec436a --- M pySim-shell.py A pySim/cdma_ruim.py M pySim/profile.py M pySim/ts_51_011.py 4 files changed, 233 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/07/32407/1 diff --git a/pySim-shell.py b/pySim-shell.py index d09b45a..bf97b6f 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -44,6 +44,7 @@ from pySim.filesystem import RuntimeState, CardDF, CardADF, CardModel from pySim.profile import CardProfile +from pySim.cdma_ruim import CardProfileRUIM from pySim.ts_102_221 import CardProfileUICC from pySim.ts_102_222 import Ts102222Commands from pySim.ts_31_102 import CardApplicationUSIM diff --git a/pySim/cdma_ruim.py b/pySim/cdma_ruim.py new file mode 100644 index 0000000..3fab558 --- /dev/null +++ b/pySim/cdma_ruim.py @@ -0,0 +1,193 @@ +# coding=utf-8 +"""R-UIM (Removable User Identity Module) card profile (see 3GPP2 C.S0023-D) + +(C) 2023 by Vadim Yanitskiy <fixeria(a)osmocom.org> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +""" + +import enum + +from pySim.utils import * +from pySim.filesystem import * +from pySim.profile import match_ruim +from pySim.profile import CardProfile +from pySim.ts_51_011 import CardProfileSIM +from pySim.ts_51_011 import DF_TELECOM, DF_GSM +from pySim.ts_51_011 import EF_ServiceTable +from pySim.construct import * +from construct import * + + +# Mapping between CDMA Service Number and its description +EF_CST_map = { + 1 : 'CHV disable function', + 2 : 'Abbreviated Dialing Numbers (ADN)', + 3 : 'Fixed Dialing Numbers (FDN)', + 4 : 'Short Message Storage (SMS)', + 5 : 'HRPD', + 6 : 'Enhanced Phone Book', + 7 : 'Multi Media Domain (MMD)', + 8 : 'SF_EUIMID-based EUIMID', + 9 : 'MEID Support', + 10 : 'Extension1', + 11 : 'Extension2', + 12 : 'SMS Parameters', + 13 : 'Last Number Dialled (LND)', + 14 : 'Service Category Program for BC-SMS', + 15 : 'Messaging and 3GPD Extensions', + 16 : 'Root Certificates', + 17 : 'CDMA Home Service Provider Name', + 18 : 'Service Dialing Numbers (SDN)', + 19 : 'Extension3', + 20 : '3GPD-SIP', + 21 : 'WAP Browser', + 22 : 'Java', + 23 : 'Reserved for CDG', + 24 : 'Reserved for CDG', + 25 : 'Data Download via SMS Broadcast', + 26 : 'Data Download via SMS-PP', + 27 : 'Menu Selection', + 28 : 'Call Control', + 29 : 'Proactive R-UIM', + 30 : 'AKA', + 31 : 'IPv6', + 32 : 'RFU', + 33 : 'RFU', + 34 : 'RFU', + 35 : 'RFU', + 36 : 'RFU', + 37 : 'RFU', + 38 : '3GPD-MIP', + 39 : 'BCMCS', + 40 : 'Multimedia Messaging Service (MMS)', + 41 : 'Extension 8', + 42 : 'MMS User Connectivity Parameters', + 43 : 'Application Authentication', + 44 : 'Group Identifier Level 1', + 45 : 'Group Identifier Level 2', + 46 : 'De-Personalization Control Keys', + 47 : 'Cooperative Network List', +} + + +###################################################################### +# DF.CDMA +###################################################################### + +class EF_SPN(TransparentEF): + '''3.4.31 CDMA Home Service Provider Name''' + + _test_de_encode = [ + ( "010801536b796c696e6b204e57ffffffffffffffffffffffffffffffffffffffffffff", + { 'rfu0' : 0, 'show_in_hsa' : True, 'rfu2' : 0, + 'char_encoding' : 8, 'lang_ind' : 1, 'spn' : 'Skylink NW' } ), + ] + + def __init__(self, fid='6f41', sfid=None, name='EF.SPN', + desc='Service Provider Name', size=(35, 35), **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) + self._construct = BitStruct( + # Byte 1: Display Condition + 'rfu1'/BitsRFU(7), + 'show_in_hsa'/Flag, + # Byte 2: Character Encoding + 'rfu2'/BitsRFU(3), + 'char_encoding'/BitsInteger(5), # see C.R1001-G + # Byte 3: Language Indicator + 'lang_ind'/BitsInteger(8), # see C.R1001-G + # Bytes 4-35: Service Provider Name + 'spn'/Bytewise(GsmString(32)) + ) + +class EF_AD(TransparentEF): + '''3.4.33 Administrative Data''' + + _test_de_encode = [ + ( "000000", { 'ms_operation_mode' : 'normal', 'additional_info' : '0000', 'rfu' : '' } ), + ] + + class OP_MODE(enum.IntEnum): + normal = 0x00 + type_approval = 0x80 + normal_and_specific_facilities = 0x01 + type_approval_and_specific_facilities = 0x81 + maintenance_off_line = 0x02 + cell_test = 0x04 + + def __init__(self, fid='6f43', sfid=None, name='EF.AD', + desc='Service Provider Name', size=(3, None), **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) + self._construct = Struct( + # Byte 1: Display Condition + 'ms_operation_mode'/Enum(Byte, self.OP_MODE), + # Bytes 2-3: Additional information + 'additional_info'/Bytes(2), + # Bytes 4..: RFU + 'rfu'/GreedyBytesRFU, + ) + + +class EF_SMS(LinFixedEF): + '''3.4.27 Short Messages''' + def __init__(self, fid='6f3c', sfid=None, name='EF.SMS', desc='Short messages', **kwargs): + super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len=(2, 255), **kwargs) + self._construct = Struct( + # Byte 1: Status + 'status'/BitStruct( + 'rfu87'/BitsRFU(2), + 'protection'/Flag, + 'rfu54'/BitsRFU(2), + 'status'/FlagsEnum(BitsInteger(2), read=0, to_be_read=1, sent=2, to_be_sent=3), + 'used'/Flag, + ), + # Byte 2: Length + 'length'/Int8ub, + # Bytes 3..: SMS Transport Layer Message + 'tpdu'/Bytes(lambda ctx: ctx.length if ctx.status.used else 0), + ) + + +class DF_CDMA(CardDF): + def __init__(self): + super().__init__(fid='7f25', name='DF.CDMA', + desc='CDMA related files (3GPP2 C.S0023-D)') + files = [ + # TODO: lots of other files + EF_ServiceTable('6f32', None, 'EF.CST', + 'CDMA Service Table', table=EF_CST_map, size=(5, 16)), + EF_SPN(), + EF_AD(), + EF_SMS(), + ] + self.add_files(files) + + +class CardProfileRUIM(CardProfile): + '''R-UIM card profile as per 3GPP2 C.S0023-D''' + + ORDER = 2 + + def __init__(self): + super().__init__('R-UIM', desc='CDMA R-UIM Card', cla="a0", + sel_ctrl="0000", files_in_mf=[DF_TELECOM(), DF_GSM(), DF_CDMA()]) + + @staticmethod + def decode_select_response(resp_hex: str) -> object: + # TODO: Response parameters/data in case of DF_CDMA (section 2.6) + return CardProfileSIM.decode_select_response(resp_hex) + + @staticmethod + def match_with_card(scc: SimCardCommands) -> bool: + return match_ruim(scc) diff --git a/pySim/profile.py b/pySim/profile.py index c535bac..e464e1f 100644 --- a/pySim/profile.py +++ b/pySim/profile.py @@ -26,9 +26,12 @@ from pySim.utils import all_subclasses import abc import operator +from typing import List -def _mf_select_test(scc: SimCardCommands, cla_byte: str, sel_ctrl: str) -> bool: +def _mf_select_test(scc: SimCardCommands, + cla_byte: str, sel_ctrl: str, + fids: List[str]) -> bool: cla_byte_bak = scc.cla_byte sel_ctrl_bak = scc.sel_ctrl scc.reset_card() @@ -37,7 +40,8 @@ scc.sel_ctrl = sel_ctrl rc = True try: - scc.select_file('3f00') + for fid in fids: + scc.select_file(fid) except: rc = False @@ -51,7 +55,7 @@ """ Try to access MF via UICC APDUs (3GPP TS 102.221), if this works, the card is considered a UICC card. """ - return _mf_select_test(scc, "00", "0004") + return _mf_select_test(scc, "00", "0004", ["3f00"]) def match_sim(scc: SimCardCommands) -> bool: @@ -59,7 +63,14 @@ is also a simcard. This will be the case for most UICC cards, but there may also be plain UICC cards without 2G support as well. """ - return _mf_select_test(scc, "a0", "0000") + return _mf_select_test(scc, "a0", "0000", ["3f00"]) + + +def match_ruim(scc: SimCardCommands) -> bool: + """ Try to access MF/DF.CDMA via 2G APDUs (3GPP TS 11.11), if this works, + the card is considered an R-UIM card for CDMA. + """ + return _mf_select_test(scc, "a0", "0000", ["3f00", "7f25"]) class CardProfile: diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 222bdaf..e9f0945 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -1200,7 +1200,7 @@ class CardProfileSIM(CardProfile): - ORDER = 2 + ORDER = 3 def __init__(self): sw = { -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iacdebdbc514d1cd1910d173d81edd28578ec436a Gerrit-Change-Number: 32407 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSL_Types: Add (most) VGCS/VBS related IEs + Messages

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404 ) Change subject: RSL_Types: Add (most) VGCS/VBS related IEs + Messages ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File library/RSL_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404/comment/5ac1e499_c910… PS1, Line 2762: ts_RslChanNr_PCH_AGCH This can probably work fine, but still it's better to avoid using send templates in definitions of receive templates. In this case there is `t_RslChanNr_PCH_AGCH`. Also applies to fields below. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32404 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: I4c4a9ac1bbd5114cb2237ea282d7bace13a52abe Gerrit-Change-Number: 32404 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 22 Apr 2023 06:08:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: flags: ensure completeness of bts_impl_flag_desc[]

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32334 ) Change subject: flags: ensure completeness of bts_impl_flag_desc[] ...................................................................... flags: ensure completeness of bts_impl_flag_desc[] Change-Id: I049df344c8c0b0d6cd122e2f2d705e0f7ee5990c --- M src/common/bts.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/bts.c b/src/common/bts.c index e50eaf8..242c5dd 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -207,6 +207,9 @@ { 0, NULL } }; +/* Ensure that all BTS_INTERNAL_FLAG_* entries are present in bts_impl_flag_desc[] */ +osmo_static_assert(ARRAY_SIZE(bts_impl_flag_desc) == _BTS_INTERNAL_FLAG_NUM + 1, _bts_impl_flag_desc); + static int gsm_bts_talloc_destructor(struct gsm_bts *bts) { if (bts->mo.fi) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I049df344c8c0b0d6cd122e2f2d705e0f7ee5990c Gerrit-Change-Number: 32334 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: flags: group BTS_INTERNAL_FLAG_* into an enum

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32333 ) Change subject: flags: group BTS_INTERNAL_FLAG_* into an enum ...................................................................... flags: group BTS_INTERNAL_FLAG_* into an enum Change-Id: I4c7d9f6dce61f7690b86c3973b13ddb63cdace04 --- M include/osmo-bts/bts.h M src/common/vty.c 2 files changed, 30 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 6b5fe6f..0fff2a5 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -53,24 +53,28 @@ }; const char *btsvariant2str(enum gsm_bts_type_variant v); -/* TODO: add a brief description of this flag */ -#define BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP (1 << 0) -/* When this flag is set then the measurement data is included in - * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the - * measurement data is passed using a separate MPH INFO MEAS IND. - * (See also ticket: OS#2977) */ -#define BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB (1 << 1) -/* Whether the BTS model requires RadioCarrier MO to be in Enabled state - * (OPSTARTed) before OPSTARTing the RadioChannel MOs. See OS#5157 */ -#define BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER (1 << 2) -/* Whether the BTS model reports interference measurements to L1SAP. */ -#define BTS_INTERNAL_FLAG_INTERF_MEAS (1 << 3) +enum bts_impl_flag { + /* TODO: add a brief description of this flag */ + BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP, + /* When this flag is set then the measurement data is included in + * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the + * measurement data is passed using a separate MPH INFO MEAS IND. + * (See also ticket: OS#2977) */ + BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB, + /* Whether the BTS model requires RadioCarrier MO to be in Enabled state + * (OPSTARTed) before OPSTARTing the RadioChannel MOs. See OS#5157 */ + BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER, + /* Whether the BTS model reports interference measurements to L1SAP. */ + BTS_INTERNAL_FLAG_INTERF_MEAS, + + _BTS_INTERNAL_FLAG_NUM, /* must be at the end */ +}; /* BTS implementation flags (internal use, not exposed via OML) */ #define bts_internal_flag_get(bts, flag) \ - ((bts->flags & (typeof(bts->flags)) flag) != 0) + ((bts->flags & (typeof(bts->flags))(1 << flag)) != 0) #define bts_internal_flag_set(bts, flag) \ - bts->flags |= (typeof(bts->flags)) flag + bts->flags |= (typeof(bts->flags))(1 << flag) struct gprs_rlc_cfg { uint16_t parameter[_NUM_RLC_PAR]; diff --git a/src/common/vty.c b/src/common/vty.c index 331d27d..b17800c 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1228,10 +1228,10 @@ vty_out(vty, " BTS model specific (internal) flags:%s", VTY_NEWLINE); - for (i = 0, no_features = true; i < sizeof(bts->flags) * 8; i++) { - if (bts_internal_flag_get(bts, (1 << i))) { + for (i = 0, no_features = true; i < _BTS_INTERNAL_FLAG_NUM; i++) { + if (bts_internal_flag_get(bts, i)) { vty_out(vty, " %03u ", i); - vty_out(vty, "%-40s%s", get_value_string(bts_impl_flag_desc, (1 << i)), VTY_NEWLINE); + vty_out(vty, "%-40s%s", get_value_string(bts_impl_flag_desc, i), VTY_NEWLINE); no_features = false; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4c7d9f6dce61f7690b86c3973b13ddb63cdace04 Gerrit-Change-Number: 32333 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023