Attention is currently required from: dexter, fixeria, neels.
laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/41690?usp=email )
Change subject: pySim.esim.saip.personalization: Support Milenage customization
......................................................................
Patch Set 2:
(5 comments)
File pySim/esim/saip/personalization.py:
https://gerrit.osmocom.org/c/pysim/+/41690/comment/1948a1f7_972b23ff?usp=em… :
PS1, Line 327: Provided as octet-string concatenation of all 5 constants."""
> Which type exactly goes into the PES? […]
yes, it's 5 bytes, each of which contains an uint8_t whose value shall not exceed 127.
btw, the default value is
```
rotationConstants OCTET STRING (SIZE (5)) DEFAULT '4000204060'H,
```
i.e. this will be used if the user doesn't provide any override for this ConfigurableParameter
https://gerrit.osmocom.org/c/pysim/+/41690/comment/2222a348_b4c93b29?usp=em… :
PS1, Line 331: raise('Length of value must be 5 octets')
> Raise an exception, not a string (linter).
Done
https://gerrit.osmocom.org/c/pysim/+/41690/comment/d2b4dc86_02fd838c?usp=em… :
PS1, Line 340: raise('Length of value must be 80 octets')
> Raise an exception, not a string (linter).
Done
https://gerrit.osmocom.org/c/pysim/+/41690/comment/7635a2a8_7c68e04a?usp=em… :
PS1, Line 341: super().validate()
> (On my branch I will inherit from BinaryParam,AlgoConfig and set allowed_len, so this won't need its […]
Done
https://gerrit.osmocom.org/c/pysim/+/41690/comment/db4dd2ad_672a2160?usp=em… :
PS1, Line 343: """Number of iterations of Keccak-f[1600] permuitation as recomended by Section 7.2 of 3GPP TS 35.231"""
> question from the future: what is a good default value for this? is 1 ok? thx!
Yes, 1 is the default as specified in 3GPP TS 35.231. It is also what the SAIP ASN.1 definition lists as default if the field is absent:
```
numberOfKeccak UInt8 DEFAULT 1
```
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/41690?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I397df6c0c708a8061e4adc0fde03a3f746bcb5b6
Gerrit-Change-Number: 41690
Gerrit-PatchSet: 2
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: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 18 Dec 2025 14:09:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: dexter, laforge.
Hello Jenkins Builder, dexter, fixeria, neels,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/41690?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: pySim.esim.saip.personalization: Support Milenage customization
......................................................................
pySim.esim.saip.personalization: Support Milenage customization
Milenage offers the capability for operators to modify the r1-r5
rotation constants as well as the c1-c5 xor-ing constants; let's
add ConfigurableParameters for that.
Change-Id: I397df6c0c708a8061e4adc0fde03a3f746bcb5b6
Related: SYS#7787
---
M pySim/esim/saip/personalization.py
1 file changed, 34 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/90/41690/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/41690?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: I397df6c0c708a8061e4adc0fde03a3f746bcb5b6
Gerrit-Change-Number: 41690
Gerrit-PatchSet: 2
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: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: laforge.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/41674?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: ts_51_011/EF.SMSP: Fix parsing of parameter_indicators
......................................................................
ts_51_011/EF.SMSP: Fix parsing of parameter_indicators
There's a 3-bit RFU field that (unlike everything else in USIM/UICC)
considers '1' to be the default. Let's make sure we get that right
during encode.
Change-Id: Ibe24a07f5f73d875d2077fa55471dbfc4e90da23
---
M pySim/ts_51_011.py
M tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok
2 files changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/74/41674/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/41674?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: Ibe24a07f5f73d875d2077fa55471dbfc4e90da23
Gerrit-Change-Number: 41674
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: laforge <laforge(a)osmocom.org>
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/41712?usp=email )
Change subject: pyshark_gsmtap: Adjust display filter for some wireshark versions
......................................................................
pyshark_gsmtap: Adjust display filter for some wireshark versions
On my debian unstable system with wireshark 4.6.2-3, the pyshark_gsmtap
APDU source misses to report any ATRs, as those are not part of what's
reported with the 'gsm_sim' display filter. Instead, let's use
'gsmtap.type == 4' instead, which is also backwards compatible to older
wireshark versions.
Change-Id: I53c1c8ed58a82c37cd4be4af3890af21da839e86
---
M pySim/apdu_source/pyshark_gsmtap.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/12/41712/1
diff --git a/pySim/apdu_source/pyshark_gsmtap.py b/pySim/apdu_source/pyshark_gsmtap.py
index e8f5d18..5232db4 100644
--- a/pySim/apdu_source/pyshark_gsmtap.py
+++ b/pySim/apdu_source/pyshark_gsmtap.py
@@ -84,5 +84,5 @@
Args:
pcap_filename: File name of the pcap file to be opened
"""
- pyshark_inst = pyshark.FileCapture(pcap_filename, display_filter='gsm_sim', use_json=True, keep_packets=False)
+ pyshark_inst = pyshark.FileCapture(pcap_filename, display_filter='gsmtap.type == 4', use_json=True, keep_packets=False)
super().__init__(pyshark_inst)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/41712?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: I53c1c8ed58a82c37cd4be4af3890af21da839e86
Gerrit-Change-Number: 41712
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
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/+/41703?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: logging_vty: Set 'gsmtap log nonblocking-io' as default
......................................................................
logging_vty: Set 'gsmtap log nonblocking-io' as default
Apps using a VTY are expected to be using an event loop, and hence
should not be using blocking operations which would stall the event
loop.
If user fears losing messages (eg, when enabling a lot of DEBUG),
then the taget can still be switched to "wq" at the expense of
losing performance, or increasing the kernel UDP socket sndbuf by means
of sysctl net.core.wmem_{default,max}.
Related: OS#6213
Related: OS#6794
Change-Id: Ifca8a821e13ec1327ab2476b0db91078fcff948b
---
M src/vty/logging_vty.c
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/41703/3
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41703?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ifca8a821e13ec1327ab2476b0db91078fcff948b
Gerrit-Change-Number: 41703
Gerrit-PatchSet: 3
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>
Attention is currently required from: fixeria, laforge.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/41702?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: logging_vty: Allow setting gsmtap log tgt as (blocking-io|nonblocking-io|wq)
......................................................................
logging_vty: Allow setting gsmtap log tgt as (blocking-io|nonblocking-io|wq)
The current patch adds the possibility to configure it, and leaves the
previous behavior as default: blocking-io.
Related: OS#6213
Change-Id: Id5d31bedd7d265d18f6e475ccbc94ced80598d04
---
M TODO-RELEASE
M include/osmocom/core/gsmtap_util.h
M include/osmocom/core/socket.h
M src/core/gsmtap_util.c
M src/core/libosmocore.map
M src/core/socket.c
M src/vty/logging_vty.c
7 files changed, 88 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/41702/3
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41702?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Id5d31bedd7d265d18f6e475ccbc94ced80598d04
Gerrit-Change-Number: 41702
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41710?usp=email )
Change subject: gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called multiple times
......................................................................
gsmtap_util: Avoid sink_fd leak gsmtap_source_add_sinki() called multiple times
gti->sink_fd could leak if gsmtap_source_add_sink() was called multiple
times.
Also if gsmtap_source_add_sink_fd() failed, rc != -1 was returned and
hence a close() on a wrong fd would be attempted.
This commit fixes both issues, making the whole sink_fd field much more
robust.
Change-Id: I7af5a6c7d64954ee2cc013711702b846dfaa02b1
(cherry picked from commit 85112c4911252412f0d127f01bde92794e232d00)
---
M src/core/gsmtap_util.c
1 file changed, 11 insertions(+), 3 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c
index 35bbf77..9b9c3b6 100644
--- a/src/core/gsmtap_util.c
+++ b/src/core/gsmtap_util.c
@@ -435,7 +435,7 @@
/*! Add a local sink to an existing GSMTAP source and return fd
* \param[in] gti existing GSMTAP source
- * \returns file descriptor of locally bound receive socket
+ * \returns file descriptor of locally bound receive socket; negative on error
*
* In case the GSMTAP socket is connected to a local destination
* IP/port, this function creates a corresponding receiving socket
@@ -450,7 +450,15 @@
*/
int gsmtap_source_add_sink(struct gsmtap_inst *gti)
{
- return gti->sink_fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti));
+ int rc;
+
+ if (gti->sink_fd >= 0)
+ return -EALREADY;
+
+ rc = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti));
+ if (rc >= 0)
+ gti->sink_fd = rc;
+ return rc;
}
/* Registered in Osmo IO as a no-op to set the write callback. */
@@ -535,7 +543,7 @@
close(gti->wq.bfd.fd);
- if (gti->sink_fd != -1) {
+ if (gti->sink_fd >= 0) {
close(gti->sink_fd);
gti->sink_fd = -1;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41710?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmocore
Gerrit-Branch: pespin/rel-1.12.0
Gerrit-Change-Id: I7af5a6c7d64954ee2cc013711702b846dfaa02b1
Gerrit-Change-Number: 41710
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>