laforge has submitted this change. ( 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(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
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-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: manawyrm <osmocom.account(a)tbspace.de>
Gerrit-MessageType: merged
Attention is currently required from: arehbein, laforge.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34743?usp=email )
Change subject: gsmtap_util: Use Osmo IO instead of Osmo write queues
......................................................................
Patch Set 5:
(1 comment)
File src/core/gsmtap_util.c:
https://gerrit.osmocom.org/c/libosmocore/+/34743/comment/d4de8de3_f6d6e4ca
PS5, Line 478: osmo_iofd_setup(gti, gti->sink_fd, "gsmtap_inst.out", OSMO_IO_FD_MODE_READ_WRITE, &gsmtap_sink_ops, NULL);
This will leak iofds returned by osmo_iofd_setup().
Also having a read_cb() will cause (de-)allocations for each message, which will impact performance. Maybe the sink should stay a struct osmo_fd? The alternative would be to simply never read from that fd and just keep it open there so no ICMP errors are sent.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34743?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iadbbef74e3add7001d84dd6b68f51eac293e44d0
Gerrit-Change-Number: 34743
Gerrit-PatchSet: 5
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 20 Oct 2023 20:27:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34841?usp=email )
Change subject: Makefile: run 'rebar3 clean' upon make clean
......................................................................
Makefile: run 'rebar3 clean' upon make clean
Otherwise the diameter files generated during compile in include/ and
src/ are not removed.
Change-Id: I771860f965499bb754c13385819845ef23f33553
---
M Makefile
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/41/34841/1
diff --git a/Makefile b/Makefile
index b2fe66f..5ef1f58 100644
--- a/Makefile
+++ b/Makefile
@@ -14,4 +14,5 @@
rebar3 eunit
clean:
+ rebar3 clean
rm -rf _build/
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34841?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I771860f965499bb754c13385819845ef23f33553
Gerrit-Change-Number: 34841
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
pablo has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/34828?usp=email )
Change subject: include/linux/gtp.h: fix GTPA_MAX
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/34828?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: I42a358fc795d0e593e2c5509dcfa6ffdbad3cbfa
Gerrit-Change-Number: 34828
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pablo <pablo(a)gnumonks.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 20 Oct 2023 16:46:24 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34823?usp=email )
Change subject: Makefile: Update titan.ProtocolModules.BSSMAP to new osmocom/master branch
......................................................................
Makefile: Update titan.ProtocolModules.BSSMAP to new osmocom/master branch
The repository branches were rebased and rearranged, where now its master branch
follows upstream, and we keep an osmocom/master branch with our own
patches (Osmux, not aimed at upstream) which can then be rebased on top of master.
Related: OS#6011
Change-Id: I1ec7cb6f8fa5acaca6eb434ea9449119de078c94
---
M deps/Makefile
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/deps/Makefile b/deps/Makefile
index bd6ce8a..c6031cb 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -89,7 +89,7 @@
titan.ProtocolEmulations.SCCP_commit= f8a44f2cdef44d0c3adf787ab3184c293a9a58be
titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8
titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a
-titan.ProtocolModules.BSSMAP_commit= 814c5d786ab633bce384eea99685f0e49a386172
+titan.ProtocolModules.BSSMAP_commit= 4acb6ab5f058477f0b90c2da182d52054e3614b0
titan.ProtocolModules.DNS_commit= R.7.B
titan.ProtocolModules.GRE_commit= R.2.A-5-g654c446
titan.ProtocolModules.GTP_v13.5.0_commit= 54219599037626c675610d3a44433d01af264fbb
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34823?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I1ec7cb6f8fa5acaca6eb434ea9449119de078c94
Gerrit-Change-Number: 34823
Gerrit-PatchSet: 2
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-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged