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

[S] Change in osmo-cbc[master]: cbc-apitool: Make character set configurable
by laforge 19 Oct '23

19 Oct '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34812?usp=email ) Change subject: cbc-apitool: Make character set configurable ...................................................................... cbc-apitool: Make character set configurable osmo-cbc already supported the transmission of UCS2 characters for quite some time. However, the cbc-apitool didn't expose this capability so far. Change-Id: Ia7291238f3b0af8ff9f476fce9a7805e12821d8c Related: OS#6028 --- M contrib/cbc-apitool.py M doc/manuals/chapters/cbc-apitool.adoc 2 files changed, 18 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/cbc-apitool.py b/contrib/cbc-apitool.py index 299846a..918119f 100755 --- a/contrib/cbc-apitool.py +++ b/contrib/cbc-apitool.py @@ -63,7 +63,7 @@ }, 'payload': { 'payload_decoded': { - 'character_set': "gsm", + 'character_set': args.character_set, #'language': 'en', 'data_utf8': args.payload_data_utf8, #'data_utf8': "Mahlzeit1 Mahlzeit2 Mahlzeit3 Mahlzeit4 Mahlzeit5 Mahlzeit6 Mahlzeit7 Mahlzeit8" @@ -126,6 +126,7 @@ parser_c_cbs.add_argument("--repetition-period", type=int, help='Repetition Period', default=5) parser_c_cbs.add_argument("--num-of-bcast", type=int, help='Number of Broadcasts', default=999) parser_c_cbs.add_argument("--payload-data-utf8", type=str, help='Payload Data in UTF8', required=True) + parser_c_cbs.add_argument("--character-set", type=str, help='Character Set', default="gsm", choices=["gsm","ucs2","8bit"]) parser_c_cbs.set_defaults(func=do_create_cbs) parser_c_etws = subparsers.add_parser('create-etws', help='Create a new ETWS message') diff --git a/doc/manuals/chapters/cbc-apitool.adoc b/doc/manuals/chapters/cbc-apitool.adoc index 145d845..fc435a6 100644 --- a/doc/manuals/chapters/cbc-apitool.adoc +++ b/doc/manuals/chapters/cbc-apitool.adoc @@ -50,6 +50,8 @@ *--payload-data-utf8 PAYLOAD_DATA_UTF8*:: Payload data (typically text message) in UTF8 encoding. Will be transcoded to 7bit GSM alphabet internally. +*--character-set {gsm,8bit,ucs2}*:: + Character set to be used for the message. Default: gsm ==== `create-etws` Options -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia7291238f3b0af8ff9f476fce9a7805e12821d8c Gerrit-Change-Number: 34812 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-cbc[master]: cbc-apitool: Make character set configurable
by laforge 19 Oct '23

19 Oct '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34812?usp=email ) Change subject: cbc-apitool: Make character set configurable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia7291238f3b0af8ff9f476fce9a7805e12821d8c Gerrit-Change-Number: 34812 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-Comment-Date: Thu, 19 Oct 2023 07:20:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: Use keyword argument for file description argument
by laforge 18 Oct '23

18 Oct '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34814?usp=email ) Change subject: Use keyword argument for file description argument ...................................................................... Use keyword argument for file description argument While our base classes (TransparentEF / LinFixedEF) always have the dsecription as 4th argument after "fid, sfid, name", most of the derived file-specific classes do not share that same argument order. As seen in the bug fixed by previous Change-Id I7f32c9fd01094620b68b0e54536ecc6cdbe67903 this can have serious consequences. Let's avoid using unnamed (positional) arguments for the description text altogether. Change-Id: Icfb3fd1bae038c54fa14a91aa9f75219d839968c --- M pySim/ts_31_102.py M pySim/ts_51_011.py 2 files changed, 73 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/14/34814/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 5afa2ef..54ff4c8 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1382,47 +1382,46 @@ EF_Keys('6f09', 0x09, 'EF.KeysPS', desc='Ciphering and Integrity Keys for PS domain'), EF_xPLMNwAcT('6f60', 0x0a, 'EF.PLMNwAcT', - 'User controlled PLMN Selector with Access Technology', service=20), + desc='User controlled PLMN Selector with Access Technology', service=20), EF_HPPLMN(), EF_ACMmax(service=13), EF_UST(), CyclicEF('6f39', None, 'EF.ACM', - 'Accumulated call meter', rec_len=(3, 3), service=13), - TransparentEF('6f3e', None, 'EF.GID1', 'Group Identifier Level 1', service=17), - TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2', service=18), + desc='Accumulated call meter', rec_len=(3, 3), service=13), + TransparentEF('6f3e', None, 'EF.GID1', desc='Group Identifier Level 1', service=17), + TransparentEF('6f3f', None, 'EF.GID2', desc='Group Identifier Level 2', service=18), EF_SPN(service=19), TransparentEF('6f41', None, 'EF.PUCT', - 'Price per unit and currency table', size=(5, 5), service=13), + desc='Price per unit and currency table', size=(5, 5), service=13), EF_CBMI(service=15), EF_ACC(sfid=0x06), - EF_PLMNsel('6f7b', 0x0d, 'EF.FPLMN', - 'Forbidden PLMNs', size=(12, None)), + EF_PLMNsel('6f7b', 0x0d, 'EF.FPLMN', desc='Forbidden PLMNs', size=(12, None)), EF_LOCI(), EF_AD(), EF_CBMID(sfid=0x0e, service=29), EF_ECC(), EF_CBMIR(service=16), EF_PSLOCI(), - EF_ADN('6f3b', None, 'EF.FDN', 'Fixed Dialling Numbers', service=[2, 89], ext=2), + EF_ADN('6f3b', None, 'EF.FDN', desc='Fixed Dialling Numbers', service=[2, 89], ext=2), EF_SMS('6f3c', None, service=10), EF_MSISDN(service=21), EF_SMSP(service=12), EF_SMSS(service=10), - EF_ADN('6f49', None, 'EF.SDN', 'Service Dialling Numbers', service=[4, 89], ext=3), - EF_EXT('6f4b', None, 'EF.EXT2', 'Extension2 (FDN)', service=3), - EF_EXT('6f4c', None, 'EF.EXT3', 'Extension2 (SDN)', service=5), + EF_ADN('6f49', None, 'EF.SDN', desc='Service Dialling Numbers', service=[4, 89], ext=3), + EF_EXT('6f4b', None, 'EF.EXT2', desc='Extension2 (FDN)', service=3), + EF_EXT('6f4c', None, 'EF.EXT3', desc='Extension2 (SDN)', service=5), EF_SMSR(service=11), EF_ICI(service=9), EF_OCI(service=8), EF_ICT(service=9), - EF_ICT('6f83', None, 'EF.OCT', 'Outgoing Call Timer', service=8), - EF_EXT('6f4e', None, 'EF.EXT5', 'Extension5 (ICI/OCI/MSISDN)', service=44), + EF_ICT('6f83', None, 'EF.OCT', desc='Outgoing Call Timer', service=8), + EF_EXT('6f4e', None, 'EF.EXT5', desc='Extension5 (ICI/OCI/MSISDN)', service=44), EF_CCP2(service=14), EF_eMLPP(service=24), EF_AAeM(service=25), # EF_Hiddenkey - EF_ADN('6f4d', None, 'EF.BDN', 'Barred Dialling Numbers', service=6, ext=4), - EF_EXT('6f55', None, 'EF.EXT4', 'Extension4 (BDN/SSC)', service=7), + EF_ADN('6f4d', None, 'EF.BDN', desc='Barred Dialling Numbers', service=6, ext=4), + EF_EXT('6f55', None, 'EF.EXT4', desc='Extension4 (BDN/SSC)', service=7), EF_CMI(service=6), EF_EST(service=[2, 6, 34, 35]), EF_ACL(service=35), @@ -1430,52 +1429,52 @@ EF_CNL(service=37), EF_START_HFN(), EF_THRESHOLD(), - EF_xPLMNwAcT('6f61', 0x11, 'EF.OPLMNwAcT', 'User controlled PLMN Selector with Access Technology', service=42), - EF_xPLMNwAcT('6f62', 0x13, 'EF.HPLMNwAcT', 'HPLMN Selector with Access Technology', service=43), + EF_xPLMNwAcT('6f61', 0x11, 'EF.OPLMNwAcT', desc='User controlled PLMN Selector with Access Technology', service=42), + EF_xPLMNwAcT('6f62', 0x13, 'EF.HPLMNwAcT', desc='HPLMN Selector with Access Technology', service=43), EF_ARR('6f06', 0x17), EF_RPLMNAcT(), - TransparentEF('6fc4', None, 'EF.NETPAR', 'Network Parameters'), + TransparentEF('6fc4', None, 'EF.NETPAR', desc='Network Parameters'), EF_PNN('6fc5', 0x19, service=45), EF_OPL(service=46), - EF_ADN('6fc7', None, 'EF.MBDN', 'Mailbox Dialling Numbers', service=47, ext=6), - EF_EXT('6fc8', None, 'EF.EXT6', 'Extension6 (MBDN)'), + EF_ADN('6fc7', None, 'EF.MBDN', desc='Mailbox Dialling Numbers', service=47, ext=6), + EF_EXT('6fc8', None, 'EF.EXT6', desc='Extension6 (MBDN)'), EF_MBI(service=47), EF_MWIS(service=48), - EF_ADN('6fcb', None, 'EF.CFIS', 'Call Forwarding Indication Status', service=49, ext=7), - EF_EXT('6fcc', None, 'EF.EXT7', 'Extension7 (CFIS)'), - TransparentEF('6fcd', None, 'EF.SPDI', 'Service Provider Display Information', service=51), + EF_ADN('6fcb', None, 'EF.CFIS', desc='Call Forwarding Indication Status', service=49, ext=7), + EF_EXT('6fcc', None, 'EF.EXT7', desc='Extension7 (CFIS)'), + TransparentEF('6fcd', None, 'EF.SPDI', desc='Service Provider Display Information', service=51), EF_MMSN(service=52), - EF_EXT('6fcf', None, 'EF.EXT8', 'Extension8 (MMSN)', service=53), + EF_EXT('6fcf', None, 'EF.EXT8', desc='Extension8 (MMSN)', service=53), EF_MMSICP(service=52), EF_MMSUP(service=52), EF_MMSUCP(service=(52, 55)), EF_NIA(service=56, fid='6fd3'), EF_VGCS(service=57), EF_VGCSS(service=57), - EF_VGCS('6fb3', None, 'EF.VBS', 'Voice Broadcast Service', service=58), - EF_VGCSS('6fb4', None, 'EF.VBSS', 'Voice Broadcast Service Status', service=58), + EF_VGCS('6fb3', None, 'EF.VBS', desc='Voice Broadcast Service', service=58), + EF_VGCSS('6fb4', None, 'EF.VBSS', desc='Voice Broadcast Service Status', service=58), EF_VGCSCA(service=64), - EF_VGCSCA('6fd5', None, 'EF.VBCSCA', 'Voice Broadcast Service Ciphering Algorithm', service=65), + EF_VGCSCA('6fd5', None, 'EF.VBCSCA', desc='Voice Broadcast Service Ciphering Algorithm', service=65), EF_GBABP(service=68), EF_MSK(service=69), EF_MUK(service=69), EF_GBANL(service=68), - EF_PLMNsel('6fd9', 0x1d, 'EF.EHPLMN', 'Equivalent HPLMN', size=(12, None), service=71), + EF_PLMNsel('6fd9', 0x1d, 'EF.EHPLMN', desc='Equivalent HPLMN', size=(12, None), service=71), EF_EHPLMNPI(service=(71, 73)), # EF_LRPLMNSI ('6fdc', service=74) EF_NAFKCA(service=(68, 76)), - TransparentEF('6fde', None, 'EF.SPNI', 'Service Provider Name Icon', service=78), - LinFixedEF('6fdf', None, 'EF.PNNI', 'PLMN Network Name Icon', service=79), + TransparentEF('6fde', None, 'EF.SPNI', desc='Service Provider Name Icon', service=78), + LinFixedEF('6fdf', None, 'EF.PNNI', desc='PLMN Network Name Icon', service=79), EF_NCP_IP(service=80), - EF_EPSLOCI('6fe3', 0x1e, 'EF.EPSLOCI', 'EPS location information', service=85), + EF_EPSLOCI('6fe3', 0x1e, 'EF.EPSLOCI', desc='EPS location information', service=85), EF_EPSNSC(service=85), - TransparentEF('6fe6', None, 'EF.UFC', 'USAT Facility Control', size=(1, 16)), - TransparentEF('6fe8', None, 'EF.NASCONFIG', 'Non Access Stratum Configuration', service=96), + TransparentEF('6fe6', None, 'EF.UFC', desc='USAT Facility Control', size=(1, 16)), + TransparentEF('6fe8', None, 'EF.NASCONFIG', desc='Non Access Stratum Configuration', service=96), # UICC IARI (only in cards that have no ISIM) service=95 EF_PWS(service=97), - LinFixedEF('6fed', None, 'EF.FDNURI', 'Fixed Dialling Numbers URI', service=(2, 99)), - LinFixedEF('6fee', None, 'EF.BDNURI', 'Barred Dialling Numbers URI', service=(6, 99)), - LinFixedEF('6fef', None, 'EF.SDNURI', 'Service Dialling Numbers URI', service=(4, 99)), + LinFixedEF('6fed', None, 'EF.FDNURI', desc='Fixed Dialling Numbers URI', service=(2, 99)), + LinFixedEF('6fee', None, 'EF.BDNURI', desc='Barred Dialling Numbers URI', service=(6, 99)), + LinFixedEF('6fef', None, 'EF.SDNURI', desc='Service Dialling Numbers URI', service=(4, 99)), # EF_IWL (IMEI(SV) White List) EF_IPS(), EF_ePDGId(service=(106, 107)), diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index d8cbabd..14db686 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -927,32 +927,32 @@ EF_Kc(), EF_PLMNsel(), TransparentEF('6f31', None, 'EF.HPPLMN', - 'Higher Priority PLMN search period'), + desc='Higher Priority PLMN search period'), EF_ACMmax(), EF_ServiceTable('6f38', None, 'EF.SST', - 'SIM service table', table=EF_SST_map, size=(2, 16)), + desc='SIM service table', table=EF_SST_map, size=(2, 16)), CyclicEF('6f39', None, 'EF.ACM', - 'Accumulated call meter', rec_len=(3, 3)), - TransparentEF('6f3e', None, 'EF.GID1', 'Group Identifier Level 1'), - TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2'), + desc='Accumulated call meter', rec_len=(3, 3)), + TransparentEF('6f3e', None, 'EF.GID1', desc='Group Identifier Level 1'), + TransparentEF('6f3f', None, 'EF.GID2', desc='Group Identifier Level 2'), EF_SPN(), TransparentEF('6f41', None, 'EF.PUCT', - 'Price per unit and currency table', size=(5, 5)), + desc='Price per unit and currency table', size=(5, 5)), EF_CBMI(), TransparentEF('6f74', None, 'EF.BCCH', - 'Broadcast control channels', size=(16, 16)), + desc='Broadcast control channels', size=(16, 16)), EF_ACC(), EF_PLMNsel('6f7b', None, 'EF.FPLMN', - 'Forbidden PLMNs', size=(12, 12)), + desc='Forbidden PLMNs', size=(12, 12)), EF_LOCI(), EF_AD(), TransparentEF('6fae', None, 'EF.Phase', - 'Phase identification', size=(1, 1)), + desc='Phase identification', size=(1, 1)), EF_VGCS(), EF_VGCSS(), - EF_VGCS('6fb3', None, 'EF.VBS', 'Voice Broadcast Service'), + EF_VGCS('6fb3', None, 'EF.VBS', desc='Voice Broadcast Service'), EF_VGCSS('6fb4', None, 'EF.VBSS', - 'Voice Broadcast Service Status'), + desc='Voice Broadcast Service Status'), EF_eMLPP(), EF_AAeM(), EF_CBMID(), @@ -961,29 +961,29 @@ EF_DCK(), EF_CNL(), EF_NIA(), - EF_Kc('6f52', None, 'EF.KcGPRS', 'GPRS Ciphering key KcGPRS'), + EF_Kc('6f52', None, 'EF.KcGPRS', desc='GPRS Ciphering key KcGPRS'), EF_LOCIGPRS(), - TransparentEF('6f54', None, 'EF.SUME', 'SetUpMenu Elements'), + TransparentEF('6f54', None, 'EF.SUME', desc='SetUpMenu Elements'), EF_xPLMNwAcT('6f60', None, 'EF.PLMNwAcT', - 'User controlled PLMN Selector with Access Technology'), + desc='User controlled PLMN Selector with Access Technology'), EF_xPLMNwAcT('6f61', None, 'EF.OPLMNwAcT', - 'Operator controlled PLMN Selector with Access Technology'), + desc='Operator controlled PLMN Selector with Access Technology'), EF_xPLMNwAcT('6f62', None, 'EF.HPLMNwAcT', - 'HPLMN Selector with Access Technology'), + desc='HPLMN Selector with Access Technology'), EF_CPBCCH(), EF_InvScan(), EF_PNN(), EF_OPL(), - EF_ADN('6fc7', None, 'EF.MBDN', 'Mailbox Dialling Numbers'), + EF_ADN('6fc7', None, 'EF.MBDN', desc='Mailbox Dialling Numbers'), EF_MBI(), EF_MWIS(), EF_ADN('6fcb', None, 'EF.CFIS', - 'Call Forwarding Indication Status'), - EF_EXT('6fc8', None, 'EF.EXT6', 'Externsion6 (MBDN)'), - EF_EXT('6fcc', None, 'EF.EXT7', 'Externsion7 (CFIS)'), + desc='Call Forwarding Indication Status'), + EF_EXT('6fc8', None, 'EF.EXT6', desc='Externsion6 (MBDN)'), + EF_EXT('6fcc', None, 'EF.EXT7', desc='Externsion7 (CFIS)'), EF_SPDI(), EF_MMSN(), - EF_EXT('6fcf', None, 'EF.EXT8', 'Extension8 (MMSN)'), + EF_EXT('6fcf', None, 'EF.EXT8', desc='Extension8 (MMSN)'), EF_MMSICP(), EF_MMSUP(), EF_MMSUCP(), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icfb3fd1bae038c54fa14a91aa9f75219d839968c Gerrit-Change-Number: 34814 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: ts_31_102: Fix initialization of file size
by laforge 18 Oct '23

18 Oct '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34813?usp=email ) Change subject: ts_31_102: Fix initialization of file size ...................................................................... ts_31_102: Fix initialization of file size We were using positional arguments when instantiating instances of classes like EF_5GS3GPPLOCI with non-default names/fids/... However, we got the argument order wrong and were passing the description string in the position of the file size, which causes exceptions like the following from pySim-trace: Traceback (most recent call last): File "/home/laforge/projects/git/pysim/./pySim-trace.py", line 198, in <module> tracer.main() File "/home/laforge/projects/git/pysim/./pySim-trace.py", line 125, in main inst.process(self.rs) File "/home/laforge/projects/git/pysim/pySim/apdu/__init__.py", line 259, in process self.processed = method(self.lchan) File "/home/laforge/projects/git/pysim/pySim/apdu/ts_102_221.py", line 152, in process_on_lchan if self.cmd_dict['offset'] != 0 or self.lr < self.file.size[0]: TypeError: '<' not supported between instances of 'int' and 'str' Let's use named initializers for any arguments after the usual "fid, sfid, name" initial arguments. Change-Id: I7f32c9fd01094620b68b0e54536ecc6cdbe67903 --- M pySim/ts_31_102.py 1 file changed, 33 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/13/34813/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index c7a58f1..5afa2ef 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1331,10 +1331,10 @@ # I'm looking at 31.102 R16.6 EF_5GS3GPPLOCI(service=122), EF_5GS3GPPLOCI('4f02', 0x02, 'EF.5GSN3GPPLOCI', - '5GS non-3GPP location information', service=122), + desc='5GS non-3GPP location information', service=122), EF_5GS3GPPNSC(service=122), EF_5GS3GPPNSC('4f04', 0x04, 'EF.5GSN3GPPNSC', - '5GS non-3GPP Access NAS Security Context', service=122), + desc='5GS non-3GPP Access NAS Security Context', service=122), EF_5GAUTHKEYS(service=123), EF_UAC_AIC(service=126), EF_SUCI_Calc_Info(service=124), @@ -1342,7 +1342,7 @@ EF_SUPI_NAI(service=130), EF_Routing_Indicator(service=124), TransparentEF('4F0B', 0x0b, 'EF.URSP', - 'UE Route Selector Policies per PLMN', service=132), + desc='UE Route Selector Policies per PLMN', service=132), EF_TN3GPPSNN(service=133), # Rel-17 additions below EF_CAG(service=137), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34813?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7f32c9fd01094620b68b0e54536ecc6cdbe67903 Gerrit-Change-Number: 34813 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-cbc[master]: cbc-apitool: Make character set configurable
by pespin 18 Oct '23

18 Oct '23

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34812?usp=email ) Change subject: cbc-apitool: Make character set configurable ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-cbc/+/34812/comment/4f82e81f_18737bcf PS1, Line 9: osmo-cbc alrady supported the transmission of UCS2 characters for quite already -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia7291238f3b0af8ff9f476fce9a7805e12821d8c Gerrit-Change-Number: 34812 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 18 Oct 2023 18:09:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-cbc[master]: cbc-apitool: Make character set configurable
by laforge 18 Oct '23

18 Oct '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34812?usp=email ) Change subject: cbc-apitool: Make character set configurable ...................................................................... cbc-apitool: Make character set configurable osmo-cbc alrady supported the transmission of UCS2 characters for quite some time. However, the cbc-apitool didn't expose this capability so far. Change-Id: Ia7291238f3b0af8ff9f476fce9a7805e12821d8c Related: OS#6028 --- M contrib/cbc-apitool.py M doc/manuals/chapters/cbc-apitool.adoc 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/12/34812/1 diff --git a/contrib/cbc-apitool.py b/contrib/cbc-apitool.py index 299846a..918119f 100755 --- a/contrib/cbc-apitool.py +++ b/contrib/cbc-apitool.py @@ -63,7 +63,7 @@ }, 'payload': { 'payload_decoded': { - 'character_set': "gsm", + 'character_set': args.character_set, #'language': 'en', 'data_utf8': args.payload_data_utf8, #'data_utf8': "Mahlzeit1 Mahlzeit2 Mahlzeit3 Mahlzeit4 Mahlzeit5 Mahlzeit6 Mahlzeit7 Mahlzeit8" @@ -126,6 +126,7 @@ parser_c_cbs.add_argument("--repetition-period", type=int, help='Repetition Period', default=5) parser_c_cbs.add_argument("--num-of-bcast", type=int, help='Number of Broadcasts', default=999) parser_c_cbs.add_argument("--payload-data-utf8", type=str, help='Payload Data in UTF8', required=True) + parser_c_cbs.add_argument("--character-set", type=str, help='Character Set', default="gsm", choices=["gsm","ucs2","8bit"]) parser_c_cbs.set_defaults(func=do_create_cbs) parser_c_etws = subparsers.add_parser('create-etws', help='Create a new ETWS message') diff --git a/doc/manuals/chapters/cbc-apitool.adoc b/doc/manuals/chapters/cbc-apitool.adoc index 145d845..fc435a6 100644 --- a/doc/manuals/chapters/cbc-apitool.adoc +++ b/doc/manuals/chapters/cbc-apitool.adoc @@ -50,6 +50,8 @@ *--payload-data-utf8 PAYLOAD_DATA_UTF8*:: Payload data (typically text message) in UTF8 encoding. Will be transcoded to 7bit GSM alphabet internally. +*--character-set {gsm,8bit,ucs2}*:: + Character set to be used for the message. Default: gsm ==== `create-etws` Options -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia7291238f3b0af8ff9f476fce9a7805e12821d8c Gerrit-Change-Number: 34812 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in libgtpnl[master]: gitreview: new file
by osmith 18 Oct '23

18 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34806?usp=email ) Change subject: gitreview: new file ...................................................................... gitreview: new file Change-Id: Iadc35e1a14563516c81d4c845d0d6c5c7fda668a --- A .gitreview 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..512f064 --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=libgtpnl -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34806?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Iadc35e1a14563516c81d4c845d0d6c5c7fda668a Gerrit-Change-Number: 34806 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: transport: print reader device/number on init
by laforge 18 Oct '23

18 Oct '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34686?usp=email ) Change subject: transport: print reader device/number on init ...................................................................... Patch Set 10: (1 comment) Patchset: PS10: the problem here is that this makes sense for the normal user, but doens't make sense in our test setup. Please find a solution for that (like having some command line argument or environment variable that is set in the tests which suppresses certain non-deterministic details in the output). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5c08995fcd55bd9bb173adc2acd9722e438a164b Gerrit-Change-Number: 34686 Gerrit-PatchSet: 10 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 18 Oct 2023 15:09:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: transport: show full traceback on failed reader init
by laforge 18 Oct '23

18 Oct '23

laforge has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/34687?usp=email ) Change subject: transport: show full traceback on failed reader init ...................................................................... Abandoned dexter submitted the new approach here: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46e913a516dbc13f7610512484f515ab25d3fbae Gerrit-Change-Number: 34687 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: abandon

1 0

[M] Change in pysim[master]: transport: do not catch exceptions in init_reader
by laforge 18 Oct '23

18 Oct '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34697?usp=email ) Change subject: transport: do not catch exceptions in init_reader ...................................................................... transport: do not catch exceptions in init_reader We currently catch any exceptions that may occur when the card reader is initialized. Then we print the exception string or the exception type when no string is available. However, a failure during the reader initialization is usually a severe problem, so a traceback would provde a lot of helpful information to debug the issue. So lets not catch any exceptions at this level so that we get the full backtrace. Related: OS#6210 Change-Id: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim/transport/__init__.py 4 files changed, 37 insertions(+), 35 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-prog.py b/pySim-prog.py index a16928c..2911b46 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -794,8 +794,6 @@ # Init card reader driver sl = init_reader(opts) - if sl is None: - exit(1) # Create command layer scc = SimCardCommands(transport=sl) diff --git a/pySim-read.py b/pySim-read.py index bafaf26..d34ddc3 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -74,8 +74,6 @@ # Init card reader driver sl = init_reader(opts) - if sl is None: - exit(1) # Create command layer scc = SimCardCommands(transport=sl) diff --git a/pySim-shell.py b/pySim-shell.py index 56655ba..afc7653 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -1015,8 +1015,6 @@ # Init card reader driver sl = init_reader(opts, proactive_handler = Proact()) - if sl is None: - exit(1) # Create a card handler (for bulk provisioning) if opts.card_handler_config: diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 0b50a4f..581f8e5 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -292,35 +292,26 @@ return arg_parser -def init_reader(opts, **kwargs) -> Optional[LinkBase]: +def init_reader(opts, **kwargs) -> LinkBase: """ Init card reader driver """ - sl = None # type : :Optional[LinkBase] - try: - if opts.pcsc_dev is not None: - print("Using PC/SC reader interface") - from pySim.transport.pcsc import PcscSimLink - sl = PcscSimLink(opts.pcsc_dev, **kwargs) - elif opts.osmocon_sock is not None: - print("Using Calypso-based (OsmocomBB) reader interface") - from pySim.transport.calypso import CalypsoSimLink - sl = CalypsoSimLink(sock_path=opts.osmocon_sock, **kwargs) - elif opts.modem_dev is not None: - print("Using modem for Generic SIM Access (3GPP TS 27.007)") - from pySim.transport.modem_atcmd import ModemATCommandLink - sl = ModemATCommandLink( - device=opts.modem_dev, baudrate=opts.modem_baud, **kwargs) - else: # Serial reader is default - print("Using serial reader interface") - from pySim.transport.serial import SerialSimLink - sl = SerialSimLink(device=opts.device, - baudrate=opts.baudrate, **kwargs) - return sl - except Exception as e: - if str(e): - print("Card reader initialization failed with exception:\n" + str(e)) - else: - print( - "Card reader initialization failed with an exception of type:\n" + str(type(e))) - return None + if opts.pcsc_dev is not None: + print("Using PC/SC reader interface") + from pySim.transport.pcsc import PcscSimLink + sl = PcscSimLink(opts.pcsc_dev, **kwargs) + elif opts.osmocon_sock is not None: + print("Using Calypso-based (OsmocomBB) reader interface") + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock, **kwargs) + elif opts.modem_dev is not None: + print("Using modem for Generic SIM Access (3GPP TS 27.007)") + from pySim.transport.modem_atcmd import ModemATCommandLink + sl = ModemATCommandLink( + device=opts.modem_dev, baudrate=opts.modem_baud, **kwargs) + else: # Serial reader is default + print("Using serial reader interface") + from pySim.transport.serial import SerialSimLink + sl = SerialSimLink(device=opts.device, + baudrate=opts.baudrate, **kwargs) + return sl -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4c4807576fe63cf71a7d33b243a3f8fea0b7ff23 Gerrit-Change-Number: 34697 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0