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

[L] Change in pysim[master]: create pySim.legacy.ts_51_011.py and move legacy code there
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33693 ) Change subject: create pySim.legacy.ts_51_011.py and move legacy code there ...................................................................... create pySim.legacy.ts_51_011.py and move legacy code there Those old flat dicts indicating FID to string-name mapping have long been obsoleted by the pySim.filsystem based classes. Change-Id: I20ceea3fdb02ee70d8c8889c078b2e5a0f17c83b --- M pySim-prog.py M pySim-read.py M pySim/legacy/cards.py A pySim/legacy/ts_51_011.py M pySim/ts_51_011.py 5 files changed, 275 insertions(+), 233 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-prog.py b/pySim-prog.py index 2e9d5d7..c07bfd1 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -38,7 +38,8 @@ from pySim.transport import init_reader from pySim.legacy.cards import _cards_classes, card_detect from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc, calculate_luhn, dec_iccid -from pySim.ts_51_011 import EF, EF_AD +from pySim.ts_51_011 import EF_AD +from pySim.legacy.ts_51_011 import EF from pySim.card_handler import * from pySim.utils import * diff --git a/pySim-read.py b/pySim-read.py index 52c60be..74bb35a 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -28,7 +28,8 @@ import random import re import sys -from pySim.ts_51_011 import EF, DF, EF_SST_map, EF_AD +from pySim.ts_51_011 import EF_SST_map, EF_AD +from pySim.legacy.ts_51_011 import EF, DF from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map from pySim.ts_31_103 import EF_IST_map, EF_ISIM_ADF_map diff --git a/pySim/legacy/cards.py b/pySim/legacy/cards.py index e63b044..bb3e8a5 100644 --- a/pySim/legacy/cards.py +++ b/pySim/legacy/cards.py @@ -13,8 +13,9 @@ from pySim.utils import is_hex, h2b, b2h, h2s, s2h, lpad, rpad from pySim.legacy.utils import enc_ePDGSelection, format_xplmn_w_act, format_xplmn, dec_st, enc_st from pySim.legacy.utils import format_ePDGSelection +from pySim.legacy.ts_51_011 import EF, DF -from pySim.ts_51_011 import EF, DF, EF_AD, EF_SPN +from pySim.ts_51_011 import EF_AD, EF_SPN from pySim.ts_31_102 import EF_USIM_ADF_map from pySim.ts_31_103 import EF_ISIM_ADF_map diff --git a/pySim/legacy/ts_51_011.py b/pySim/legacy/ts_51_011.py new file mode 100644 index 0000000..a384b1d --- /dev/null +++ b/pySim/legacy/ts_51_011.py @@ -0,0 +1,257 @@ +# -*- coding: utf-8 -*- + +""" Various constants from 3GPP TS 51.011 used by *legacy* code only. + +This will likely be removed in future versions of pySim. Please instead +use the pySim.filesystem class model with the various profile/application +specific extension modules. +""" + +# Copyright (C) 2017 Alexander.Chemeris <Alexander.Chemeris(a)gmail.com> +# Copyright (C) 2021 Harald Welte <laforge(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/>. + + +MF_num = '3F00' + +DF_num = { + 'TELECOM': '7F10', + + 'GSM': '7F20', + 'IS-41': '7F22', + 'FP-CTS': '7F23', + + 'GRAPHICS': '5F50', + + 'IRIDIUM': '5F30', + 'GLOBST': '5F31', + 'ICO': '5F32', + 'ACeS': '5F33', + + 'EIA/TIA-553': '5F40', + 'CTS': '5F60', + 'SOLSA': '5F70', + + 'MExE': '5F3C', +} + +EF_num = { + # MF + 'ICCID': '2FE2', + 'ELP': '2F05', + 'DIR': '2F00', + + # DF_TELECOM + 'ADN': '6F3A', + 'FDN': '6F3B', + 'SMS': '6F3C', + 'CCP': '6F3D', + 'MSISDN': '6F40', + 'SMSP': '6F42', + 'SMSS': '6F43', + 'LND': '6F44', + 'SMSR': '6F47', + 'SDN': '6F49', + 'EXT1': '6F4A', + 'EXT2': '6F4B', + 'EXT3': '6F4C', + 'BDN': '6F4D', + 'EXT4': '6F4E', + 'CMI': '6F58', + 'ECCP': '6F4F', + + # DF_GRAPHICS + 'IMG': '4F20', + + # DF_SoLSA + 'SAI': '4F30', + 'SLL': '4F31', + + # DF_MExE + 'MExE-ST': '4F40', + 'ORPK': '4F41', + 'ARPK': '4F42', + 'TPRPK': '4F43', + + # DF_GSM + 'LP': '6F05', + 'IMSI': '6F07', + 'Kc': '6F20', + 'DCK': '6F2C', + 'PLMNsel': '6F30', + 'HPPLMN': '6F31', + 'CNL': '6F32', + 'ACMmax': '6F37', + 'SST': '6F38', + 'ACM': '6F39', + 'GID1': '6F3E', + 'GID2': '6F3F', + 'PUCT': '6F41', + 'CBMI': '6F45', + 'SPN': '6F46', + 'CBMID': '6F48', + 'BCCH': '6F74', + 'ACC': '6F78', + 'FPLMN': '6F7B', + 'LOCI': '6F7E', + 'AD': '6FAD', + 'PHASE': '6FAE', + 'VGCS': '6FB1', + 'VGCSS': '6FB2', + 'VBS': '6FB3', + 'VBSS': '6FB4', + 'eMLPP': '6FB5', + 'AAeM': '6FB6', + 'ECC': '6FB7', + 'CBMIR': '6F50', + 'NIA': '6F51', + 'KcGPRS': '6F52', + 'LOCIGPRS': '6F53', + 'SUME': '6F54', + 'PLMNwAcT': '6F60', + 'OPLMNwAcT': '6F61', + # Figure 8 names it HPLMNAcT, but in the text it's names it HPLMNwAcT + 'HPLMNAcT': '6F62', + 'HPLMNwAcT': '6F62', + 'CPBCCH': '6F63', + 'INVSCAN': '6F64', + 'PNN': '6FC5', + 'OPL': '6FC6', + 'MBDN': '6FC7', + 'EXT6': '6FC8', + 'MBI': '6FC9', + 'MWIS': '6FCA', + 'CFIS': '6FCB', + 'EXT7': '6FCC', + 'SPDI': '6FCD', + 'MMSN': '6FCE', + 'EXT8': '6FCF', + 'MMSICP': '6FD0', + 'MMSUP': '6FD1', + 'MMSUCP': '6FD2', +} + +DF = { + 'TELECOM': [MF_num, DF_num['TELECOM']], + + 'GSM': [MF_num, DF_num['GSM']], + 'IS-41': [MF_num, DF_num['IS-41']], + 'FP-CTS': [MF_num, DF_num['FP-CTS']], + + 'GRAPHICS': [MF_num, DF_num['GRAPHICS']], + + 'IRIDIUM': [MF_num, DF_num['IRIDIUM']], + 'GLOBST': [MF_num, DF_num['GLOBST']], + 'ICO': [MF_num, DF_num['ICO']], + 'ACeS': [MF_num, DF_num['ACeS']], + + 'EIA/TIA-553': [MF_num, DF_num['EIA/TIA-553']], + 'CTS': [MF_num, DF_num['CTS']], + 'SoLSA': [MF_num, DF_num['SOLSA']], + + 'MExE': [MF_num, DF_num['MExE']], +} + + +EF = { + 'ICCID': [MF_num, EF_num['ICCID']], + 'ELP': [MF_num, EF_num['ELP']], + 'DIR': [MF_num, EF_num['DIR']], + + 'ADN': DF['TELECOM']+[EF_num['ADN']], + 'FDN': DF['TELECOM']+[EF_num['FDN']], + 'SMS': DF['TELECOM']+[EF_num['SMS']], + 'CCP': DF['TELECOM']+[EF_num['CCP']], + 'MSISDN': DF['TELECOM']+[EF_num['MSISDN']], + 'SMSP': DF['TELECOM']+[EF_num['SMSP']], + 'SMSS': DF['TELECOM']+[EF_num['SMSS']], + 'LND': DF['TELECOM']+[EF_num['LND']], + 'SMSR': DF['TELECOM']+[EF_num['SMSR']], + 'SDN': DF['TELECOM']+[EF_num['SDN']], + 'EXT1': DF['TELECOM']+[EF_num['EXT1']], + 'EXT2': DF['TELECOM']+[EF_num['EXT2']], + 'EXT3': DF['TELECOM']+[EF_num['EXT3']], + 'BDN': DF['TELECOM']+[EF_num['BDN']], + 'EXT4': DF['TELECOM']+[EF_num['EXT4']], + 'CMI': DF['TELECOM']+[EF_num['CMI']], + 'ECCP': DF['TELECOM']+[EF_num['ECCP']], + + 'IMG': DF['GRAPHICS']+[EF_num['IMG']], + + 'SAI': DF['SoLSA']+[EF_num['SAI']], + 'SLL': DF['SoLSA']+[EF_num['SLL']], + + 'MExE-ST': DF['MExE']+[EF_num['MExE-ST']], + 'ORPK': DF['MExE']+[EF_num['ORPK']], + 'ARPK': DF['MExE']+[EF_num['ARPK']], + 'TPRPK': DF['MExE']+[EF_num['TPRPK']], + + 'LP': DF['GSM']+[EF_num['LP']], + 'IMSI': DF['GSM']+[EF_num['IMSI']], + 'Kc': DF['GSM']+[EF_num['Kc']], + 'DCK': DF['GSM']+[EF_num['DCK']], + 'PLMNsel': DF['GSM']+[EF_num['PLMNsel']], + 'HPPLMN': DF['GSM']+[EF_num['HPPLMN']], + 'CNL': DF['GSM']+[EF_num['CNL']], + 'ACMmax': DF['GSM']+[EF_num['ACMmax']], + 'SST': DF['GSM']+[EF_num['SST']], + 'ACM': DF['GSM']+[EF_num['ACM']], + 'GID1': DF['GSM']+[EF_num['GID1']], + 'GID2': DF['GSM']+[EF_num['GID2']], + 'PUCT': DF['GSM']+[EF_num['PUCT']], + 'CBMI': DF['GSM']+[EF_num['CBMI']], + 'SPN': DF['GSM']+[EF_num['SPN']], + 'CBMID': DF['GSM']+[EF_num['CBMID']], + 'BCCH': DF['GSM']+[EF_num['BCCH']], + 'ACC': DF['GSM']+[EF_num['ACC']], + 'FPLMN': DF['GSM']+[EF_num['FPLMN']], + 'LOCI': DF['GSM']+[EF_num['LOCI']], + 'AD': DF['GSM']+[EF_num['AD']], + 'PHASE': DF['GSM']+[EF_num['PHASE']], + 'VGCS': DF['GSM']+[EF_num['VGCS']], + 'VGCSS': DF['GSM']+[EF_num['VGCSS']], + 'VBS': DF['GSM']+[EF_num['VBS']], + 'VBSS': DF['GSM']+[EF_num['VBSS']], + 'eMLPP': DF['GSM']+[EF_num['eMLPP']], + 'AAeM': DF['GSM']+[EF_num['AAeM']], + 'ECC': DF['GSM']+[EF_num['ECC']], + 'CBMIR': DF['GSM']+[EF_num['CBMIR']], + 'NIA': DF['GSM']+[EF_num['NIA']], + 'KcGPRS': DF['GSM']+[EF_num['KcGPRS']], + 'LOCIGPRS': DF['GSM']+[EF_num['LOCIGPRS']], + 'SUME': DF['GSM']+[EF_num['SUME']], + 'PLMNwAcT': DF['GSM']+[EF_num['PLMNwAcT']], + 'OPLMNwAcT': DF['GSM']+[EF_num['OPLMNwAcT']], + # Figure 8 names it HPLMNAcT, but in the text it's names it HPLMNwAcT + 'HPLMNAcT': DF['GSM']+[EF_num['HPLMNAcT']], + 'HPLMNwAcT': DF['GSM']+[EF_num['HPLMNAcT']], + 'CPBCCH': DF['GSM']+[EF_num['CPBCCH']], + 'INVSCAN': DF['GSM']+[EF_num['INVSCAN']], + 'PNN': DF['GSM']+[EF_num['PNN']], + 'OPL': DF['GSM']+[EF_num['OPL']], + 'MBDN': DF['GSM']+[EF_num['MBDN']], + 'EXT6': DF['GSM']+[EF_num['EXT6']], + 'MBI': DF['GSM']+[EF_num['MBI']], + 'MWIS': DF['GSM']+[EF_num['MWIS']], + 'CFIS': DF['GSM']+[EF_num['CFIS']], + 'EXT7': DF['GSM']+[EF_num['EXT7']], + 'SPDI': DF['GSM']+[EF_num['SPDI']], + 'MMSN': DF['GSM']+[EF_num['MMSN']], + 'EXT8': DF['GSM']+[EF_num['EXT8']], + 'MMSICP': DF['GSM']+[EF_num['MMSICP']], + 'MMSUP': DF['GSM']+[EF_num['MMSUP']], + 'MMSUCP': DF['GSM']+[EF_num['MMSUCP']], +} + diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 700fb02..1f98e72 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -41,236 +41,6 @@ from typing import Tuple from pySim.tlv import * from pySim.utils import * -MF_num = '3F00' - -DF_num = { - 'TELECOM': '7F10', - - 'GSM': '7F20', - 'IS-41': '7F22', - 'FP-CTS': '7F23', - - 'GRAPHICS': '5F50', - - 'IRIDIUM': '5F30', - 'GLOBST': '5F31', - 'ICO': '5F32', - 'ACeS': '5F33', - - 'EIA/TIA-553': '5F40', - 'CTS': '5F60', - 'SOLSA': '5F70', - - 'MExE': '5F3C', -} - -EF_num = { - # MF - 'ICCID': '2FE2', - 'ELP': '2F05', - 'DIR': '2F00', - - # DF_TELECOM - 'ADN': '6F3A', - 'FDN': '6F3B', - 'SMS': '6F3C', - 'CCP': '6F3D', - 'MSISDN': '6F40', - 'SMSP': '6F42', - 'SMSS': '6F43', - 'LND': '6F44', - 'SMSR': '6F47', - 'SDN': '6F49', - 'EXT1': '6F4A', - 'EXT2': '6F4B', - 'EXT3': '6F4C', - 'BDN': '6F4D', - 'EXT4': '6F4E', - 'CMI': '6F58', - 'ECCP': '6F4F', - - # DF_GRAPHICS - 'IMG': '4F20', - - # DF_SoLSA - 'SAI': '4F30', - 'SLL': '4F31', - - # DF_MExE - 'MExE-ST': '4F40', - 'ORPK': '4F41', - 'ARPK': '4F42', - 'TPRPK': '4F43', - - # DF_GSM - 'LP': '6F05', - 'IMSI': '6F07', - 'Kc': '6F20', - 'DCK': '6F2C', - 'PLMNsel': '6F30', - 'HPPLMN': '6F31', - 'CNL': '6F32', - 'ACMmax': '6F37', - 'SST': '6F38', - 'ACM': '6F39', - 'GID1': '6F3E', - 'GID2': '6F3F', - 'PUCT': '6F41', - 'CBMI': '6F45', - 'SPN': '6F46', - 'CBMID': '6F48', - 'BCCH': '6F74', - 'ACC': '6F78', - 'FPLMN': '6F7B', - 'LOCI': '6F7E', - 'AD': '6FAD', - 'PHASE': '6FAE', - 'VGCS': '6FB1', - 'VGCSS': '6FB2', - 'VBS': '6FB3', - 'VBSS': '6FB4', - 'eMLPP': '6FB5', - 'AAeM': '6FB6', - 'ECC': '6FB7', - 'CBMIR': '6F50', - 'NIA': '6F51', - 'KcGPRS': '6F52', - 'LOCIGPRS': '6F53', - 'SUME': '6F54', - 'PLMNwAcT': '6F60', - 'OPLMNwAcT': '6F61', - # Figure 8 names it HPLMNAcT, but in the text it's names it HPLMNwAcT - 'HPLMNAcT': '6F62', - 'HPLMNwAcT': '6F62', - 'CPBCCH': '6F63', - 'INVSCAN': '6F64', - 'PNN': '6FC5', - 'OPL': '6FC6', - 'MBDN': '6FC7', - 'EXT6': '6FC8', - 'MBI': '6FC9', - 'MWIS': '6FCA', - 'CFIS': '6FCB', - 'EXT7': '6FCC', - 'SPDI': '6FCD', - 'MMSN': '6FCE', - 'EXT8': '6FCF', - 'MMSICP': '6FD0', - 'MMSUP': '6FD1', - 'MMSUCP': '6FD2', -} - -DF = { - 'TELECOM': [MF_num, DF_num['TELECOM']], - - 'GSM': [MF_num, DF_num['GSM']], - 'IS-41': [MF_num, DF_num['IS-41']], - 'FP-CTS': [MF_num, DF_num['FP-CTS']], - - 'GRAPHICS': [MF_num, DF_num['GRAPHICS']], - - 'IRIDIUM': [MF_num, DF_num['IRIDIUM']], - 'GLOBST': [MF_num, DF_num['GLOBST']], - 'ICO': [MF_num, DF_num['ICO']], - 'ACeS': [MF_num, DF_num['ACeS']], - - 'EIA/TIA-553': [MF_num, DF_num['EIA/TIA-553']], - 'CTS': [MF_num, DF_num['CTS']], - 'SoLSA': [MF_num, DF_num['SOLSA']], - - 'MExE': [MF_num, DF_num['MExE']], -} - - -EF = { - 'ICCID': [MF_num, EF_num['ICCID']], - 'ELP': [MF_num, EF_num['ELP']], - 'DIR': [MF_num, EF_num['DIR']], - - 'ADN': DF['TELECOM']+[EF_num['ADN']], - 'FDN': DF['TELECOM']+[EF_num['FDN']], - 'SMS': DF['TELECOM']+[EF_num['SMS']], - 'CCP': DF['TELECOM']+[EF_num['CCP']], - 'MSISDN': DF['TELECOM']+[EF_num['MSISDN']], - 'SMSP': DF['TELECOM']+[EF_num['SMSP']], - 'SMSS': DF['TELECOM']+[EF_num['SMSS']], - 'LND': DF['TELECOM']+[EF_num['LND']], - 'SMSR': DF['TELECOM']+[EF_num['SMSR']], - 'SDN': DF['TELECOM']+[EF_num['SDN']], - 'EXT1': DF['TELECOM']+[EF_num['EXT1']], - 'EXT2': DF['TELECOM']+[EF_num['EXT2']], - 'EXT3': DF['TELECOM']+[EF_num['EXT3']], - 'BDN': DF['TELECOM']+[EF_num['BDN']], - 'EXT4': DF['TELECOM']+[EF_num['EXT4']], - 'CMI': DF['TELECOM']+[EF_num['CMI']], - 'ECCP': DF['TELECOM']+[EF_num['ECCP']], - - 'IMG': DF['GRAPHICS']+[EF_num['IMG']], - - 'SAI': DF['SoLSA']+[EF_num['SAI']], - 'SLL': DF['SoLSA']+[EF_num['SLL']], - - 'MExE-ST': DF['MExE']+[EF_num['MExE-ST']], - 'ORPK': DF['MExE']+[EF_num['ORPK']], - 'ARPK': DF['MExE']+[EF_num['ARPK']], - 'TPRPK': DF['MExE']+[EF_num['TPRPK']], - - 'LP': DF['GSM']+[EF_num['LP']], - 'IMSI': DF['GSM']+[EF_num['IMSI']], - 'Kc': DF['GSM']+[EF_num['Kc']], - 'DCK': DF['GSM']+[EF_num['DCK']], - 'PLMNsel': DF['GSM']+[EF_num['PLMNsel']], - 'HPPLMN': DF['GSM']+[EF_num['HPPLMN']], - 'CNL': DF['GSM']+[EF_num['CNL']], - 'ACMmax': DF['GSM']+[EF_num['ACMmax']], - 'SST': DF['GSM']+[EF_num['SST']], - 'ACM': DF['GSM']+[EF_num['ACM']], - 'GID1': DF['GSM']+[EF_num['GID1']], - 'GID2': DF['GSM']+[EF_num['GID2']], - 'PUCT': DF['GSM']+[EF_num['PUCT']], - 'CBMI': DF['GSM']+[EF_num['CBMI']], - 'SPN': DF['GSM']+[EF_num['SPN']], - 'CBMID': DF['GSM']+[EF_num['CBMID']], - 'BCCH': DF['GSM']+[EF_num['BCCH']], - 'ACC': DF['GSM']+[EF_num['ACC']], - 'FPLMN': DF['GSM']+[EF_num['FPLMN']], - 'LOCI': DF['GSM']+[EF_num['LOCI']], - 'AD': DF['GSM']+[EF_num['AD']], - 'PHASE': DF['GSM']+[EF_num['PHASE']], - 'VGCS': DF['GSM']+[EF_num['VGCS']], - 'VGCSS': DF['GSM']+[EF_num['VGCSS']], - 'VBS': DF['GSM']+[EF_num['VBS']], - 'VBSS': DF['GSM']+[EF_num['VBSS']], - 'eMLPP': DF['GSM']+[EF_num['eMLPP']], - 'AAeM': DF['GSM']+[EF_num['AAeM']], - 'ECC': DF['GSM']+[EF_num['ECC']], - 'CBMIR': DF['GSM']+[EF_num['CBMIR']], - 'NIA': DF['GSM']+[EF_num['NIA']], - 'KcGPRS': DF['GSM']+[EF_num['KcGPRS']], - 'LOCIGPRS': DF['GSM']+[EF_num['LOCIGPRS']], - 'SUME': DF['GSM']+[EF_num['SUME']], - 'PLMNwAcT': DF['GSM']+[EF_num['PLMNwAcT']], - 'OPLMNwAcT': DF['GSM']+[EF_num['OPLMNwAcT']], - # Figure 8 names it HPLMNAcT, but in the text it's names it HPLMNwAcT - 'HPLMNAcT': DF['GSM']+[EF_num['HPLMNAcT']], - 'HPLMNwAcT': DF['GSM']+[EF_num['HPLMNAcT']], - 'CPBCCH': DF['GSM']+[EF_num['CPBCCH']], - 'INVSCAN': DF['GSM']+[EF_num['INVSCAN']], - 'PNN': DF['GSM']+[EF_num['PNN']], - 'OPL': DF['GSM']+[EF_num['OPL']], - 'MBDN': DF['GSM']+[EF_num['MBDN']], - 'EXT6': DF['GSM']+[EF_num['EXT6']], - 'MBI': DF['GSM']+[EF_num['MBI']], - 'MWIS': DF['GSM']+[EF_num['MWIS']], - 'CFIS': DF['GSM']+[EF_num['CFIS']], - 'EXT7': DF['GSM']+[EF_num['EXT7']], - 'SPDI': DF['GSM']+[EF_num['SPDI']], - 'MMSN': DF['GSM']+[EF_num['MMSN']], - 'EXT8': DF['GSM']+[EF_num['EXT8']], - 'MMSICP': DF['GSM']+[EF_num['MMSICP']], - 'MMSUP': DF['GSM']+[EF_num['MMSUP']], - 'MMSUCP': DF['GSM']+[EF_num['MMSUCP']], -} # Mapping between SIM Service Number and its description EF_SST_map = { -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I20ceea3fdb02ee70d8c8889c078b2e5a0f17c83b Gerrit-Change-Number: 33693 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: cards: cosmetic rename, argument name should be scc, not ssc
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33696 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cards: cosmetic rename, argument name should be scc, not ssc ...................................................................... cards: cosmetic rename, argument name should be scc, not ssc ssc = SimCardCommands Change-Id: I9d690a0a5b9b49ea342728a29b7d4ed10ac31e4e --- M pySim/cards.py 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/cards.py b/pySim/cards.py index d720413..772ea52 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -95,8 +95,8 @@ class UiccCardBase(SimCardBase): name = 'UICC' - def __init__(self, ssc: LinkBase): - super(UiccCardBase, self).__init__(ssc) + def __init__(self, scc: LinkBase): + super(UiccCardBase, self).__init__(scc) self._scc.cla_byte = "00" # See also: ETSI TS 102 221, Table 9.3 self._adm_chv_num = 0xA0 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9d690a0a5b9b49ea342728a29b7d4ed10ac31e4e Gerrit-Change-Number: 33696 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: cdma_ruim: Fix unit tests and actually enable them
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33704 ) Change subject: cdma_ruim: Fix unit tests and actually enable them ...................................................................... cdma_ruim: Fix unit tests and actually enable them As pySim.cdma_ruim was not imported by test_files.py, the unit tests were apparently never executed and hence didn't pass. Let's fix both of those problems. Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 --- M pySim/cdma_ruim.py M tests/test_files.py 2 files changed, 17 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cdma_ruim.py b/pySim/cdma_ruim.py index 3fab558..8b66490 100644 --- a/pySim/cdma_ruim.py +++ b/pySim/cdma_ruim.py @@ -91,7 +91,7 @@ _test_de_encode = [ ( "010801536b796c696e6b204e57ffffffffffffffffffffffffffffffffffffffffffff", - { 'rfu0' : 0, 'show_in_hsa' : True, 'rfu2' : 0, + { 'rfu1' : 0, 'show_in_hsa' : True, 'rfu2' : 0, 'char_encoding' : 8, 'lang_ind' : 1, 'spn' : 'Skylink NW' } ), ] @@ -133,9 +133,9 @@ # Byte 1: Display Condition 'ms_operation_mode'/Enum(Byte, self.OP_MODE), # Bytes 2-3: Additional information - 'additional_info'/Bytes(2), + 'additional_info'/HexAdapter(Bytes(2)), # Bytes 4..: RFU - 'rfu'/GreedyBytesRFU, + 'rfu'/HexAdapter(GreedyBytesRFU), ) diff --git a/tests/test_files.py b/tests/test_files.py index 3fb1062..fe520fb 100755 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -29,6 +29,7 @@ import pySim.ts_51_011 import pySim.sysmocom_sja2 import pySim.gsm_r +import pySim.cdma_ruim def get_qualified_name(c): """return the qualified (by module) name of a class.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 Gerrit-Change-Number: 33704 Gerrit-PatchSet: 3 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 0

[S] Change in pysim[master]: cdma_ruim: Fix unit tests and actually enable them
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33704 ) Change subject: cdma_ruim: Fix unit tests and actually enable them ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 Gerrit-Change-Number: 33704 Gerrit-PatchSet: 3 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 06:29:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in pysim[master]: ts_31_102, ts_31_103: Move legacy-only code to pySim.legacy
by laforge 18 Jul '23

18 Jul '23

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33694 ) Change subject: ts_31_102, ts_31_103: Move legacy-only code to pySim.legacy ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifebfbbc00ef0d01cafd6f058a32d243d3696e97e Gerrit-Change-Number: 33694 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 18 Jul 2023 06:28:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in pysim[master]: create pySim.legacy.ts_51_011.py and move legacy code there
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33693 ) Change subject: create pySim.legacy.ts_51_011.py and move legacy code there ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I20ceea3fdb02ee70d8c8889c078b2e5a0f17c83b Gerrit-Change-Number: 33693 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 06:28:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: osmo-bts-trx: document/clarify the meaning of BUFMAX=24
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33726 ) Change subject: osmo-bts-trx: document/clarify the meaning of BUFMAX=24 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File include/osmo-bts/scheduler.h: https://gerrit.osmocom.org/c/osmo-bts/+/33726/comment/931bc479_60a0588a PS1, Line 135: struct l1sched_meas_set buf[24]; /* up to 24 (BUFMAX) entries */ > As you see, buf if this 24 is directly related to BUFMAX then I really think it makes sense to have […] agreeing, but not blocking. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I95d4e4ee3938cfabc1695959cc82a1efbbf0d7ed Gerrit-Change-Number: 33726 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 06:28:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: ASCI: Add option to switch on or off ASCI support
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: jolly, neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33674 ) Change subject: ASCI: Add option to switch on or off ASCI support ...................................................................... Patch Set 5: (1 comment) File include/osmocom/msc/msc_a.h: https://gerrit.osmocom.org/c/osmo-msc/+/33674/comment/b9bb3ad8_7dcc6550 PS4, Line 220: const char *msc_a_cm_service_type_to_use(struct gsm_network *net, enum osmo_cm_service_type cm_service_type); > I think it makes more sense to have a consistent API where the object pointer is passed, but anyway […] I tend to agree with pespin. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id68deb69f7395f0f8f50b3820e9d51052a34f753 Gerrit-Change-Number: 33674 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 06:26:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: ASCI: Add function to receive VGCS/VBS messages from BSS
by laforge 18 Jul '23

18 Jul '23

Attention is currently required from: jolly, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33504 ) Change subject: ASCI: Add function to receive VGCS/VBS messages from BSS ...................................................................... Patch Set 17: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4a2f19ba75140a6f2de02b709597239c01f02a2 Gerrit-Change-Number: 33504 Gerrit-PatchSet: 17 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 06:25:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-sgsn[master]: gmm: Update DRX params during rx RAU REQ
by laforge 18 Jul '23

18 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/33753 ) Change subject: gmm: Update DRX params during rx RAU REQ ...................................................................... gmm: Update DRX params during rx RAU REQ The DRX params where already parsed in GMM Attached Req and transmitted to PCU over BSSGP DL UD packets, but it was not being updated if the MS changed it during RAU Req. TS 24.008 9.4.14.3 DRX parameter: "This IE shall be included if the MS changes the access network from GSM to UMTS, or the MS wants to indicate new DRX parameters to the network." Change-Id: I1dd7f8f161280dd017c337eacc3aa2be4ccd65ea --- M src/sgsn/gprs_gmm.c 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 547edbb..3cc3055 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1766,6 +1766,10 @@ /* Update the MM context with the new (i.e. foreign) TLLI */ mmctx->gb.tlli = msgb_tlli(msg); } + /* Update the MM context with the new DRX params */ + if (TLVP_PRESENT(&tp, GSM48_IE_GMM_DRX_PARAM)) + memcpy(&mmctx->drx_parms, TLVP_VAL(&tp, GSM48_IE_GMM_DRX_PARAM), sizeof(mmctx->drx_parms)); + /* FIXME: Update the MM context with the MS radio acc capabilities */ /* FIXME: Update the MM context with the MS network capabilities */ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/33753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1dd7f8f161280dd017c337eacc3aa2be4ccd65ea Gerrit-Change-Number: 33753 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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 0