Attention is currently required from: pespin.
fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43154?usp=email )
Change subject: Revert "stp: add ASP_SCCP_N_NOTICE_req support and f_asp_tx_notice()"
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43154?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Iecce8999b72b363a7aa3f583beeb937e79fe215f
Gerrit-Change-Number: 43154
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 03 Aug 2026 12:39:01 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: pespin.
fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43153?usp=email )
Change subject: Revert "stp: Add TCAP_N_NOTICE_req to send a UDTS with TCAP payload"
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43153?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4e96d9f0ceaafb2b5883b0e1f2d8d9f6065fd415
Gerrit-Change-Number: 43153
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 03 Aug 2026 12:38:50 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43158?usp=email )
Change subject: stp: Define IUT default T(beat) in mp_t_beat_sec_default
......................................................................
stp: Define IUT default T(beat) in mp_t_beat_sec_default
Several tests expect to know this value from the IUT in order to test
related features. Since it will be used in more places in follow-up
patches, move it so the information only needs to be configured once.
Change-Id: Ic518e0d35f377fef85344177b630eb8599ec22d0
---
M stp/STP_Tests_Common.ttcn
M stp/STP_Tests_IPA.ttcn
M stp/STP_Tests_M3UA.ttcn
3 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/43158/1
diff --git a/stp/STP_Tests_Common.ttcn b/stp/STP_Tests_Common.ttcn
index 0a0a436..16b6406 100644
--- a/stp/STP_Tests_Common.ttcn
+++ b/stp/STP_Tests_Common.ttcn
@@ -28,6 +28,11 @@
import from SCCPasp_Types all;
import from SCCP_Emulation all;
+modulepar {
+ /* Default T(beat) configured at the IUT ASP, in seconds */
+ integer mp_t_beat_sec_default := 30;
+}
+
function f_SCCP_UDT(template (value) SCCP_PAR_Address calling := ts_SccpAddr_GT('5678'H),
template (value) SCCP_PAR_Address called := ts_SccpAddr_GT('1234'H),
template (omit) octetstring data := omit) return octetstring
diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index 431bdd4..7225949 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -849,7 +849,7 @@
}
/* return to default value: */
- f_vty_cs7_ipa_asp_cmd(g_ipa_configs[0], "timer xua beat 30");
+ f_vty_cs7_ipa_asp_cmd(g_ipa_configs[0], "timer xua beat " & int2str(STP_Tests_Common.mp_t_beat_sec_default));
}
/* Test the IUT sends heartbeat procedure when needed. */
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index ac9cc25..7debed6 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -598,7 +598,7 @@
}
/* return to default value: */
- f_vty_cs7_asp_cmd(g_m3ua_configs[0], "timer xua beat 30");
+ f_vty_cs7_asp_cmd(g_m3ua_configs[0], "timer xua beat " & int2str(STP_Tests_Common.mp_t_beat_sec_default));
f_clear_m3ua();
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43158?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic518e0d35f377fef85344177b630eb8599ec22d0
Gerrit-Change-Number: 43158
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: daniel, laforge, lynxis lazus, osmith, pespin.
Hello Jenkins Builder, daniel, fixeria, laforge, lynxis lazus, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43152?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by osmith, Verified+1 by Jenkins Builder
Change subject: stp: tcap: Avoid need of N_NOTICE.req
......................................................................
stp: tcap: Avoid need of N_NOTICE.req
Commits
7970ceaead78ff224390a25f416b22bcd8e4e37e..32618160bdb154ca756c783b67b131533226f7ae
added a fork of titan.Protocol.Emulations.SCCP with a new N-NOTICE.req
primitive which was needed in STP_Tests_TCAP to trigger transmission of
a UDTS message.
That primitive doesn't exist in the specs, since no user of SCCP is
expected to be requesting a transmision of UDTS.
Hence, this commit rewrites the test to avoid the need for such a
primitive, by hooking directly into the lower layer MTP3 User SAP (M3UA
or IPA) and crafting and transmitting the SCCP UDTS over there directly.
Follow up commits will revert the commits adding such a N-NOTICE req to
the SCCP and TCAP layers.
Related: SYS#8090
Change-Id: Ia1b7f487124584ab1720cb89bca5999cbb12392d
---
M stp/STP_Tests_TCAP.ttcn
1 file changed, 77 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/43152/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43152?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ia1b7f487124584ab1720cb89bca5999cbb12392d
Gerrit-Change-Number: 43152
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43157?usp=email )
Change subject: asp: vty: Explicitly test timer lm value ranges
......................................................................
asp: vty: Explicitly test timer lm value ranges
Validate the value to be set provided by user over VTY is actually
within the range of the specific tdef being set.
Mark all of them explicitly as min_val=1 in its tdef, since they are not
expected to be set to 0 (see also gen_asp_timer_lm_cmd_strs() defining a
VTY range <1..999999>).
Change-Id: I9b2c426a1eaceb6e7c5fbe35872ada324fef5733
---
M src/ss7_asp_vty.c
M src/xua_default_lm_fsm.c
M tests/vty/osmo_stp_test.vty
M tests/vty/ss7_asp_test.vty
4 files changed, 34 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/57/43157/1
diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c
index 21d19d6..5136105 100644
--- a/src/ss7_asp_vty.c
+++ b/src/ss7_asp_vty.c
@@ -891,13 +891,27 @@
{
struct osmo_ss7_asp *asp = vty->index;
enum ss7_asp_lm_timer timer = get_string_value(ss7_asp_lm_timer_names, argv[0]);
+ int rc;
+ unsigned long new_val = atoi(argv[1]);
if (timer <= 0 || timer >= SS7_ASP_LM_TIMERS_LEN) {
vty_out(vty, "%% Invalid timer: %s%s", argv[0], VTY_NEWLINE);
return CMD_WARNING;
}
- osmo_tdef_set(asp->cfg.T_defs_lm, timer, atoi(argv[1]), OSMO_TDEF_S);
+ rc = osmo_tdef_set(asp->cfg.T_defs_lm, timer, new_val, OSMO_TDEF_S);
+ if (rc < 0) {
+ struct osmo_tdef *t = osmo_tdef_get_entry(asp->cfg.T_defs_lm, timer);
+ if (!t)
+ return CMD_WARNING;
+ if (!osmo_tdef_val_in_range(t, new_val)) {
+ char range_str[64];
+ osmo_tdef_range_str_buf(range_str, sizeof(range_str), t);
+ vty_out(vty, "%% Timer %s value %lu is out of range %s%s",
+ argv[0], new_val, range_str, VTY_NEWLINE);
+ }
+ return CMD_WARNING;
+ }
return CMD_SUCCESS;
}
diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c
index 73c4fdc..db84e6e 100644
--- a/src/xua_default_lm_fsm.c
+++ b/src/xua_default_lm_fsm.c
@@ -102,13 +102,17 @@
const struct osmo_tdef ss7_asp_lm_timer_defaults[SS7_ASP_LM_TIMERS_LEN] = {
{ .T = SS7_ASP_LM_T_WAIT_ASP_UP, .default_val = 20, .unit = OSMO_TDEF_S,
- .desc = "Restart ASP after timeout waiting for ASP UP (SG role) / ASP UP ACK (ASP role) (s)" },
+ .desc = "Restart ASP after timeout waiting for ASP UP (SG role) / ASP UP ACK (ASP role) (s)",
+ .min_val = 1 },
{ .T = SS7_ASP_LM_T_WAIT_NOTIFY, .default_val = 2, .unit = OSMO_TDEF_S,
- .desc = "Restart ASP after timeout waiting for NOTIFY (s)" },
+ .desc = "Restart ASP after timeout waiting for NOTIFY (s)",
+ .min_val = 1 },
{ .T = SS7_ASP_LM_T_WAIT_NOTIY_RKM, .default_val = 20, .unit = OSMO_TDEF_S,
- .desc = "Restart ASP after timeout waiting for NOTIFY after RKM registration (s)" },
+ .desc = "Restart ASP after timeout waiting for NOTIFY after RKM registration (s)",
+ .min_val = 1 },
{ .T = SS7_ASP_LM_T_WAIT_RK_REG_RESP, .default_val = 10, .unit = OSMO_TDEF_S,
- .desc = "Restart ASP after timeout waiting for RK_REG_RESP (s)" },
+ .desc = "Restart ASP after timeout waiting for RK_REG_RESP (s)",
+ .min_val = 1 },
{}
};
diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty
index 2dbd5b2..d52ae5f 100644
--- a/tests/vty/osmo_stp_test.vty
+++ b/tests/vty/osmo_stp_test.vty
@@ -415,6 +415,11 @@
... !timer xua beat 30
...
+OsmoSTP(config-cs7-asp)# timer lm ?
+ wait_asp_up Restart ASP after timeout waiting for ASP UP (SG role) / ASP UP ACK (ASP role) (s) (default: 20)
+ wait_notify Restart ASP after timeout waiting for NOTIFY (s) (default: 2)
+ wait_notify_rkm Restart ASP after timeout waiting for NOTIFY after RKM registration (s) (default: 20)
+ wait_rk_reg_resp Restart ASP after timeout waiting for RK_REG_RESP (s) (default: 10)
OsmoSTP(config-cs7-asp)# exit
% NOTE: Skipping automatic restart of ASP since an explicit '[no] shutdown' command was entered
diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty
index f3193b6..5ea965b 100644
--- a/tests/vty/ss7_asp_test.vty
+++ b/tests/vty/ss7_asp_test.vty
@@ -432,6 +432,12 @@
... !timer xua beat 30
...
+ss7_asp_vty_test(config-cs7-asp)# timer lm ?
+ wait_asp_up Restart ASP after timeout waiting for ASP UP (SG role) / ASP UP ACK (ASP role) (s) (default: 20)
+ wait_notify Restart ASP after timeout waiting for NOTIFY (s) (default: 2)
+ wait_notify_rkm Restart ASP after timeout waiting for NOTIFY after RKM registration (s) (default: 20)
+ wait_rk_reg_resp Restart ASP after timeout waiting for RK_REG_RESP (s) (default: 10)
+
ss7_asp_vty_test(config-cs7-asp)# exit
% NOTE: Make sure to use '[no] shutdown' command in 'asp' node in order to restart the ASP for new configs to be applied.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43157?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I9b2c426a1eaceb6e7c5fbe35872ada324fef5733
Gerrit-Change-Number: 43157
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Attention is currently required from: daniel, fixeria, laforge, lynxis lazus, pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43152?usp=email )
Change subject: stp: tcap: Avoid need of N_NOTICE.req
......................................................................
Patch Set 1:
(1 comment)
File stp/STP_Tests_TCAP.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43152/comment/00f0c447_d105… :
PS1, Line 212: private function f_asp_disconnect_mtp3_port(integer asp_idx := 0) runs on TCAP_CT
> Not really needed for the existing test, but since most of the complexity with all this is actually […]
Acknowledged
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43152?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ia1b7f487124584ab1720cb89bca5999cbb12392d
Gerrit-Change-Number: 43152
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Mon, 03 Aug 2026 11:41:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>