[S] Change in pysim[master]: filesystem: fix typo
Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35352?usp=email ) Change subject: filesystem: fix typo .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35352?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: I721875d302ab69340d56b33102297b56c070465f Gerrit-Change-Number: 35352 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 14 Dec 2023 07:21:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: filesystem: use sort path when selecting an application
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35351?usp=email ) Change subject: filesystem: use sort path when selecting an application .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35351?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: I838a99bb47afc73b4274baecb04fff31abf7b2e2 Gerrit-Change-Number: 35351 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 14 Dec 2023 07:18:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?usp=email ) Change subject: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?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: I83f1f4f78adb9cd85758513420479327ea73187a Gerrit-Change-Number: 35357 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 07:04:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Templates: Fix seq nr not set in ts_GTP2C_DeleteSession...
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35356?usp=email ) Change subject: library/GTPv2_Templates: Fix seq nr not set in ts_GTP2C_DeleteSessionResp .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35356?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: I8409eb35fc2f0bda6c5e11ae5c3d7628503bb2cd Gerrit-Change-Number: 35356 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 05:29:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: Make BSSGP timing data configurable
Attention is currently required from: pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31882?usp=email ) Change subject: Make BSSGP timing data configurable .. Patch Set 9: (1 comment) File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31882/comment/4fe689fd_79bbcd90 PS8, Line 212: .t1_s = osmo_tdef_get(g->tdefs, 1, OSMO_TDEF_S, -1), > so you added defines for timers 1.. […] not in the newer patchsets -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31882?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4779f033b5eb1742462d4efc28a0398645acfe6 Gerrit-Change-Number: 31882 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 14 Dec 2023 00:42:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: Make NSE timing data configurable
Attention is currently required from: pespin.
arehbein has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31880?usp=email )
Change subject: Make NSE timing data configurable
..
Patch Set 8:
(3 comments)
File include/osmocom/bsc/bts.h:
https://gerrit.osmocom.org/c/osmo-bsc/+/31880/comment/2ed199c5_32ad987c
PS7, Line 347: extern const size_t bts_gprs_rlc_timer_templates_bytes;
> why is this being removed here? it probably should be removed in the previous
> commit?
Done
File src/osmo-bsc/bts_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31880/comment/8e2e7f2f_8cab8acc
PS7, Line 1662: static const struct tdef_data gprs_ns_timer_tdef_data[7] = {
> I'm still totally not understanding why do you need this index lookup here.
> […]
using an array to look up these values seemed simpler than using a dictionary
with timer names
File tests/gprs_params.vty:
https://gerrit.osmocom.org/c/osmo-bsc/+/31880/comment/5ffc0502_64de897c
PS7, Line 36: gprs nsei 0
> why did the timers dissappear here? because they are the default values? then
> ACK.
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31880?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie46ec5cb7095bc1dfe3effd0e76d6ccfd6bd2f3f
Gerrit-Change-Number: 31880
Gerrit-PatchSet: 8
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 14 Dec 2023 00:41:52 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: Introduce per-BTS timers, RLC timer commands
Attention is currently required from: fixeria, laforge, neels, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email ) Change subject: Introduce per-BTS timers, RLC timer commands .. Patch Set 18: (4 comments) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/53580373_9da62382 PS3, Line 1896: static int parse_timer_arg_fmt(struct vty *vty, const char *timer_str, int *tid) > I understand your motivation, this is indeed a problem. […] functionality has been moved to libosmocore via https://gerrit.osmocom.org/c/libosmocore/+/35355/9 https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/3421d774_7ed97e36 PS3, Line 2068: > alright, then I'll be working on a libosmocore patch for that then. […] https://gerrit.osmocom.org/c/libosmocore/+/35355/9 File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/1959fe8a_d26a2edd PS12, Line 39: osmocom/bsc/bts.h > this header is already included below... Done File tests/nanobts_omlattr/nanobts_omlattr_test.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/84cfe61b_286e6ebc PS12, Line 138: 3142 > Why do these new timers need to be in `gsm_network_T_defs[]`? […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675 Gerrit-Change-Number: 31878 Gerrit-PatchSet: 18 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 14 Dec 2023 00:38:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein Comment-In-Reply-To: neels Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in libosmocore[master]: tdef_vty: Introduce generalized per-object tdef support
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35355?usp=email ) Change subject: tdef_vty: Introduce generalized per-object tdef support .. Patch Set 9: (1 comment) Patchset: PS9: A working example should be given by https://gerrit.osmocom.org/c/osmo-bsc/+/31878 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35355?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: Ib3b22640a11eae152d66d62c0f47b953d80de945 Gerrit-Change-Number: 35355 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 14 Dec 2023 00:28:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: Introduce per-BTS timers, RLC timer commands
Attention is currently required from: fixeria, laforge, neels, pespin.
arehbein has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email )
Change subject: Introduce per-BTS timers, RLC timer commands
..
Patch Set 18:
(1 comment)
File src/osmo-bsc/bsc_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/78218b76_b9a0e2af
PS16, Line 346: if (bts->gprs.mode == BTS_GPRS_NONE) {
> I think for setting timers is totally fine being able to configure them,
> otherwise config files are […]
It used to be exactly the same for the existing gprs timer commands. I have
removed the check.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 18
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-Attention: neels
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Thu, 14 Dec 2023 00:25:29 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: arehbein
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: Introduce per-BTS timers, RLC timer commands
Attention is currently required from: arehbein, fixeria, laforge, neels.
Hello Jenkins Builder, fixeria, laforge, neels, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
to look at the new patch set (#18).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: Introduce per-BTS timers, RLC timer commands
..
Introduce per-BTS timers, RLC timer commands
- Add per-BTS timer groups ('rlc' only for now, others to follow)
- Add vty commands & tests for those timers
Requires: libosmocore.git Ib3b22640a11eae152d66d62c0f47b953d80de945
Related: OS#5335
Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
---
M include/osmocom/bsc/bts.h
M include/osmocom/bsc/gsm_data.h
M include/osmocom/bsc/vty.h
M src/osmo-bsc/bsc_init.c
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_init.c
M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
M src/osmo-bsc/bts_vty.c
M src/osmo-bsc/pcu_sock.c
M tests/bts_features.vty
M tests/nanobts_omlattr/nanobts_omlattr_test.c
12 files changed, 253 insertions(+), 65 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/31878/18
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 18
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-Attention: arehbein
Gerrit-Attention: neels
Gerrit-Attention: laforge
Gerrit-Attention: fixeria
Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: Make NSE timing data configurable
Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31880?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Make NSE timing data configurable .. Make NSE timing data configurable Also: Deprecate/hide old respective VTY command, while preserving backwards compatibility for NSE timing data configuration. Requires: libosmocore.git Ib3b22640a11eae152d66d62c0f47b953d80de945 Related: OS#5335 Change-Id: Ie46ec5cb7095bc1dfe3effd0e76d6ccfd6bd2f3f --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/bts_sm.h M include/osmocom/bsc/vty.h M src/osmo-bsc/bts_init.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_sm.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/pcu_sock.c M tests/bts_features.vty M tests/gprs_params.vty M tests/nanobts_omlattr/nanobts_omlattr_test.c 11 files changed, 166 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/31880/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31880?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie46ec5cb7095bc1dfe3effd0e76d6ccfd6bd2f3f Gerrit-Change-Number: 31880 Gerrit-PatchSet: 8 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: arehbein Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: Make BSSGP timing data configurable
Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/31882?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Make BSSGP timing data configurable .. Make BSSGP timing data configurable Also: Deprecate/hide old respective VTY command, while preserving backwards compatibility for BSSGP timing data configuration. Requires: libosmocore.git Ib3b22640a11eae152d66d62c0f47b953d80de945 Related: OS#5335 Change-Id: Id4779f033b5eb1742462d4efc28a0398645acfe6 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/vty.h M src/osmo-bsc/bts_init.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/pcu_sock.c M tests/bts_features.vty 7 files changed, 176 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/31882/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31882?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4779f033b5eb1742462d4efc28a0398645acfe6 Gerrit-Change-Number: 31882 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: arehbein Gerrit-MessageType: newpatchset
[L] Change in libosmocore[master]: ns2: Use tdef API for timers
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35360?usp=email ) Change subject: ns2: Use tdef API for timers .. Patch Set 1: (1 comment) This change is ready for review. Patchset: PS1: The NSI instance used here in the vty was always set to the last one instantiated. So this seemed like an in-between of per-BTS timer config and global timer config. Tests here fail and I couldn't figure out why, the test output wasn't very helpful. Maybe this can still be adapted, or global timers can be used here with a small change to the patch. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35360?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: Iea2a5fe2578a32d435fe9ae116d8c93317e7f695 Gerrit-Change-Number: 35360 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 14 Dec 2023 00:17:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: ns2: Improve code consistency
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35359?usp=email ) Change subject: ns2: Improve code consistency .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35359?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: I11c926dd4125c6657ae3cd21d8038f161d9fd9c3 Gerrit-Change-Number: 35359 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 14 Dec 2023 00:14:44 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: tdef_vty: Introduce helper functions/adapt existing helpers
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35328?usp=email ) Change subject: tdef_vty: Introduce helper functions/adapt existing helpers .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35328?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: Ife88841fbc325f23c5b270b8e8c71678b8023639 Gerrit-Change-Number: 35328 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 14 Dec 2023 00:14:13 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: tdef_vty: Introduce generalized per-object tdef support
arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35355?usp=email ) Change subject: tdef_vty: Introduce generalized per-object tdef support .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35355?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: Ib3b22640a11eae152d66d62c0f47b953d80de945 Gerrit-Change-Number: 35355 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 14 Dec 2023 00:14:17 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?usp=email ) Change subject: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages .. Patch Set 1: (1 comment) File library/GTPv2_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358/comment/63a2f4a8_915170c0 PS1, Line 343: private function f_gtp2c_is_initial_msg(PDU_GTPCv2 msg) return boolean > I'm assuming you'd never do this if there was a nicer way? let me know if you know a better one! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?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: I0f13074ccee2bf2d00d2dc2af491b9effc142f22 Gerrit-Change-Number: 35358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 13 Dec 2023 21:45:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?usp=email ) Change subject: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages .. Patch Set 1: Code-Review+1 (1 comment) File library/GTPv2_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358/comment/75afc053_8c26421b PS1, Line 343: private function f_gtp2c_is_initial_msg(PDU_GTPCv2 msg) return boolean I'm assuming you'd never do this if there was a nicer way? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?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: I0f13074ccee2bf2d00d2dc2af491b9effc142f22 Gerrit-Change-Number: 35358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 13 Dec 2023 21:39:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp
Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?usp=email ) Change subject: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?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: I83f1f4f78adb9cd85758513420479327ea73187a Gerrit-Change-Number: 35357 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 13 Dec 2023 21:36:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Templates: Fix seq nr not set in ts_GTP2C_DeleteSession...
Attention is currently required from: fixeria, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35356?usp=email ) Change subject: library/GTPv2_Templates: Fix seq nr not set in ts_GTP2C_DeleteSessionResp .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35356?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: I8409eb35fc2f0bda6c5e11ae5c3d7628503bb2cd Gerrit-Change-Number: 35356 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 13 Dec 2023 21:34:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35358?usp=email )
Change subject: library/GTPv2_Emulation: Patch SeqNr only on outbound initial
messages
..
library/GTPv2_Emulation: Patch SeqNr only on outbound initial messages
Change-Id: I0f13074ccee2bf2d00d2dc2af491b9effc142f22
---
M library/GTPv2_Emulation.ttcn
1 file changed, 86 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/58/35358/1
diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn
index 736dd03..0b2cb4f 100644
--- a/library/GTPv2_Emulation.ttcn
+++ b/library/GTPv2_Emulation.ttcn
@@ -340,6 +340,73 @@
return omit;
}
+private function f_gtp2c_is_initial_msg(PDU_GTPCv2 msg) return boolean
+{
+ if (ischosen(msg.gtpcv2_pdu.echoRequest) or
+ ischosen(msg.gtpcv2_pdu.versionNotSupported) or
+ ischosen(msg.gtpcv2_pdu.createSessionRequest) or
+ ischosen(msg.gtpcv2_pdu.createBearerRequest) or
+ ischosen(msg.gtpcv2_pdu.bearerResourceCommand) or
+ ischosen(msg.gtpcv2_pdu.bearerResourceFailureIndication) or
+ ischosen(msg.gtpcv2_pdu.modifyBearerRequest) or
+ ischosen(msg.gtpcv2_pdu.deleteSessionRequest) or
+ ischosen(msg.gtpcv2_pdu.deleteBearerRequest) or
+ ischosen(msg.gtpcv2_pdu.downlinkDataNotification) or
+ ischosen(msg.gtpcv2_pdu.downlinkDataNotificationAcknowledgement) or
+ ischosen(msg.gtpcv2_pdu.downlinkDataNotificationFailureIndication)
or
+ ischosen(msg.gtpcv2_pdu.deleteIndirectDataForwardingTunnelRequest)
or
+ ischosen(msg.gtpcv2_pdu.modifyBearerCommand) or
+ ischosen(msg.gtpcv2_pdu.modifyBearerFailureIndication) or
+ ischosen(msg.gtpcv2_pdu.updateBearerRequest) or
+ ischosen(msg.gtpcv2_pdu.deleteBearerCommand) or
+ ischosen(msg.gtpcv2_pdu.createIndirectDataForwardingTunnelRequest)
or
+ ischosen(msg.gtpcv2_pdu.releaseAccessBearersRequest) or
+ ischosen(msg.gtpcv2_pdu.stopPagingIndication) or
+ ischosen(msg.gtpcv2_pdu.modifyAccessBearersRequest) or
+ ischosen(msg.gtpcv2_pdu.remoteUEReportNotification) or
+ ischosen(msg.gtpcv2_pdu.remoteUEReportAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.forwardRelocationRequest) or
+ ischosen(msg.gtpcv2_pdu.forwardRelocationCompleteNotification) or
+ ischosen(msg.gtpcv2_pdu.forwardRelocationCompleteAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.contextRequest) or
+ ischosen(msg.gtpcv2_pdu.contextAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.identificationRequest) or
+ ischosen(msg.gtpcv2_pdu.forwardAccessContextNotification) or
+ ischosen(msg.gtpcv2_pdu.forwardAccessContextAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.detachNotification) or
+ ischosen(msg.gtpcv2_pdu.detachAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.changeNotificationRequest) or
+ ischosen(msg.gtpcv2_pdu.relocationCancelRequest) or
+ ischosen(msg.gtpcv2_pdu.configurationTransferTunnel) or
+ ischosen(msg.gtpcv2_pdu.rAN_InformationRelay) or
+ ischosen(msg.gtpcv2_pdu.suspendNotification) or
+ ischosen(msg.gtpcv2_pdu.suspendAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.resumeNotification) or
+ ischosen(msg.gtpcv2_pdu.resumeAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.cSPagingIndication) or
+ ischosen(msg.gtpcv2_pdu.createForwardingTunnelRequest) or
+ ischosen(msg.gtpcv2_pdu.deletePDN_ConnectionSetRequest) or
+ ischosen(msg.gtpcv2_pdu.traceSessionActivation) or
+ ischosen(msg.gtpcv2_pdu.traceSessionDeactivation) or
+ ischosen(msg.gtpcv2_pdu.updatePDN_ConnectionSetRequest) or
+ ischosen(msg.gtpcv2_pdu.pGW_RestartNotification) or
+ ischosen(msg.gtpcv2_pdu.pGW_RestartNotificationAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.pGW_DownlinkTriggeringNotification) or
+ ischosen(msg.gtpcv2_pdu.pGW_DownlinkTriggeringAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.alertMMENotification) or
+ ischosen(msg.gtpcv2_pdu.alertMMEAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.uEActivityNotification) or
+ ischosen(msg.gtpcv2_pdu.uEActivityAcknowledge) or
+ ischosen(msg.gtpcv2_pdu.mBMSSessionStartRequest) or
+ ischosen(msg.gtpcv2_pdu.mBMSSessionUpdateRequest) or
+ ischosen(msg.gtpcv2_pdu.mBMSSessionStopRequest) or
+ ischosen(msg.gtpcv2_pdu.iSR_StatusIndication) or
+ ischosen(msg.gtpcv2_pdu.uE_RegistrationQueryRequest)) {
+ return true;
+ }
+ return false;
+}
+
private template (value) SctpTuple ts_SCTP(template (omit) integer ppid :=
omit) := {
sinfo_stream := omit,
sinfo_ppid
[S] Change in osmo-ttcn3-hacks[master]: library/GTPv2_Templates: Fix seq nr not set in ts_GTP2C_DeleteSession...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35356?usp=email )
Change subject: library/GTPv2_Templates: Fix seq nr not set in
ts_GTP2C_DeleteSessionResp
..
library/GTPv2_Templates: Fix seq nr not set in ts_GTP2C_DeleteSessionResp
Change-Id: I8409eb35fc2f0bda6c5e11ae5c3d7628503bb2cd
---
M library/GTPv2_Templates.ttcn
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/56/35356/1
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 6ea06a2..4af82e8 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -969,7 +969,7 @@
ts_GTP2C_DeleteSessionResp(template (value) OCT4 d_teid,
template (value) OCT3 seq,
template (value) GTP2C_Cause cause) :=
-ts_PDU_GTP2C(d_teid, '00'O, '25'O, {
+ts_PDU_GTP2C(d_teid, seq, '25'O, {
deleteSessionResponse := {
cause := ts_GTP2C_Cause(cause, '0'B),
recovery := omit,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35356?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: I8409eb35fc2f0bda6c5e11ae5c3d7628503bb2cd
Gerrit-Change-Number: 35356
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?usp=email )
Change subject: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp
..
GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp
Change-Id: I83f1f4f78adb9cd85758513420479327ea73187a
---
M epdg/EPDG_Tests.ttcn
M library/GTPv2_Templates.ttcn
2 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/57/35357/1
diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn
index 99a4721..f58cf96 100644
--- a/epdg/EPDG_Tests.ttcn
+++ b/epdg/EPDG_Tests.ttcn
@@ -429,7 +429,9 @@
teid_list := { fteid_u_ie },
qos :=
ts_GTP2C_BearerQos('09'O, 0,0,0,0),
charging_id :=
ts_GTP2C_ChargingID(g_pars.teic_local));
- GTP2.send(ts_GTP2C_CreateSessionResp({ fteid_c_ie }, paa, {
ts_GTP2C_BcGrouped(bctx_ies) } ));
+ GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.teic_remote,
rx_msg.sequenceNumber,
+{ fteid_c_ie }, paa,
+{
ts_GTP2C_BcGrouped(bctx_ies) } ));
setverdict(pass);
}
[] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg {
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 4af82e8..1ccbcb8 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -838,10 +838,12 @@
}});
template (value) PDU_GTPCv2
-ts_GTP2C_CreateSessionResp(template (value) FullyQualifiedTEID_List fteids,
+ts_GTP2C_CreateSessionResp(template (value) OCT4 d_teid,
+ template (value) OCT3 seq,
+ template (value) FullyQualifiedTEID_List fteids,
template (value) PDN_AddressAllocation addr,
template (omit) BearerContextGrouped_List
bearerContextGrouped := omit) :=
-ts_PDU_GTP2C(''O, '00'O, '21'O, {
+ts_PDU_GTP2C(d_teid, seq, '21'O, {
createSessionResponse := {
cause := ts_GTP2C_Cause(Request_accepted, '0'B),
changeReportingAction := omit,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?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: I83f1f4f78adb9cd85758513420479327ea73187a
Gerrit-Change-Number: 35357
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind
Attention is currently required from: neels. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email ) Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1 Gerrit-Change-Number: 35354 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 13 Dec 2023 17:04:24 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email )
Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind
..
Patch Set 1:
(6 comments)
File src/iu_client.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13099):
https://gerrit.osmocom.org/c/osmo-iuh/+/35354/comment/fd14000f_ecaae644
PS1, Line 180: static void ue_conn_sccp_addr_add(uint32_t conn_id, const struct
osmo_sccp_addr *calling_addr) {
open brace '{' following function definitions go on the next line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13099):
https://gerrit.osmocom.org/c/osmo-iuh/+/35354/comment/97e6f0cc_25602fd3
PS1, Line 189: static const struct osmo_sccp_addr
*ue_conn_sccp_addr_find(uint32_t conn_id) {
open brace '{' following function definitions go on the next line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13099):
https://gerrit.osmocom.org/c/osmo-iuh/+/35354/comment/74971f2e_620ebf20
PS1, Line 192: if (entry->conn_id == conn_id) {
braces {} are not necessary for single statement blocks
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13099):
https://gerrit.osmocom.org/c/osmo-iuh/+/35354/comment/1dacde76_ef20c1c5
PS1, Line 199: static void ue_conn_sccp_addr_del(uint32_t conn_id) {
open brace '{' following function definitions go on the next line
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13099):
https://gerrit.osmocom.org/c/osmo-iuh/+/35354/comment/affd1729_5e710e86
PS1, Line 931: "N-DATA.ind for unknown conn_id
(%u)\n", conn_id);
code indent should use tabs where possible
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13099):
https://gerrit.osmocom.org/c/osmo-iuh/+/35354/comment/b846dfaf_cd407be3
PS1, Line 931: "N-DATA.ind for unknown conn_id
(%u)\n", conn_id);
please, no space before tabs
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1
Gerrit-Change-Number: 35354
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Wed, 13 Dec 2023 16:42:15 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email )
Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind
..
iu_client: Handle empty CR and InitialUE Message in DATA.ind
Related: OS#6307
Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1
---
M src/iu_client.c
1 file changed, 75 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/54/35354/1
diff --git a/src/iu_client.c b/src/iu_client.c
index 9da11ea..27e7140 100644
--- a/src/iu_client.c
+++ b/src/iu_client.c
@@ -55,6 +55,14 @@
uint8_t rac;
};
+/* Entry to cache conn_id <-> sccp_addr mapping in case we receive an empty CR
*/
+struct iu_new_ctx_entry {
+ struct llist_head list;
+
+ uint32_t conn_id;
+ struct osmo_sccp_addr sccp_addr;
+};
+
/* A remote RNC (Radio Network Controller, like BSC but for UMTS) that has
* called us and is currently reachable at the given osmo_sccp_addr. So, when
we
* know a LAC for a subscriber, we can page it at the RNC matching that LAC or
@@ -94,6 +102,7 @@
#define LOGPIUC(level, fmt, args...) \
LOGPC(iu_log_subsystem, level, fmt, ## args)
+static LLIST_HEAD(ue_conn_sccp_addr_list);
static LLIST_HEAD(ue_conn_ctx_list);
static LLIST_HEAD(rnc_list);
@@ -168,6 +177,36 @@
talloc_free(ue_ctx);
}
+static void ue_conn_sccp_addr_add(uint32_t conn_id, const struct
osmo_sccp_addr *calling_addr) {
+ struct iu_new_ctx_entry *entry = talloc_zero(talloc_iu_ctx, struct
iu_new_ctx_entry);
+
+ entry->conn_id = conn_id;
+ entry->sccp_addr = *calling_addr;
+
+ llist_add(>list, _conn_sccp_addr_list);
+}
+
+static const struct osmo_sccp_addr *ue_conn_sccp_addr_find(uint32_t conn_id) {
+ struct iu_new_ctx_entry *entry;
+ llist_for_each_entry(entry, _conn_sccp_addr_list, list) {
+ if (entry->conn_id == conn_id) {
+ return >sccp_addr;
+ }
+ }
+ return NULL;
+}
+
+static void ue_conn_sccp_addr_del(uint32_t conn_id) {
+ struct iu_new_ctx_entry *entry;
+ llist_for_each_entry(entry, _conn_sccp_addr_list, list) {
+ if (entry->conn_id == conn_id) {
+ llist_del(>list);
+ talloc_free(entry);
+ return;
+ }
+ }
+}
+
static struct ranap_iu_rnc *iu_rnc_alloc(uint16_t rnc_id, struct
osmo_sccp_addr *addr)
{
struct ranap_iu_rnc *rnc = talloc_zero(talloc_iu_ctx, struct
ranap_iu_rnc);
@@ -831,24 +870,29 @@
/* indication of new inbound connection request*/
conn_id = prim->u.connect.conn_id;
LOGPIU(LOGL_DEBUG, "N-CONNECT.ind(X->%u)\n", conn_id);
- if (/* prim->u.connect.called_addr.ssn != OSMO_SCCP_SSN_RANAP
|| */
- !msgb_l2(oph->msg) || msgb_l2len(oph->msg) == 0) {
- LOGPIU(LOGL_NOTICE,
-"Received invalid N-CONNECT.ind\n");
- return 0;
- }
+
new_ctx.sccp_addr = prim->u.connect.calling_addr;
new_ctx.conn_id = conn_id;
+
/* first ensure the local SCCP socket is ACTIVE */
resp = make_conn_resp(>u.connect);
osmo_sccp_user_sap_down(scu, resp);
/* then handle the RANAP payload */
- rc = ranap_cn_rx_co(cn_ranap_handle_co_initial, _ctx,
msgb_l2(oph->msg), msgb_l2len(oph->msg));
+ if (/* prim->u.connect.called_addr.ssn != OSMO_SCCP_SSN_RANAP
|| */
+ !msgb_l2(oph->msg) || msgb_l2len(oph->msg) == 0) {
+ LOGPIU(LOGL_DEBUG,
+"Received N-CONNECT.ind without data\n");
+ ue_conn_sccp_addr_add(conn_id,
>u.connect.calling_addr);
+ } else {
+ rc = ranap_cn_rx_co(cn_ranap_handle_co_initial,
_ctx, msgb_l2(oph->msg), msgb_l2len(oph->msg));
+ }
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):
/* indication of disconnect */
conn_id = prim->u.disconnect.conn_id;
LOGPIU(LOGL_DEBUG, "N-DISCONNECT.ind(%u)\n", conn_id);
+
+ ue_conn_sccp_addr_del(conn_id);
ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
@@ -876,10 +920,23 @@
conn_id = prim->u.data.conn_id;
LOGPIU(LOGL_DEBUG, "N-DATA.ind(%u, %s)\n", conn_id,
osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)));
+
/* resolve UE context */
ue = ue_conn_ctx_find(conn_id);
- if (!ue)
+ if (!ue) {
+ /* Could be an InitialUE-Message after an empty CR,
recreate
[S] Change in osmo-iuh[master]: iu_client: Use local variable to track conn_id
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email )
Change subject: iu_client: Use local variable to track conn_id
..
iu_client: Use local variable to track conn_id
Change-Id: I967a311e2ad5af585c032426cc6b0680c3313b0f
---
M src/iu_client.c
1 file changed, 21 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/53/35353/1
diff --git a/src/iu_client.c b/src/iu_client.c
index 077ac27..9da11ea 100644
--- a/src/iu_client.c
+++ b/src/iu_client.c
@@ -819,6 +819,7 @@
int rc = -1;
struct ranap_ue_conn_ctx *ue;
struct new_ue_conn_ctx new_ctx = {};
+ uint32_t conn_id;
LOGPIU(LOGL_DEBUG, "sccp_sap_up(%s)\n", osmo_scu_prim_name(oph));
@@ -828,7 +829,8 @@
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION):
/* indication of new inbound connection request*/
- LOGPIU(LOGL_DEBUG, "N-CONNECT.ind(X->%u)\n",
prim->u.connect.conn_id);
+ conn_id = prim->u.connect.conn_id;
+ LOGPIU(LOGL_DEBUG, "N-CONNECT.ind(X->%u)\n", conn_id);
if (/* prim->u.connect.called_addr.ssn != OSMO_SCCP_SSN_RANAP
|| */
!msgb_l2(oph->msg) || msgb_l2len(oph->msg) == 0) {
LOGPIU(LOGL_NOTICE,
@@ -836,7 +838,7 @@
return 0;
}
new_ctx.sccp_addr = prim->u.connect.calling_addr;
- new_ctx.conn_id = prim->u.connect.conn_id;
+ new_ctx.conn_id = conn_id;
/* first ensure the local SCCP socket is ACTIVE */
resp = make_conn_resp(>u.connect);
osmo_sccp_user_sap_down(scu, resp);
@@ -845,9 +847,9 @@
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):
/* indication of disconnect */
- LOGPIU(LOGL_DEBUG, "N-DISCONNECT.ind(%u)\n",
- prim->u.disconnect.conn_id);
- ue = ue_conn_ctx_find(prim->u.disconnect.conn_id);
+ conn_id = prim->u.disconnect.conn_id;
+ LOGPIU(LOGL_DEBUG, "N-DISCONNECT.ind(%u)\n", conn_id);
+ ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
@@ -856,14 +858,14 @@
rc = ranap_cn_rx_co(cn_ranap_handle_co, ue,
msgb_l2(oph->msg), msgb_l2len(oph->msg));
/* A Iu Release event might be used to free the UE in
cn_ranap_handle_co. */
- ue = ue_conn_ctx_find(prim->u.disconnect.conn_id);
+ ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
global_iu_event(ue, RANAP_IU_EVENT_LINK_INVALIDATED, NULL);
/* A RANAP_IU_EVENT_LINK_INVALIDATED, can lead to a free */
- ue = ue_conn_ctx_find(prim->u.disconnect.conn_id);
+ ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
if (ue->free_on_release)
@@ -871,10 +873,11 @@
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):
/* connection-oriented data received */
- LOGPIU(LOGL_DEBUG, "N-DATA.ind(%u, %s)\n", prim->u.data.conn_id,
+ conn_id = prim->u.data.conn_id;
+ LOGPIU(LOGL_DEBUG, "N-DATA.ind(%u, %s)\n", conn_id,
osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)));
/* resolve UE context */
- ue = ue_conn_ctx_find(prim->u.data.conn_id);
+ ue = ue_conn_ctx_find(conn_id);
if (!ue)
break;
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I967a311e2ad5af585c032426cc6b0680c3313b0f
Gerrit-Change-Number: 35353
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: dexter, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. Patch Set 5: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/42cf836f_15bccd65 PS5, Line 7: ecu: force alignment of member data in struct osmo_ecu_state you probably need to update the whole commit description since the approach changed. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 13 Dec 2023 13:53:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: dexter, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. Patch Set 4: Code-Review+1 (3 comments) Patchset: PS4: I don't see any good reason not to use container_of here instead of casting. File src/codec/ecu_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/18f6223c_7d3d57c8 PS4, Line 92: struct osmo_ecu_state ecu_state; Add a comment that ecu_state should be the first in the struct. If you used container_of, this wouldn't be required. https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/6e097f90_5147b26e PS4, Line 294: return (struct osmo_ecu_state*) fr; while the cast is fine, the container_of would probably be safer and would allow this struct to be anywhere, with no real cost (a few arithmetic operations). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 13 Dec 2023 13:53:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: dexter, laforge, neels, pespin. Hello Jenkins Builder, laforge, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. ecu: force alignment of member data in struct osmo_ecu_state The member data[0] in struct osmo_ecu_state is used as an anchor to attach private structs for a concrete ECU implementation. This works by allocating more memory then struct osmo_ecu_state actually needs and then using the excess memory to store the private struct of the concrete ECU implementation. However, this poses a problem since data[0] is at the end of the struct it may land in an unaligned position. This also means that the struct we store there is also unaligned. We should fix this enclosing the public struct osmo_ecu_state into our private struct fr_ecu_state. Then we can simply cast from osmo_ecu_state to fr_ecu_state and correct alignment is ensured as well. Related: OS#6286 Change-Id: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 --- M src/codec/ecu_fr.c 1 file changed, 30 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/35212/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: laforge, neels, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. Patch Set 4: (1 comment) File src/codec/ecu_fr.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13097): https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/66145869_dbff51aa PS4, Line 294: return (struct osmo_ecu_state*) fr; "(foo*)" should be "(foo *)" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 13 Dec 2023 13:48:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email to look at the new patch set (#4). Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. ecu: force alignment of member data in struct osmo_ecu_state The member data[0] in struct osmo_ecu_state is used as an anchor to attach private structs for a concrete ECU implementation. This works by allocating more memory then struct osmo_ecu_state actually needs and then using the excess memory to store the private struct of the concrete ECU implementation. However, this poses a problem since data[0] is at the end of the struct it may land in an unaligned position. This also means that the struct we store there is also unaligned. We should fix this enclosing the public struct osmo_ecu_state into our private struct fr_ecu_state. Then we can simply cast from osmo_ecu_state to fr_ecu_state and correct alignment is ensured as well. Related: OS#6286 Change-Id: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 --- M src/codec/ecu_fr.c 1 file changed, 30 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/35212/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: laforge, neels, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. Patch Set 3: (1 comment) File src/codec/ecu_fr.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13096): https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/c3fdbdc1_eba31939 PS3, Line 294: return (struct osmo_ecu_state*) fr; "(foo*)" should be "(foo *)" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 13 Dec 2023 13:47:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. ecu: force alignment of member data in struct osmo_ecu_state The member data[0] in struct osmo_ecu_state is used as an anchor to attach private structs for a concrete ECU implementation. This works by allocating more memory then struct osmo_ecu_state actually needs and then using the excess memory to store the private struct of the concrete ECU implementation. However, this poses a problem since data[0] is at the end of the struct it may land in an unaligned position. This also means that the struct we store there is also unaligned. We should fix this enclosing the public struct osmo_ecu_state into our private struct fr_ecu_state. Then we can simply cast from osmo_ecu_state to fr_ecu_state and correct alignment is ensured as well. Related: OS#6286 Change-Id: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 --- M TODO-RELEASE M src/codec/ecu_fr.c 2 files changed, 31 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/35212/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: ecu: force alignment of member data in struct osmo_ecu_state
Attention is currently required from: laforge, neels, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: force alignment of member data in struct osmo_ecu_state .. Patch Set 3: (1 comment) Patchset: PS2: > I think your comments are still not refuting my feedback on the fact that > using the data[] array to […] I have tried it now and it seems to work fine. I think we do not have to use offsetof and container_of, we just have to cast. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?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: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 13 Dec 2023 13:47:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in libosmocore[master]: ipa_ccm_tlv_to_unitdata(): free previous string if present before all...
Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35347?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: ipa_ccm_tlv_to_unitdata(): free previous string if present before allocating new one .. ipa_ccm_tlv_to_unitdata(): free previous string if present before allocating new one Change-Id: I66cbd900676875145810ad1d5c07e719311852fb --- M src/gsm/ipa.c 1 file changed, 30 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/35347/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35347?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: I66cbd900676875145810ad1d5c07e719311852fb Gerrit-Change-Number: 35347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: filesystem: use sort path when selecting an application
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35351?usp=email ) Change subject: filesystem: use sort path when selecting an application .. filesystem: use sort path when selecting an application The method build_select_path_to uses the internal file system tree model to find the path to a given file. This works the same for applications (ADF) as it works for normal files (EF/DF). However, an application can be selected anytime from any location in the filesystem tree. There is no need to select a specific path leading to that application first. This means that if there is an ADF somewhere in the resulting inter_path, we may clip everything before that ADF. Related: OS#5418 Change-Id: I838a99bb47afc73b4274baecb04fff31abf7b2e2 --- M pySim/filesystem.py 1 file changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/35351/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index d39162c..35863a8 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -136,6 +136,16 @@ return ret def build_select_path_to(self, target: 'CardFile') -> Optional[List['CardFile']]: + +# special-case handling for applications. Applications may be selected +# any time from any location. If there is an ADF somewhere in the path, +# we may clip everything before that ADF. +def clip_path(inter_path): +for i in reversed(range(0, len(inter_path))): +if isinstance(inter_path[i], CardADF): +return inter_path[i:] +return inter_path + """Build the relative sequence of files we need to traverse to get from us to 'target'.""" # special-case handling for selecting MF while we MF is selected if target == target.get_mf(): @@ -152,7 +162,7 @@ for te2 in target_fqpath[i+1:]: inter_path.append(te2) # we found our common ancestor -return inter_path[1:] +return clip_path(inter_path[1:]) return None def get_mf(self) -> Optional['CardMF']: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35351?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: I838a99bb47afc73b4274baecb04fff31abf7b2e2 Gerrit-Change-Number: 35351 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in pysim[master]: filesystem: fix typo
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35352?usp=email ) Change subject: filesystem: fix typo .. filesystem: fix typo Change-Id: I721875d302ab69340d56b33102297b56c070465f --- M pySim/filesystem.py 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/35352/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 35863a8..0e72921 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -147,7 +147,7 @@ return inter_path """Build the relative sequence of files we need to traverse to get from us to 'target'.""" -# special-case handling for selecting MF while we MF is selected +# special-case handling for selecting MF while the MF is selected if target == target.get_mf(): return [target] cur_fqpath = self.fully_qualified_path_fobj() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35352?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: I721875d302ab69340d56b33102297b56c070465f Gerrit-Change-Number: 35352 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[M] Change in pysim[master]: runtime: refactor file selection methods select and select_file
Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34932?usp=email ) Change subject: runtime: refactor file selection methods select and select_file .. Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34932?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: I9ae213f3b078983f3e6d4c11db38fdbe504c84f2 Gerrit-Change-Number: 34932 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 13 Dec 2023 11:48:22 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: Revert "Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_...
Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35338?usp=email ) Change subject: Revert "Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()"" .. Patch Set 1: (1 comment) Patchset: PS1: > We could have avoided having to revert a revert if we branched from master, > so that we would have cl […] that's precisely what I wanted to avoid, having the tag out of master branch. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35338?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idd113e328a693df2e8f2f5d172eaf5bf2bfcf009 Gerrit-Change-Number: 35338 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 13 Dec 2023 11:44:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: ipa: Use ASP name as ipa_unit_name on dynamic ASPs
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/35348?usp=email )
Change subject: ipa: Use ASP name as ipa_unit_name on dynamic ASPs
..
ipa: Use ASP name as ipa_unit_name on dynamic ASPs
A recent patch fixed a long problem where the ASP name (instead of
expected AS name) was used as ipa_unit_name in IPA based ASPs.
For server side it doesn't matter much, sense anyway the ipa_unit_name
is actually restored on the struct with what's received in IPA GET_RESP
message (see ipa_asp_fsm_wait_id_resp()). So the fix was actually for
the client side in the scenario where a non-dynamic ASP with an assigned
AS was configured in the VTY.
However, dynamic ASPs usually have no assigned AS (because in general it
is really not created/configured, as the ASP is created on the flight).
As a result, the recent patch (see "Fixes" below), broke dynamic ASPs
case because from then one ipa_asp_fsm_start() would fail and terminate
the FSM because ipa_find_as_for_asp() was returning NULL.
So improve the recent patch by applying the previous logic for dynamic
ASPs:
* On the server side, it really doesn't matter since as mentioned, the
field will be repopulated later on, but allows the code to avoid
terminating the FSM and hence be brought up and be ready to receive
clients.
* On the client case, this is how dynamic IPA ASPs were ment to be used
when they were introduced anyway (use ASP as ipa_unit_id, meaning
"AS name" == "ASP name").
Furthermore, on the client side, the non-dynamic IPA ASPs need their
bring up be delayed until assigned to an AS, because the AS name is sent
in ipa_unit_name field in Tx IPA ID RESP.
This usually happens at a later point than ASP (FSM) creation, because
first the ASP object is created (through VTY or API) and then assigned
to an AS through osmo_ss7_as_add_asp() usually from a later "asp" vty
command in the "as" node.
Fixes: 65741dca056e3a16973ad156dd4c09760a6a945b
Change-Id: I0a741449450c998253b1e44a76a3b7fc224e0903
Related: SYS#5914
---
M src/osmo_ss7_as.c
M src/xua_asp_fsm.c
M src/xua_asp_fsm.h
3 files changed, 86 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c
index 34baf52..9d78897 100644
--- a/src/osmo_ss7_as.c
+++ b/src/osmo_ss7_as.c
@@ -35,6 +35,7 @@
#include "ss7_internal.h"
#include "xua_as_fsm.h"
+#include "xua_asp_fsm.h"
/***
* SS7 Application Server
@@ -114,6 +115,7 @@
for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {
if (!as->cfg.asps[i]) {
as->cfg.asps[i] = asp;
+ osmo_fsm_inst_dispatch(asp->fi, XUA_ASP_E_AS_ASSIGNED,
as);
return 0;
}
}
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index cc9a13a..701e081 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -65,6 +65,8 @@
{ XUA_ASP_E_ASPSM_BEAT, "ASPSM_BEAT" },
{ XUA_ASP_E_ASPSM_BEAT_ACK, "ASPSM_BEAT_ACK" },
+ { XUA_ASP_E_AS_ASSIGNED,"AS_ASSIGNED" },
+
{ IPA_ASP_E_ID_RESP,"IPA_CCM_ID_RESP" },
{ IPA_ASP_E_ID_GET, "IPA_CCM_ID_GET" },
{ IPA_ASP_E_ID_ACK, "IPA_CCM_ID_ACK" },
@@ -687,6 +689,9 @@
case XUA_ASP_E_ASPSM_BEAT_ACK:
/* FIXME: stop timer, if any */
break;
+ case XUA_ASP_E_AS_ASSIGNED:
+ /* Ignore, only used in IPA asps so far. */
+ break;
default:
break;
}
@@ -1058,6 +1063,7 @@
static void ipa_asp_allstate(struct osmo_fsm_inst *fi, uint32_t event, void
*data)
{
struct ipa_asp_fsm_priv *iafp = fi->priv;
+ struct osmo_ss7_as *as;
int fd;
switch (event) {
@@ -1077,6 +1083,15 @@
/* stop timer, if any */
osmo_timer_del(>pong_timer);
break;
+ case XUA_ASP_E_AS_ASSIGNED:
+ as = data;
+ osmo_talloc_replace_string(iafp->ipa_unit,
>ipa_unit->unit_name, as->cfg.name);
+ /* Now that the AS is known, start the client side: */
+ if (iafp->role == OSMO_SS7_ASP_ROLE_ASP && fi->state ==
IPA_ASP_S_DOWN) {
+ LOGPFSML(fi, LOGL_NOTICE, "Bringing up ASP now once it
has been assigned to an AS\n");
+ osmo_fsm_inst_dispatch(fi, XUA_ASP_E_M_ASP_UP_REQ,
NULL);
+ }
+ break;
default:
break;
}
@@ -1175,7 +1190,8 @@
.allstate_event_mask = S(XUA_ASP_E_SCTP_COMM_DOWN_IND) |
S(XUA_ASP_E_SCTP_RESTART_IND) |
S(XUA_ASP_E_ASPSM_BEAT) |
-
[S] Change in libosmo-sccp[master]: cosmetic: Fix typo in function doc
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35335?usp=email ) Change subject: cosmetic: Fix typo in function doc .. cosmetic: Fix typo in function doc Change-Id: I1c4fe7d1b3a5cdd4c2c9c942e292a7135467d9e2 --- M src/xua_asp_fsm.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index cc94ac7..cc9a13a 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -1180,7 +1180,7 @@ }; -/*! \brief Start a new ASP finite stae machine for given ASP +/*! \brief Start a new ASP finite state machine for given ASP * \param[in] asp Application Server Process for which to start FSM * \param[in] role Role (ASP, SG, IPSP) of this FSM * \param[in] log_level Logging Level for ASP FSM logging -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1c4fe7d1b3a5cdd4c2c9c942e292a7135467d9e2 Gerrit-Change-Number: 35335 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp .. Patch Set 10: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/67fc76e4_e93b0851 PS9, Line 1290: && (mgcp_msg->ptmap[i].codec == CODEC_AMR_8000_1 > - it's much more efficient to read the condition with operators at the start. > […] sure, just wanted to point thsi out since it appeared here. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 10 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 13 Dec 2023 11:40:53 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in pysim[master]: runtime: refactor file selection methods select and select_file
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34932?usp=email ) Change subject: runtime: refactor file selection methods select and select_file .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34932?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: I9ae213f3b078983f3e6d4c11db38fdbe504c84f2 Gerrit-Change-Number: 34932 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 13 Dec 2023 09:28:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in pysim[master]: runtime: refactor file selection methods select and select_file
Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34932?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: runtime: refactor file selection methods select and select_file .. runtime: refactor file selection methods select and select_file The implementation of the methods select and select_file of class RuntimeLchan is a bit complex. We access the card directly in several places which makes it difficult to track the state changes. We should clean this up so that we call self.rs.card.select_adf_by_aid/ self.scc.select_file from a single place only. This means that the method select uses the method select_file. This results in a much cleaner implementation. We also should take care that the important states that we track (selected_file, selected_adf, etc.) are updated by a single private method. Since the update always must happen after a select _select_post is a good place to do this. Related: OS#5418 Change-Id: I9ae213f3b078983f3e6d4c11db38fdbe504c84f2 --- M pySim/runtime.py 1 file changed, 72 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/34932/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34932?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: I9ae213f3b078983f3e6d4c11db38fdbe504c84f2 Gerrit-Change-Number: 34932 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in pysim[master]: runtime: refactor file selection methods select and select_file
Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34932?usp=email ) Change subject: runtime: refactor file selection methods select and select_file .. Patch Set 4: (2 comments) File pySim/runtime.py: https://gerrit.osmocom.org/c/pysim/+/34932/comment/0ca99f6a_1263e04f PS3, Line 357: failes > fails (without 'e') Done https://gerrit.osmocom.org/c/pysim/+/34932/comment/68ed37cd_7fea7177 PS3, Line 383: f = sels[name] > unused? you're doing `sels[name]` below... Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34932?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: I9ae213f3b078983f3e6d4c11db38fdbe504c84f2 Gerrit-Change-Number: 34932 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 13 Dec 2023 09:08:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in pysim[master]: runtime: explain how file probing works
dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35251?usp=email ) Change subject: runtime: explain how file probing works .. runtime: explain how file probing works We use a trick to probe a file (that does not exist in the local file model yet). Let's explain further how that works, in particular why we do not have to upate any state if probing fails. Change-Id: I2a8af73654251d105af8de1c17da53dfa10dc669 Related: OS#5418 --- M pySim/runtime.py 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/pySim/runtime.py b/pySim/runtime.py index 028bef1..1155433 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -256,6 +256,12 @@ "Cannot select unknown file by name %s, only hexadecimal 4 digit FID is allowed" % fid) try: +# We access the card through the select_file method of the scc object. +# If we succeed, we know that the file exists on the card and we may +# proceed with creating a new CardEF object in the local file model at +# run time. In case the file does not exist on the card, we just abort. +# The state on the card (selected file/application) wont't be changed, +# so we do not have to update any state in that case. (data, sw) = self.scc.select_file(fid) except SwMatchError as swm: k = self.interpret_sw(swm.sw_actual) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35251?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: I2a8af73654251d105af8de1c17da53dfa10dc669 Gerrit-Change-Number: 35251 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
