arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31020 )
Change subject: lint: enable BRACES_NOT_NECESSARY check
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Not sure if it suits our processes to answer here, but since I didn't see a specific issue for this:
Do we also want this check for single statement blocks inside if-else statements with the 'else' or (macro-induced) (for-)loops (e.g. llist_for_each_entry)? Not sure how easy it is to add those checks, but I have just noticed they don't yet exist.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31020
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I481d1b24a909173520a544ffd567bb8357729f2a
Gerrit-Change-Number: 31020
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: arehbein <arehbein(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 24 Jan 2023 22:30:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31055 )
Change subject: Prepare for decoding/encoding records differently based on record number
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/31055
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I02d6942016dd0631b21d1fd301711c13cb27962b
Gerrit-Change-Number: 31055
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 24 Jan 2023 19:56:07 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/31055
to look at the new patch set (#2).
Change subject: Prepare for decoding/encoding records differently based on record number
......................................................................
Prepare for decoding/encoding records differently based on record number
In their infinite wisdom, the authors of the EIRENE FFFIS for GSM-R SIM
cards invented yet a new way of encoding data in SIM card files: The
first record of a file may be encoded differently than further records
of files.
Let's add the required infrastructure to pySim so that the encode and
decode methods for record-oriented files get passed in the current
record number.
Change-Id: I02d6942016dd0631b21d1fd301711c13cb27962b
Related: OS#5784
---
M pySim/apdu/ts_102_221.py
M pySim/filesystem.py
M pySim/sysmocom_sja2.py
M pySim/ts_102_221.py
M pySim/ts_31_102.py
M pySim/ts_31_103.py
M pySim/ts_51_011.py
7 files changed, 46 insertions(+), 42 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/55/31055/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/31055
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I02d6942016dd0631b21d1fd301711c13cb27962b
Gerrit-Change-Number: 31055
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/31070 )
Change subject: ts_51_011: Improve decoding of SELECT response for classic SIM
......................................................................
ts_51_011: Improve decoding of SELECT response for classic SIM
When decoding the SELECT response of a clasic GSM SIM without
UICC functionality, we
* did not decode the record length or number of records
* accidentially reported the EF file_size as available_memory (like DF)
Let's fix those two, and also add a comment on how the output dict
of decode_select_response() should look like.
As a result, code like 'read_records' now knows the number of records
and can iterate over them rather than raising exceptions.
Change-Id: Ia8e890bda74e3b4dacca0673d6e5ed8692dabd87
Closes: OS#5874
---
M pySim/ts_51_011.py
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/70/31070/1
diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py
index b15a7fc..ac92b72 100644
--- a/pySim/ts_51_011.py
+++ b/pySim/ts_51_011.py
@@ -1124,6 +1124,9 @@
@staticmethod
def decode_select_response(resp_hex: str) -> object:
+ # we try to build something that resembles a dict resulting from the TLV decoder
+ # of TS 102.221 (FcpTemplate), so that higher-level code only has to deal with one
+ # format of SELECT response
resp_bin = h2b(resp_hex)
struct_of_file_map = {
0: 'transparent',
@@ -1142,21 +1145,25 @@
'proprietary_info': {},
}
ret['file_id'] = b2h(resp_bin[4:6])
- ret['proprietary_info']['available_memory'] = int.from_bytes(
- resp_bin[2:4], 'big')
file_type = type_of_file_map[resp_bin[6]
] if resp_bin[6] in type_of_file_map else resp_bin[6]
ret['file_descriptor']['file_descriptor_byte']['file_type'] = file_type
if file_type in ['mf', 'df']:
+ ret['proprietary_info']['available_memory'] = int.from_bytes(resp_bin[2:4], 'big')
ret['file_characteristics'] = b2h(resp_bin[13:14])
ret['num_direct_child_df'] = resp_bin[14]
ret['num_direct_child_ef'] = resp_bin[15]
ret['num_chv_unblock_adm_codes'] = int(resp_bin[16])
# CHV / UNBLOCK CHV stats
elif file_type in ['working_ef']:
+ ret['file_size'] = int.from_bytes(resp_bin[2:4], 'big')
file_struct = struct_of_file_map[resp_bin[13]
] if resp_bin[13] in struct_of_file_map else resp_bin[13]
ret['file_descriptor']['file_descriptor_byte']['structure'] = file_struct
+ if file_struct != 'transparent':
+ record_len = resp_bin[14]
+ ret['file_descriptor']['record_len'] = record_len
+ ret['file_descriptor']['num_of_rec'] = ret['file_size'] // record_len
ret['access_conditions'] = b2h(resp_bin[8:10])
if resp_bin[11] & 0x01 == 0:
ret['life_cycle_status_int'] = 'operational_activated'
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/31070
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ia8e890bda74e3b4dacca0673d6e5ed8692dabd87
Gerrit-Change-Number: 31070
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, pespin.
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/31062
to look at the new patch set (#5).
Change subject: Introduce netdev API
......................................................................
Introduce netdev API
This module provides several operations on network devices
(interfaces), like monitoring changes, setting addresses, routes, link
state, etc.
It also supports managing network interfaces on several different netns
concurrently.
These functionalitites will be used by the tun module included in a
follow-up patch.
Change-Id: I7a00c0445a89e088676a4897061b65196d9197f1
---
M TODO-RELEASE
M include/osmocom/core/Makefile.am
A include/osmocom/core/netdev.h
M src/core/Makefile.am
A src/core/netdev.c
5 files changed, 958 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/31062/5
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31062
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7a00c0445a89e088676a4897061b65196d9197f1
Gerrit-Change-Number: 31062
Gerrit-PatchSet: 5
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset