Attention is currently required from: fixeria, laforge, osmith.
Hello Jenkins Builder, fixeria, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified+1 by Jenkins Builder
Change subject: pcu: Introduce test TC_x2001_pacch_pkt_dl_ass_unanswered_timeout
......................................................................
pcu: Introduce test TC_x2001_pacch_pkt_dl_ass_unanswered_timeout
Related: OS#3928
Change-Id: I08921132de863404485581dfa439a54f109b0078
---
M pcu/PCU_Tests.ttcn
M pcu/expected-results.xml
2 files changed, 199 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/37677/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677?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: I08921132de863404485581dfa439a54f109b0078
Gerrit-Change-Number: 37677
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-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria, laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677?usp=email )
Change subject: pcu: Introduce test TC_x2001_pacch_pkt_dl_ass_unanswered_timeout
......................................................................
Patch Set 1:
(2 comments)
File pcu/PCU_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677/comment/c74c8cd0_3e2e…
PS1, Line 2263: f_ms_tx_TsTrxBtsNum(ms));
> can we use cached `nr` here and below? […]
Ack
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677/comment/61425ef2_e553…
PS1, Line 2329: f_ms_tx_TsTrxBtsNum(ms));
> likewise, can we use `nr` here?
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677?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: I08921132de863404485581dfa439a54f109b0078
Gerrit-Change-Number: 37677
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: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 01 Aug 2024 17:08:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37692?usp=email )
Change subject: ttcn3-ggsn-test: Reduce timers for ggsn-test-kernel-torvalds
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
I'm not sure if this will be obsolete by the change to testenv.py, but in the meantime this will help with spurious ttcn3-ggsn-test-kernel-torvalds failures.
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37692?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I738b460996b29ca828c62427e01b9bb6b995c051
Gerrit-Change-Number: 37692
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 01 Aug 2024 16:46:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677?usp=email )
Change subject: pcu: Introduce test TC_x2001_pacch_pkt_dl_ass_unanswered_timeout
......................................................................
Patch Set 1: Code-Review+1
(2 comments)
File pcu/PCU_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677/comment/6541fa66_5e7a…
PS1, Line 2263: f_ms_tx_TsTrxBtsNum(ms));
can we use cached `nr` here and below?
or is it expected to change, so we have to use `f_ms_tx_TsTrxBtsNum()`?
I see you're using cached `nr` in PCUIF DATA.ind templates.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677/comment/f9f93e37_148a…
PS1, Line 2329: f_ms_tx_TsTrxBtsNum(ms));
likewise, can we use `nr` here?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37677?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: I08921132de863404485581dfa439a54f109b0078
Gerrit-Change-Number: 37677
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-Comment-Date: Thu, 01 Aug 2024 16:27:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37690?usp=email )
Change subject: recognize ADF.PKCS15, allow selecting it
......................................................................
recognize ADF.PKCS15, allow selecting it
This is not a complete implementation of the PKCS#15 by any means.
This patch simply defines AID=a000000063504b43532d3135 and allows
easily selecting it. Files in this ADF do not have statically
assigned FIDs, they reference each other using card/vendor
specific FIDs, which need to be resolved dynamically.
AIDs on card:
USIM: a0000000871002fffff00189000001ff (EF.DIR)
ISIM: a0000000871004fffff00189000001ff (EF.DIR)
PKCS15: a000000063504b43532d3135 (EF.DIR)
pySIM-shell (00:MF)> select ADF.PKCS15
On some UICCs (e.g. sipgate), selecting this ADF may return an error:
pySIM-shell (00:MF)> select ADF.PKCS15
EXCEPTION of type 'SwMatchError' occurred with message: SW match failed! Expected 9000 and got 6999.
In this case one can read MF/EF.DIR and get the DF reference
from there:
pySIM-shell (00:MF)> select MF/EF.DIR
pySIM-shell (00:MF/EF.DIR)> read_records_decoded
...
"application_id": "a000000063504b43532d3135"
"application_label": "PKCS15"
"file_reference": "3f007f80"
...
pySIM-shell (00:MF/EF.DIR)> select 3f00/7f80
Change-Id: I7ea6d91805868645ae1c1a4a2c5870f7d041f74b
---
M pySim/app.py
A pySim/pkcs15.py
2 files changed, 78 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/90/37690/1
diff --git a/pySim/app.py b/pySim/app.py
index 5525cd1..4f6e4ec 100644
--- a/pySim/app.py
+++ b/pySim/app.py
@@ -39,6 +39,7 @@
import pySim.ts_31_103
import pySim.ts_31_104
import pySim.ara_m
+import pySim.pkcs15
import pySim.global_platform
import pySim.euicc
diff --git a/pySim/pkcs15.py b/pySim/pkcs15.py
new file mode 100644
index 0000000..1a34ae1
--- /dev/null
+++ b/pySim/pkcs15.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+
+"""
+Support for the PKCS#15 application inside an UICC.
+"""
+
+#
+# Copyright (C) 2024 Vadim Yanitskiy <fixeria(a)osmocom.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+from pySim.filesystem import *
+from pySim.utils import Hexstr
+
+
+class ADF_ARF(CardADF):
+ def __init__(self, aid='a000000063504b43532d3135', name='ADF.PKCS15', fid=None, sfid=None,
+ desc='PKCS15 application'):
+ super().__init__(aid=aid, fid=fid, sfid=sfid, name=name, desc=desc)
+ files = [
+ ]
+ self.add_files(files)
+
+
+class CardApplicationARF(CardApplication):
+ def __init__(self):
+ super().__init__('PKCS15', adf=ADF_ARF())
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37690?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: I7ea6d91805868645ae1c1a4a2c5870f7d041f74b
Gerrit-Change-Number: 37690
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37688?usp=email )
Change subject: ggsn: Split test and relax expectations testing gtpu access over ipv6 ll-addr
......................................................................
ggsn: Split test and relax expectations testing gtpu access over ipv6 ll-addr
Testing gtpu traffic to some potentially external IP address using the
link-local address has no clear usecase and it also depends on the
network setup and the implementation of the GGSN.
Hence, remove it from the regular test and move it to another test which
has a relaxed validation accepting different resolutions.
This allows knowing/testing the code path in the GGSN, while accepting
different outcomes.
Related: OS#6382
Change-Id: Icfae181ba1bb0dfb8a1a15dfe3a1d542ce69d88a
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 74 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/37688/1
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 3f373aa..70bb1c3 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -1073,15 +1073,6 @@
var OCT16 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '0003'O);
- /* Check if we can use valid link-local src addr. */
- var OCT16 saddr_ll := f_ipv6_link_local(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address);
- f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_ll, dns1_addr));
- if (m_ggsn_impl == GGSN_IMPL_OSMOCOM) {
- f_wait_icmp6_echo_reply(ctx);
- } else {
- f_wait_gtpu_fail(ctx);
- }
-
/* Check if we can use valid global src addr, should work */
var OCT16 saddr_glob := f_ipv6_global(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address);
f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_glob, dns1_addr));
@@ -1091,6 +1082,61 @@
f_shutdown_helper();
}
+ /* Same as TC_pdp6_act_deact_gtpu_access, but using the ll addr as src address.
+ * The ability to reach the DNS IP using this ll-addr is not really
+ * well-specified, and it really depends on the network/routing setup,
+ * the address of the DNS server, etc.
+ * osmo-ggsn (userspace) and open5gs allow using it, but open5gs doesn't support it.
+ * Also osmo-ggsn (gtp-u kernel module) is unable to use it due to kernel implementation
+ * constrains, see OS#6382.
+ * Hence, run the test for completeness to test the GGSN, but expect/allow both behaviors.
+ */
+ testcase TC_pdp6_act_deact_gtpu_access_ll_saddr() runs on GT_CT {
+ var Gtp1uUnitdata ud;
+
+ f_init();
+ var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn)));
+ ctx.pco_req := valueof(ts_PCO_IPv6_DNS);
+ f_pdp_ctx_act(ctx);
+
+ f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx));
+ f_wait_rtr_adv(ctx);
+ f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx));
+
+ var OCT16 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '0003'O);
+
+ /* Check if we can use valid link-local src addr. */
+ var OCT16 saddr_ll := f_ipv6_link_local(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address);
+ f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_ll, dns1_addr));
+ T_default.start;
+ alt {
+ [] GTPU.receive(tr_GTPU_GPDU(g_peer_u, ?)) -> value ud {
+ var octetstring gpdu := ud.gtpu.gtpu_IEs.g_PDU_IEs.data;
+ var IPv6_packet ip6 := f_IPv6_dec(gpdu);
+ if (ip6.header.ver != 6 or ip6.header.nexthead != 58) {
+ repeat;
+ }
+ var PDU_ICMPv6 icmp6 := f_dec_PDU_ICMPv6(ip6.payload);
+ if (not match(icmp6, (tr_ICMPv6_ERP,tr_ICMPv6_DU))) {
+ repeat;
+ }
+ log("This GGSN does support forwarding link-local source address.");
+ T_default.stop;
+ }
+ [] GTPU.receive(tr_GTPU_GPDU(?, ?)) { repeat; }
+ [] GTPU.receive {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Received unexpected GTPU while waiting for ICMPv6: ", (tr_ICMPv6_ERP,tr_ICMPv6_DU)));
+ }
+ [] T_default.timeout {
+ log("This GGSN does NOT support forwarding link-local source address.");
+ }
+ }
+
+ f_pdp_ctx_del(ctx, '1'B);
+ f_shutdown_helper();
+ }
+
/* Check that attempting RA with another ll src addr won't work, packet dropped: */
testcase TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr() runs on GT_CT {
f_init();
@@ -2246,6 +2292,7 @@
execute(TC_pdp6_act_deact_pcodns());
execute(TC_pdp6_act_deact_icmp6());
execute(TC_pdp6_act_deact_gtpu_access());
+ execute(TC_pdp6_act_deact_gtpu_access_ll_saddr());
execute(TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr());
execute(TC_pdp6_act_deact_gtpu_access_wrong_global_saddr());
execute(TC_pdp6_act_deact_gtpu_access_ipv4_apn6());
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37688?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: Icfae181ba1bb0dfb8a1a15dfe3a1d542ce69d88a
Gerrit-Change-Number: 37688
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/37674?usp=email )
Change subject: osmo_bsc_sigtran: Don't try to decode ipaccess_head a second time
......................................................................
Abandoned
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/37674?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: rel-1.12.1
Gerrit-Change-Id: I300bbab3c0215d52bc5f6232ace5c37a6613feb7
Gerrit-Change-Number: 37674
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: abandon
daniel has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/37673?usp=email )
Change subject: ipa: Ensure osmo_ipa_segmentation_cb sets msg->l2h to the payload data
......................................................................
Abandoned
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/37673?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: rel-1.5.1
Gerrit-Change-Id: Id91cddf9948ca49abf092850fae3a8f17e445b45
Gerrit-Change-Number: 37673
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: abandon
