May 2025 - gerrit-log - lists.osmocom.org

[XS] Change in libosmocore[rel-1.11.1]: tests: soft_uart: Fix printf int type format

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40220?usp=email ) Change subject: tests: soft_uart: Fix printf int type format ...................................................................... tests: soft_uart: Fix printf int type format This fixes a compiler error when compiling in rpi3. Change-Id: Ib8f190c81f20a28081b06cbd3de099f2b87372f4 (cherry picked from commit 4150c2e6b010aee1e087b206ed43a29d569ebd3d) --- M tests/soft_uart/soft_uart_test.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/40220/1 diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c index 7280bdc..a7de251 100644 --- a/tests/soft_uart/soft_uart_test.c +++ b/tests/soft_uart/soft_uart_test.c @@ -389,14 +389,14 @@ g_tx_cb_cfg.data = (void *)"\x55"; g_tx_cb_cfg.data_len = 1; - printf("======== pulling %lu bits (%u at a time)\n", sizeof(tx_buf), n); + printf("======== pulling %zu bits (%u at a time)\n", sizeof(tx_buf), n); for (unsigned int i = 0; i < sizeof(tx_buf); i += n) { rc = osmo_soft_uart_tx_ubits(suart, &tx_buf[i], n); OSMO_ASSERT(rc == n); } printf("%s\n", osmo_ubit_dump(&tx_buf[0], sizeof(tx_buf))); - printf("======== feeding %lu bits into the receiver\n", sizeof(tx_buf)); + printf("======== feeding %zu bits into the receiver\n", sizeof(tx_buf)); rc = osmo_soft_uart_rx_ubits(suart, &tx_buf[0], sizeof(tx_buf)); OSMO_ASSERT(rc == 0); osmo_soft_uart_flush_rx(suart); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40220?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: rel-1.11.1 Gerrit-Change-Id: Ib8f190c81f20a28081b06cbd3de099f2b87372f4 Gerrit-Change-Number: 40220 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmocore[rel-1.11.1]: lapd: Take talloc msgb ownership when enqueueing it

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40221?usp=email ) Change subject: lapd: Take talloc msgb ownership when enqueueing it ...................................................................... lapd: Take talloc msgb ownership when enqueueing it Otherwise the msg talloc reference is kept parented at some unknown pointer in some unknown upper layer, which may cause memory corruption or use-after-free. Related: OS#6728 Change-Id: I32729060b5a18576310b3789da522f4392d9611e (cherry picked from commit 630d9b81c8464a0e859dd6c5c72ab88a00b61841) --- M src/isdn/lapd_core.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/40221/1 diff --git a/src/isdn/lapd_core.c b/src/isdn/lapd_core.c index b32ed26..caaf092 100644 --- a/src/isdn/lapd_core.c +++ b/src/isdn/lapd_core.c @@ -1922,6 +1922,8 @@ LOGDL(dl, LOGL_INFO, "writing message to send-queue: l3len: %d\n", msgb_l3len(msg)); + /* Take ownership of msg, since we are keeping it around in this layer: */ + talloc_steal(tall_lapd_ctx, msg); /* Write data into the send queue */ msgb_enqueue(&dl->send_queue, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40221?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: rel-1.11.1 Gerrit-Change-Id: I32729060b5a18576310b3789da522f4392d9611e Gerrit-Change-Number: 40221 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmocore[rel-1.11.1]: lapdm: Take talloc msgb ownership when enqueueing it

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40222?usp=email ) Change subject: lapdm: Take talloc msgb ownership when enqueueing it ...................................................................... lapdm: Take talloc msgb ownership when enqueueing it Otherwise the msg talloc reference is kept parented at some unknown pointer in some unknown upper layer, which may cause memory corruption or use-after-free. Change-Id: Iba7b11bd9541c883588f34df67fdd865d72710d7 Related: OS#6728 (cherry picked from commit 9affae763e296d99eaefa0df59c4020146881bb8) --- M src/gsm/lapdm.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/40222/1 diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 1fc986d..3a0e29b 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -376,6 +376,8 @@ *msgb_push(msg, 1) = pad; *msgb_push(msg, 1) = link_id; *msgb_push(msg, 1) = chan_nr; + /* Take ownership of msg, since we are keeping it around in this layer: */ + talloc_steal(tall_lapd_ctx, msg); msgb_enqueue(&dl->dl.tx_queue, msg); return 0; } @@ -403,6 +405,8 @@ *msgb_push(msg, 1) = pad; *msgb_push(msg, 1) = link_id; *msgb_push(msg, 1) = chan_nr; + /* Take ownership of msg, since we are keeping it around in this layer: */ + talloc_steal(tall_lapd_ctx, msg); msgb_enqueue(&dl->tx_ui_queue, msg); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40222?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: rel-1.11.1 Gerrit-Change-Id: Iba7b11bd9541c883588f34df67fdd865d72710d7 Gerrit-Change-Number: 40222 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: vty: remove broken 'show startup-config' command

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/40187?usp=email ) Change subject: vty: remove broken 'show startup-config' command ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/40187/comment/e5e43cd0_14cf22c8?… : PS1, Line 12: If > > Doesn't that mean that the write is then broken? […] Here is an RFC: https://gerrit.osmocom.org/c/libosmocore/+/40219 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40187?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If0b4a79052c060cad963e6458b29000a979f95ba Gerrit-Change-Number: 40187 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 06 May 2025 09:11:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: vty: config_write_file_cmd: keep host.config intact

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40219?usp=email ) Change subject: vty: config_write_file_cmd: keep host.config intact ...................................................................... vty: config_write_file_cmd: keep host.config intact TODO Change-Id: I07daba20209f275673967175211193a3731ff1e2 Related: OS#6440 --- M src/vty/command.c 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/40219/1 diff --git a/src/vty/command.c b/src/vty/command.c index 8594290..38bbbb2 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -3489,6 +3489,7 @@ "Set file path to store the config, or replace if already exists\n") { char *failed_file; + const char *path; int rc; if (host.app_info->config_is_consistent) { @@ -3500,16 +3501,18 @@ } } - if (argc == 1) - host_config_set(argv[0]); + if (argc == 1) /* store to a new file */ + path = argv[0]; + else /* overwrite the startup config */ + path = host.config; - if (host.config == NULL) { + if (path == NULL) { vty_out(vty, "Can't save to configuration file, using vtysh.%s", VTY_NEWLINE); return CMD_WARNING; } - rc = write_config_file(host.config, &failed_file); + rc = write_config_file(path, &failed_file); switch (rc) { case -1: vty_out(vty, "Can't open configuration file %s.%s", @@ -3542,7 +3545,7 @@ rc = CMD_WARNING; break; default: - vty_out(vty, "Configuration saved to %s%s", host.config, VTY_NEWLINE); + vty_out(vty, "Configuration saved to %s%s", path, VTY_NEWLINE); rc = CMD_SUCCESS; break; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40219?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I07daba20209f275673967175211193a3731ff1e2 Gerrit-Change-Number: 40219 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: vty: remove broken 'show startup-config' command

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/40187?usp=email ) Change subject: vty: remove broken 'show startup-config' command ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40187?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If0b4a79052c060cad963e6458b29000a979f95ba Gerrit-Change-Number: 40187 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Update TC_rkm_unreg_active to expect multiple routing contexts

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40191?usp=email ) Change subject: stp: Update TC_rkm_unreg_active to expect multiple routing contexts ...................................................................... stp: Update TC_rkm_unreg_active to expect multiple routing contexts That test is registering a new routcing context (AS) into an existing/pre-configured ASP. As a result, the ASP serves 2 AS. When we receive notifications on that ASP then we'll be receiving info on 2 routing contexts, one for the pre-confgiured AS and one for the dynamically registered one. Depends: libosmo-sigtran.git I646301ec3d08ef98f227cf4d19da1039e40cedd2 Change-Id: I2dc4d197e6de38781b63e3079ada4c4b4a0db31d --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 89be9e0..18076bd 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -889,12 +889,12 @@ /* then activate the ASP, this turns the 2 AS (one for each rctx, 1234 and default 1023) * INACTIVE, handle the 2 NOTIFY manually afterwards: */ f_M3UA_asp_up(0, omit); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA, rctxB))); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA, rctxB))); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA))); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_asp_act(0, omit, rctxB); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, rctxB)); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctxA)); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, rctxA)); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_ACTIVE, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_exp(0, tr_M3UA_DAVA({*}, rctxB)); /* then try to de-register -> ERR_ASP_ACTIVE */ @@ -904,8 +904,8 @@ /* deactivate ASP and properly de-register to clean up */ f_M3UA_asp_inact(0); f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctxA))); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA, rctxB))); - f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA, rctxB))); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA & rctxB, rctxB & rctxA))); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_PENDING, (rctxA & rctxB, rctxB & rctxA))); f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_SUCCESS)})); f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation static-only"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40191?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2dc4d197e6de38781b63e3079ada4c4b4a0db31d Gerrit-Change-Number: 40191 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: M3UA_Templates: Allow passing multiple Routing Context values

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40189?usp=email ) Change subject: M3UA_Templates: Allow passing multiple Routing Context values ...................................................................... M3UA_Templates: Allow passing multiple Routing Context values Change-Id: I117c63786d71aea683b554cf294fee0ceed665e0 --- M library/M3UA_Templates.ttcn 1 file changed, 22 insertions(+), 22 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/M3UA_Templates.ttcn b/library/M3UA_Templates.ttcn index 3667ca0..1422b80 100644 --- a/library/M3UA_Templates.ttcn +++ b/library/M3UA_Templates.ttcn @@ -274,7 +274,7 @@ } template (value) PDU_M3UA ts_M3UA_ASPAC(template (omit) M3UA_Traffic_Mode_Type tmt, - template (omit) OCT4 rctx) := { + template (omit) octetstring rctx) := { m3UA_ASPAC := { version := c_M3UA_VERSION, reserved := '00'O, @@ -288,7 +288,7 @@ } } template (present) PDU_M3UA tr_M3UA_ASPAC(template M3UA_Traffic_Mode_Type tmt, - template OCT4 rctx) := { + template octetstring rctx) := { m3UA_ASPAC := { version := c_M3UA_VERSION, reserved := '00'O, @@ -303,7 +303,7 @@ } template (value) PDU_M3UA ts_M3UA_ASPAC_ACK(template (omit) M3UA_Traffic_Mode_Type tmt, - template (omit) OCT4 rctx) := { + template (omit) octetstring rctx) := { m3UA_ASPAC_Ack := { version := c_M3UA_VERSION, reserved := '00'O, @@ -317,7 +317,7 @@ } } template (present) PDU_M3UA tr_M3UA_ASPAC_ACK(template M3UA_Traffic_Mode_Type tmt, - template OCT4 rctx) := { + template octetstring rctx) := { m3UA_ASPAC_Ack := { version := c_M3UA_VERSION, reserved := '00'O, @@ -331,7 +331,7 @@ } } -template (value) PDU_M3UA ts_M3UA_ASPIA(template (omit) OCT4 rctx) := { +template (value) PDU_M3UA ts_M3UA_ASPIA(template (omit) octetstring rctx) := { m3UA_ASPIA := { version := c_M3UA_VERSION, reserved := '00'O, @@ -343,7 +343,7 @@ } } } -template (present) PDU_M3UA tr_M3UA_ASPIA(template OCT4 rctx) := { +template (present) PDU_M3UA tr_M3UA_ASPIA(template octetstring rctx) := { m3UA_ASPIA := { version := c_M3UA_VERSION, reserved := '00'O, @@ -357,7 +357,7 @@ } -template (value) PDU_M3UA ts_M3UA_ASPIA_ACK(template (omit) OCT4 rctx) := { +template (value) PDU_M3UA ts_M3UA_ASPIA_ACK(template (omit) octetstring rctx) := { m3UA_ASPIA_Ack := { version := c_M3UA_VERSION, reserved := '00'O, @@ -369,7 +369,7 @@ } } } -template (present) PDU_M3UA tr_M3UA_ASPIA_ACK(template OCT4 rctx) := { +template (present) PDU_M3UA tr_M3UA_ASPIA_ACK(template octetstring rctx) := { m3UA_ASPIA_Ack := { version := c_M3UA_VERSION, reserved := '00'O, @@ -418,7 +418,7 @@ } template (value) PDU_M3UA ts_M3UA_DUNA(template (value) M3UA_Point_Codes affected_pcs, - template (omit) OCT4 rctx := omit) := { + template (omit) octetstring rctx := omit) := { m3UA_DUNA := { version := c_M3UA_VERSION, reserved := '00'O, @@ -433,7 +433,7 @@ } } template (present) PDU_M3UA tr_M3UA_DUNA(template (present) M3UA_Point_Codes affected_pcs := ?, - template OCT4 rctx := *):= { + template octetstring rctx := *):= { m3UA_DUNA := { version := c_M3UA_VERSION, reserved := '00'O, @@ -449,7 +449,7 @@ } template (value) PDU_M3UA ts_M3UA_DAVA(template (value) M3UA_Point_Codes affected_pcs, - template (omit) OCT4 rctx := omit) := { + template (omit) octetstring rctx := omit) := { m3UA_DAVA := { version := c_M3UA_VERSION, reserved := '00'O, @@ -464,7 +464,7 @@ } } template (present) PDU_M3UA tr_M3UA_DAVA(template (present) M3UA_Point_Codes affected_pcs := ?, - template OCT4 rctx := *):= { + template octetstring rctx := *):= { m3UA_DAVA := { version := c_M3UA_VERSION, reserved := '00'O, @@ -480,7 +480,7 @@ } template (value) PDU_M3UA ts_M3UA_DAUD(template (value) M3UA_Point_Codes affected_pcs, - template (omit) OCT4 rctx := omit) := { + template (omit) octetstring rctx := omit) := { m3UA_DAUD := { version := c_M3UA_VERSION, reserved := '00'O, @@ -495,7 +495,7 @@ } } template (present) PDU_M3UA tr_M3UA_DAUD(template (present) M3UA_Point_Codes affected_pcs := ?, - template OCT4 rctx := *):= { + template octetstring rctx := *):= { m3UA_DAUD := { version := c_M3UA_VERSION, reserved := '00'O, @@ -511,7 +511,7 @@ } template (value) PDU_M3UA ts_M3UA_SCON(template (value) M3UA_Point_Codes affected_pcs, - template (omit) OCT4 rctx := omit) := { + template (omit) octetstring rctx := omit) := { m3UA_SCON := { version := c_M3UA_VERSION, reserved := '00'O, @@ -528,7 +528,7 @@ } } template (present) PDU_M3UA tr_M3UA_SCON(template (present) M3UA_Point_Codes affected_pcs := ?, - template OCT4 rctx := *):= { + template octetstring rctx := *):= { m3UA_SCON := { version := c_M3UA_VERSION, reserved := '00'O, @@ -548,7 +548,7 @@ template (value) PDU_M3UA ts_M3UA_DUPU(template (value) M3UA_Point_Codes affected_pcs, template (value) OCT2 cause, template (value) OCT2 user, - template (omit) OCT4 rctx := omit) := { + template (omit) octetstring rctx := omit) := { m3UA_DUPU := { version := c_M3UA_VERSION, reserved := '00'O, @@ -566,7 +566,7 @@ template (present) PDU_M3UA tr_M3UA_DUPU(template (present) M3UA_Point_Codes affected_pcs := ?, template (present) OCT2 cause := ?, template (present) OCT2 user := ?, - template OCT4 rctx := *):= { + template octetstring rctx := *):= { m3UA_DUPU := { version := c_M3UA_VERSION, reserved := '00'O, @@ -628,7 +628,7 @@ template (value) PDU_M3UA ts_M3UA_ERR(template (value) OCT4 err_code, - template (omit) OCT4 rctx) := { + template (omit) octetstring rctx) := { m3UA_ERR := { version := c_M3UA_VERSION, reserved := '00'O, @@ -644,7 +644,7 @@ } } template (present) PDU_M3UA tr_M3UA_ERR(template (present) OCT4 err_code, - template OCT4 rctx) := { + template octetstring rctx) := { m3UA_ERR := { version := c_M3UA_VERSION, reserved := '00'O, @@ -663,7 +663,7 @@ template (value) PDU_M3UA ts_M3UA_NOTIFY(template (value) OCT2 status_type, template (value) OCT2 status_info, - template (omit) OCT4 rctx, + template (omit) octetstring rctx, template (omit) OCT4 aspid := omit, template (omit) octetstring infostr := omit) := { m3UA_NOTIFY := { @@ -681,7 +681,7 @@ } template (present) PDU_M3UA tr_M3UA_NOTIFY(template (present) OCT2 status_type, template (present) OCT2 status_info, - template OCT4 rctx, + template octetstring rctx, template OCT4 aspid := *, template octetstring infostr := *) := { m3UA_NOTIFY := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40189?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I117c63786d71aea683b554cf294fee0ceed665e0 Gerrit-Change-Number: 40189 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Store asp name in array of m3ua cfgs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40192?usp=email ) Change subject: stp: Store asp name in array of m3ua cfgs ...................................................................... stp: Store asp name in array of m3ua cfgs This way we keep STP specific config in one place instead of having to figure out the ASP name on each test where we want to modify that ASP. Change-Id: I1d5d9113dc95a8da911a7a99260c9bfe6e9de7c9 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 23 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 18076bd..8ee35ec 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -48,6 +48,7 @@ M3uaConfigs mp_m3ua_configs := { /* as-sender: One ASP within AS */ { + asp_name := "asp-sender", use_tcp := false, remote_port := 2905, local_port := 9999, @@ -56,12 +57,14 @@ }, /* as-receiver: Two ASP within AS */ { + asp_name := "asp-receiver0", use_tcp := false, remote_port := 2905, local_port := 10000, point_code := 42, routing_ctx := 1042 }, { + asp_name := "asp-receiver1", use_tcp := false, remote_port := 2905, local_port := 10001, @@ -70,6 +73,7 @@ }, /* as-sender-tcp: One ASP within AS */ { + asp_name := "asp-sender-tcp", use_tcp := true, remote_port := 2905, local_port := 9999, @@ -78,6 +82,7 @@ }, /* as-client: One ASP within AS */ { + asp_name := "asp-client0", use_tcp := false, remote_port := 2906, local_port := 10002, @@ -86,6 +91,7 @@ }, /* as-client60-norctx */ { + asp_name := "asp-client60-norctx0", use_tcp := false, remote_port := 2907, local_port := 11060, @@ -94,6 +100,7 @@ }, /* as-client61-norctx */ { + asp_name := "asp-client61-norctx0", use_tcp := false, remote_port := 2907, local_port := 11061, @@ -102,6 +109,7 @@ }, /* as-client-tcp: One ASP within AS */ { + asp_name := "asp-client0-tcp", use_tcp := true, remote_port := 2906, local_port := 10002, @@ -118,6 +126,8 @@ } type record M3uaConfig { + /* Name of the ASP in the STP, (eg. to access it over VTY) */ + charstring asp_name, /* use TCP (true) or SCTP (false) */ boolean use_tcp, /* STP-side SCTP (or TCP) port for M3UA */ @@ -917,6 +927,7 @@ /* Pick ports not configured in osmo-stp for any ASP: */ var M3uaConfigs m3ua_configs := { { + asp_name := "unknown", use_tcp := false, remote_port := 2905, local_port := 2222, @@ -954,12 +965,14 @@ /* Pick ports not configured in osmo-stp for any ASP: */ var M3uaConfigs m3ua_configs := { { + asp_name := "unknown0", use_tcp := false, remote_port := 2905, local_port := 2222, point_code := 22, routing_ctx := 220 }, { + asp_name := "unknown1", use_tcp := false, remote_port := 2905, local_port := 2223, @@ -1309,11 +1322,11 @@ f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0)); } -private function f_asp_cfg_str(charstring asp_name, in M3uaConfig cfg) +private function f_asp_cfg_str(in M3uaConfig cfg) return charstring { var charstring str; - str := "asp " & asp_name; + str := "asp " & cfg.asp_name; str := str & " " & int2str(cfg.local_port); str := str & " " & int2str(cfg.remote_port); str := str & " m3ua"; @@ -1325,14 +1338,18 @@ return str; } +private function f_vty_cs7_asp_cmd(in M3uaConfig cfg, charstring cmd) runs on RAW_M3UA_CT +{ + var charstring asp_cfg_str := f_asp_cfg_str(cfg); + f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, cmd); +} + private function f_quirk(charstring quirk) runs on RAW_M3UA_CT { - var charstring asp_cfg_str := f_asp_cfg_str("asp-client0", f_m3ua_srv_config(0)); - f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, "quirk " & quirk); + f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "quirk " & quirk) } private function f_no_quirk(charstring quirk) runs on RAW_M3UA_CT { - var charstring asp_cfg_str := f_asp_cfg_str("asp-client0", f_m3ua_srv_config(0)); - f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, "no quirk " & quirk); + f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "no quirk " & quirk) } /* quirk 'no_notify': Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1d5d9113dc95a8da911a7a99260c9bfe6e9de7c9 Gerrit-Change-Number: 40192 Gerrit-PatchSet: 3 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_clnt_sctp_adm_shutdown

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40195?usp=email ) Change subject: stp: Introduce test TC_clnt_sctp_adm_shutdown ...................................................................... stp: Introduce test TC_clnt_sctp_adm_shutdown Related: OS#6752 Change-Id: I8b1c8b633afc1515dedfccd43e642401896b167e --- M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml 2 files changed, 45 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 8ee35ec..57ab3de 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -1448,6 +1448,49 @@ f_clear_m3ua(); } +/* Test administrative state, VTY "[no] shutdown" */ +testcase TC_clnt_sctp_adm_shutdown() runs on RAW_M3UA_CT { + f_init_m3ua(); + f_init_m3ua_srv(); + + var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4); + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); + f_sleep(1.0); + f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "shutdown"); + log("ASP should now be DOWN") + var PortEvent pev; + alt { + [] M3UA[M3UA_SRV(0)].receive(PortEvent:{sctpEvent := ?}) -> value pev { + log("sctp event: ", pev) + repeat; + } + [] M3UA[M3UA_SRV(0)].receive(PortEvent:{connClosed:=?}) -> value pev { + log("Peer closed conn: ", pev) + } + } + + /* Wait for a while to make sure ASP doesn't reconnect to us: */ + timer T := 10.0; + T.start; + alt { + [] M3UA[M3UA_SRV(0)].receive(tr_ConnOpened) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Unexpected reconnect from ASP client!"); + } + [] T.timeout {} + } + + /* Now let the ASP be active again, it should reconnect to us: */ + f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "no shutdown"); + log("Waiting for client ASP to reconnect to us"); + M3UA[M3UA_SRV(0)].receive(tr_ConnOpened) -> value pev { + g_m3ua_conn_id[M3UA_SRV(0)] := pev.connOpened.connId; + } + f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx); + + f_clear_m3ua(); +} + private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on RAW_M3UA_CT { var M3uaConfig cfg_a := g_m3ua_configs[idx_a]; var M3uaConfig cfg_b := g_m3ua_configs[idx_b]; @@ -1570,6 +1613,7 @@ execute( TC_clnt_no_snm_inactive() ); execute( TC_clnt_quirk_snm_inactive() ); + execute( TC_clnt_sctp_adm_shutdown() ); /* M3UA SSNM tests */ execute( TC_ssnm_aspac_dava_aspia_duna() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 3fbe1a5..9eff92e5 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -36,6 +36,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_daud_in_asp' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_no_snm_inactive' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_quirk_snm_inactive' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_sctp_adm_shutdown' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_aspac_dava_aspia_duna' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dava_duna' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dava_duna_multipc' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40195?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8b1c8b633afc1515dedfccd43e642401896b167e Gerrit-Change-Number: 40195 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025