November 2024 - gerrit-log - lists.osmocom.org

[XS] Change in libosmo-netif[master]: stream_cli: Announce failed connect() if reconnect is disabled

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38893?usp=email ) Change subject: stream_cli: Announce failed connect() if reconnect is disabled ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38893?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I69a5f7c3c7cea97d31e2fa03e8c32ce806285eb6 Gerrit-Change-Number: 38893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 15:07:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: stream_cli: Log all code paths ending up in close/reconnect

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38892?usp=email ) Change subject: stream_cli: Log all code paths ending up in close/reconnect ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6debc5de193d99919fe858befd905223ef965d81 Gerrit-Change-Number: 38892 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 15:06:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: stream: Improve logging around recv() failure

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38891?usp=email ) Change subject: stream: Improve logging around recv() failure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic050e7141b029d984fbbcc76ffc175f8e6b01664 Gerrit-Change-Number: 38891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 15:04:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip: Fix computation of file content

by laforge

laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/pysim/+/38898?usp=email ) Change subject: esim.saip: Fix computation of file content ...................................................................... esim.saip: Fix computation of file content When generating the file content (body), we need to proceed in the following order: 1a) If FCP contains fillPattern/repeatPattern, compute file content from those 1b) If FCP doesn't contain fillPattern/repeatPattern but template exists, compute file content from template 2) Apply any fillFileConten / fillFileOffset from the SAIP File on top of the above Change-Id: I822bb5fbec11a3be35910a496af7168458fd949c Closes: OS#6642 --- M pySim/esim/saip/__init__.py M pySim/ts_102_222.py 2 files changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/98/38898/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I822bb5fbec11a3be35910a496af7168458fd949c Gerrit-Change-Number: 38898 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: stream: Explicitly document MSG_NOTIFICATION case in recv() API

by osmith

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38890?usp=email ) Change subject: stream: Explicitly document MSG_NOTIFICATION case in recv() API ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38890?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4fa70ae3f704d2379982153b5630009c13a6f316 Gerrit-Change-Number: 38890 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 15:03:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in libosmocore[master]: gsmtap: Increase txqueue max_length from 64 to 1024

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/38887?usp=email ) Change subject: gsmtap: Increase txqueue max_length from 64 to 1024 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie737e1d060ea3ee48631604bbae1b8b84cf787b9 Gerrit-Change-Number: 38887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 15:02:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in pysim[master]: esim.saip: Compute number of records from efFileSize and record_len

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38897?usp=email ) Change subject: esim.saip: Compute number of records from efFileSize and record_len ...................................................................... esim.saip: Compute number of records from efFileSize and record_len If we know the efFileSize and record_len, but Fcp doesn't contain the number of records, we can simply compute it. Change-Id: I0cc8e7241e37ee23df00c2622422904e7ccdca77 --- M pySim/esim/saip/__init__.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/97/38897/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 6707802..3490f64 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -276,12 +276,15 @@ self.shareable = fdb_dec['shareable'] if fdb_dec['file_type'] == 'working_ef': efFileSize = fileDescriptor.get('efFileSize', None) - if efFileSize: - self._file_size = self._decode_file_size(efFileSize) if fd_dec['num_of_rec']: self.nb_rec = fd_dec['num_of_rec'] if fd_dec['record_len']: self.rec_len = fd_dec['record_len'] + if efFileSize: + self._file_size = self._decode_file_size(efFileSize) + if self.rec_len and self.nb_rec == None: + # compute the number of records from file size and record length + self.nb_rec = self._file_size // self.rec_len if fdb_dec['structure'] == 'linear_fixed': self.file_type = 'LF' elif fdb_dec['structure'] == 'cyclic': -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0cc8e7241e37ee23df00c2622422904e7ccdca77 Gerrit-Change-Number: 38897 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip: Fix parsing/generating fillPattern + repeatPattern

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38895?usp=email ) Change subject: esim.saip: Fix parsing/generating fillPattern + repeatPattern ...................................................................... esim.saip: Fix parsing/generating fillPattern + repeatPattern So far we only thought of default filling coming from a template. However, filling can happen from the Fcp, and we need to properly parse and [re-]encode that information. Change-Id: Iff339cbe841112a01c9c617f43b0e69df2521b51 Related: OS#6643 --- M pySim/esim/saip/__init__.py 1 file changed, 13 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/38895/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 658810a..3c46ef8 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -116,6 +116,8 @@ self.high_update: bool = False self.shareable: bool = True self.df_name = None + self.fill_pattern = None + self.fill_pattern_repeat = False # apply some defaults from profile if self.template: self.from_template(self.template) @@ -174,8 +176,6 @@ self.fid = template.fid self.sfi = template.sfi self.arr = template.arr - #self.default_val = template.default_val - #self.default_val_repeat = template.default_val_repeat if hasattr(template, 'rec_len'): self.rec_len = template.rec_len else: @@ -234,14 +234,11 @@ fileDescriptor['fileDescriptor'] = build_construct(FileDescriptor._construct, fd_dict) if self.high_update: pefi['specialFileInformation'] = b'\x80' # TS 102 222 Table 5 - try: - if self.template and self.template.default_val_repeat: - pefi['repeatPattern'] = self.template.expand_default_value_pattern() - elif self.template and self.template.default_val: - pefi['fillPattern'] = self.template.expand_default_value_pattern() - except ValueError: - # ignore this here as without a file or record length we cannot do this - pass + if self.fill_pattern: + if not self.fill_pattern_repeat: + pefi['fillPattern'] = self.fill_pattern + else: + pefi['repeatPattern'] = self.fill_pattern if len(pefi.keys()): # TODO: When overwriting the default "proprietaryEFInfo" for a template EF for which a # default fill or repeat pattern is defined; it is hence recommended to provide the @@ -292,11 +289,13 @@ specialFileInformation = pefi.get('specialFileInformation', None) if specialFileInformation: if specialFileInformation[0] & 0x80: - self.hihgi_update = True + self.high_update = True if 'repeatPattern' in pefi: - self.repeat_pattern = pefi['repeatPattern'] - if 'defaultPattern' in pefi: - self.repeat_pattern = pefi['defaultPattern'] + self.fill_pattern = pefi['repeatPattern'] + self.fill_pattern_repeat = True + if 'fillPattern' in pefi: + self.fill_pattern = pefi['fillPattern'] + self.fill_pattern_repeat = False elif fdb_dec['file_type'] == 'df': # only set it, if an earlier call to from_template() didn't alrady set it, as # the template can differentiate between MF, DF and ADF (unlike FDB) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38895?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iff339cbe841112a01c9c617f43b0e69df2521b51 Gerrit-Change-Number: 38895 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[S] Change in pysim[master]: pySim.esim.saip: Treat "Readable and Updateable when deactivated" flag

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38896?usp=email ) Change subject: pySim.esim.saip: Treat "Readable and Updateable when deactivated" flag ...................................................................... pySim.esim.saip: Treat "Readable and Updateable when deactivated" flag There's a second flag hidden in the TS 102 222 "Special File Information"; let's parse + re-encode it properly. Change-Id: I7644d265f746c662b64f7156b3be08a01e3a97aa Related: OS#6643 --- M pySim/esim/saip/__init__.py 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/96/38896/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 3c46ef8..6707802 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -114,6 +114,7 @@ self.nb_rec: Optional[int] = None self._file_size = 0 self.high_update: bool = False + self.read_and_update_when_deact: bool = False self.shareable: bool = True self.df_name = None self.fill_pattern = None @@ -194,6 +195,7 @@ fileDescriptor = {} fdb_dec = {} pefi = {} + spfi = 0 if self.fid: fileDescriptor['fileID'] = self.fid.to_bytes(2, 'big') if self.sfi: @@ -233,7 +235,11 @@ if len(fd_dict): fileDescriptor['fileDescriptor'] = build_construct(FileDescriptor._construct, fd_dict) if self.high_update: - pefi['specialFileInformation'] = b'\x80' # TS 102 222 Table 5 + spfi |= 0x80 # TS 102 222 Table 5 + if self.read_and_update_when_deact: + spfi |= 0x40 # TS 102 222 Table 5 + if spfi != 0x00: + pefi['specialFileInformation'] = spfi.to_bytes(1) if self.fill_pattern: if not self.fill_pattern_repeat: pefi['fillPattern'] = self.fill_pattern @@ -288,8 +294,11 @@ self._file_size = self._decode_file_size(pefi['maximumFileSize']) specialFileInformation = pefi.get('specialFileInformation', None) if specialFileInformation: + # TS 102 222 Table 5 if specialFileInformation[0] & 0x80: self.high_update = True + if specialFileInformation[0] & 0x40: + self.read_and_update_when_deact = True if 'repeatPattern' in pefi: self.fill_pattern = pefi['repeatPattern'] self.fill_pattern_repeat = True -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38896?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7644d265f746c662b64f7156b3be08a01e3a97aa Gerrit-Change-Number: 38896 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip: Fix computation of file content

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38898?usp=email ) Change subject: esim.saip: Fix computation of file content ...................................................................... esim.saip: Fix computation of file content When generating the file content (body), we need to proceed in the following order: 1a) If FCP contains fillPattern/repeatPattern, compute file content from those 1b) If FCP doesn't contain fillPattern/repeatPattern but template exists, compute file content from template 2) Apply any fillFileConten / fillFileOffset from the SAIP File on top of the above Change-Id: I822bb5fbec11a3be35910a496af7168458fd949c Closes: #6642 --- M pySim/esim/saip/__init__.py M pySim/ts_102_222.py 2 files changed, 27 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/98/38898/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 3490f64..355e6b9 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -18,6 +18,7 @@ import logging import abc import io +import os from typing import Tuple, List, Optional, Dict, Union from collections import OrderedDict import asn1tools @@ -25,6 +26,7 @@ from osmocom.tlv import BER_TLV_IE, bertlv_parse_tag, bertlv_parse_len from osmocom.construct import build_construct, parse_construct, GreedyInteger +from pySim import ts_102_222 from pySim.utils import dec_imsi from pySim.ts_102_221 import FileDescriptor from pySim.filesystem import CardADF, Path @@ -352,18 +354,29 @@ ret += self.file_content_to_tuples() return ret - @staticmethod - def file_content_from_tuples(l: List[Tuple]) -> Optional[bytes]: + def expand_fill_pattern(self) -> bytes: + """Expand the fill/repeat pattern as per TS 102 222 Section 6.3.2.2.2""" + return ts_102_222.expand_pattern(self.fill_pattern, self.fill_pattern_repeat, self.file_size) + + def file_content_from_tuples(self, l: List[Tuple]) -> Optional[bytes]: """linearize a list of fillFileContent / fillFileOffset tuples into a stream of bytes.""" stream = io.BytesIO() + # Providing file content within "fillFileContent" / "fillFileOffset" shall have the same effect as + # creating a file with a fill/repeat pattern and thereafter updating the content via Update. + # Step 1: Fill with pattern from Fcp or Template + if self.fill_pattern: + stream.write(self.expand_fill_pattern()) + elif self.template and self.template.default_val: + stream.write(self.template.expand_default_value_pattern(self.file_size)) + stream.seek(0) + # then process the fillFileContent/fillFileOffset for k, v in l: if k == 'doNotCreate': return None if k == 'fileDescriptor': pass elif k == 'fillFileOffset': - # FIXME: respect the fillPattern! - stream.write(b'\xff' * v) + stream.seek(v, os.SEEK_CUR) elif k == 'fillFileContent': stream.write(v) else: diff --git a/pySim/ts_102_222.py b/pySim/ts_102_222.py index e54c196..74eb2c3 100644 --- a/pySim/ts_102_222.py +++ b/pySim/ts_102_222.py @@ -25,6 +25,16 @@ from pySim.ts_102_221 import * +def expand_pattern(pattern: bytes, repeat: bool, size: int) -> bytes: + """Expand the fill/repeat pattern as per TS 102 222 Section 6.3.2.2.2 Tags C1/C2.""" + if not repeat: + pad_len = size - len(pattern) + return pattern + pattern[-1:] * pad_len + else: + count = size // len(pattern) + part_len = size - count * len(pattern) + return pattern * count + pattern[:part_len] + @with_default_category('TS 102 222 Administrative Commands') class Ts102222Commands(CommandSet): """Administrative commands for telecommunication applications.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I822bb5fbec11a3be35910a496af7168458fd949c Gerrit-Change-Number: 38898 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024