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

[XS] Change in libosmocore[master]: VTY: Initialize fields of struct cmd_element in order of declaration

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/40188?usp=email ) Change subject: VTY: Initialize fields of struct cmd_element in order of declaration ...................................................................... VTY: Initialize fields of struct cmd_element in order of declaration gpp requires designated initialisers to be initialized in the order their fields were declared. With this patch it is possible to include VTY's command.h within C++ code. Change-Id: Ifaa31980f149f9c1f1a9b28f318a4850f6855472 --- M include/osmocom/vty/command.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve; Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 61b5881..667e9ab 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -218,8 +218,8 @@ .string = cmdstr, \ .func = funcname, \ .doc = helpstr, \ - .attr = attrs, \ .daemon = dnum, \ + .attr = attrs, \ }; /* global (non static) cmd_element */ @@ -229,8 +229,8 @@ .string = cmdstr, \ .func = funcname, \ .doc = helpstr, \ - .attr = attrs, \ .daemon = dnum, \ + .attr = attrs, \ }; #define DEFUN_CMD_ELEMENT_ATTR_USRATTR(funcname, cmdname, cmdstr, helpstr, attrs, usrattrs) \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifaa31980f149f9c1f1a9b28f318a4850f6855472 Gerrit-Change-Number: 40188 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: xua_default_lm_fsm: Avoid accessing asp after restart

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40217?usp=email ) Change subject: xua_default_lm_fsm: Avoid accessing asp after restart ...................................................................... xua_default_lm_fsm: Avoid accessing asp after restart Avoid restarting the ASP upon LM_E_SCTP_DISC_IND: * The SCTP event may actually come from an existing call to osmo_ss7_asp_restart() which has called. * For SCTP server asps, there's no need to actually restart the ASP, since we have to wait for client to connect to us again. * For SCTP client asps, the lower layers are already triggering reconnect, no need to do anything other than waiting for SCTP_EST_IND. * ASP may be no longer accessible after dropping conn if it was a dynamic SCTP-server one. Hence, better keep the call setting up the FSM in the ASP in osmo_ss7_asp_restart(), where we know if asp is still alive. Change-Id: I009a34d098abd61fa3c014787d52c09491fcab76 --- M src/osmo_ss7_asp.c M src/xua_default_lm_fsm.c 2 files changed, 26 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/17/40217/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 1c303b6..735c5fd 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -756,6 +756,16 @@ osmo_fsm_inst_term(asp->fi, OSMO_FSM_TERM_REQUEST, NULL); OSMO_ASSERT(!asp->fi); } + + /* Apply default LM FSM for client ASP */ + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA && + asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP && + !asp->cfg.is_server) { + osmo_ss7_asp_use_default_lm(asp, LOGL_DEBUG); + } else { + osmo_ss7_asp_remove_default_lm(asp); + } + if ((rc = xua_asp_fsm_start(asp, asp->cfg.role, LOGL_DEBUG)) < 0) return rc; OSMO_ASSERT(asp->fi); @@ -1323,15 +1333,6 @@ * specific default values */ ss7_asp_set_default_peer_hosts(asp); - /* Apply default LM FSM for client ASP */ - if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA && - asp->cfg.role == OSMO_SS7_ASP_ROLE_ASP && - !asp->cfg.is_server) { - osmo_ss7_asp_use_default_lm(asp, LOGL_DEBUG); - } else { - osmo_ss7_asp_remove_default_lm(asp); - } - osmo_ss7_asp_restart(asp); } diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 0952c9e..3aceb26 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -160,17 +160,6 @@ return 0; } -static void restart_asp(struct osmo_fsm_inst *fi) -{ - struct lm_fsm_priv *lmp = fi->priv; - struct osmo_ss7_asp *asp = lmp->asp; - int log_level = fi->log_level; - - osmo_ss7_asp_restart(asp); - osmo_ss7_asp_use_default_lm(asp, log_level); -} - - static void lm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct lm_fsm_priv *lmp = fi->priv; @@ -317,7 +306,7 @@ OSMO_ASSERT(oxp->oph.operation == PRIM_OP_INDICATION); if (oxp->u.notify.status_type == M3UA_NOTIFY_T_STATCHG && oxp->u.notify.status_info != M3UA_NOTIFY_I_AS_ACT) - restart_asp(fi); + lm_fsm_state_chg(fi, S_IDLE); break; } } @@ -326,7 +315,7 @@ { switch (event) { case LM_E_SCTP_DISC_IND: - restart_asp(fi); + lm_fsm_state_chg(fi, S_IDLE); break; } } @@ -334,30 +323,38 @@ static const struct osmo_fsm_state lm_states[] = { [S_IDLE] = { .in_event_mask = S(LM_E_SCTP_EST_IND), - .out_state_mask = S(S_WAIT_ASP_UP), + .out_state_mask = S(S_IDLE) | + S(S_WAIT_ASP_UP), .name = "IDLE", .action = lm_idle, }, [S_WAIT_ASP_UP] = { .in_event_mask = S(LM_E_ASP_UP_CONF), - .out_state_mask = S(S_WAIT_NOTIFY), + .out_state_mask = S(S_IDLE) | + S(S_WAIT_NOTIFY), .name = "WAIT_ASP_UP", .action = lm_wait_asp_up, }, [S_WAIT_NOTIFY] = { - .in_event_mask = S(LM_E_AS_INACTIVE_IND) | S(LM_E_NOTIFY_IND), - .out_state_mask = S(S_RKM_REG) | S(S_ACTIVE), + .in_event_mask = S(LM_E_AS_INACTIVE_IND) | + S(LM_E_NOTIFY_IND), + .out_state_mask = S(S_IDLE) | + S(S_RKM_REG) | + S(S_ACTIVE), .name = "WAIT_NOTIFY", .action = lm_wait_notify, }, [S_RKM_REG] = { .in_event_mask = S(LM_E_RKM_REG_CONF), - .out_state_mask = S(S_WAIT_NOTIFY), + .out_state_mask = S(S_IDLE) | + S(S_WAIT_NOTIFY), .name = "RKM_REG", .action = lm_rkm_reg, }, [S_ACTIVE] = { - .in_event_mask = S(LM_E_AS_INACTIVE_IND) | S(LM_E_NOTIFY_IND), + .in_event_mask = S(LM_E_AS_INACTIVE_IND) | + S(LM_E_NOTIFY_IND), + .out_state_mask = S(S_IDLE), .name = "ACTIVE", .action = lm_active, }, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40217?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: I009a34d098abd61fa3c014787d52c09491fcab76 Gerrit-Change-Number: 40217 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Add missing plmn config in osmo-hnbgw.cfg

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40216?usp=email ) Change subject: hnbgw: Add missing plmn config in osmo-hnbgw.cfg ...................................................................... hnbgw: Add missing plmn config in osmo-hnbgw.cfg Change-Id: Ie360247b7be9cf5ac4feeab2a8957131896f7721 --- M hnbgw/osmo-hnbgw.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/40216/1 diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg index 854e4cc..677be22 100644 --- a/hnbgw/osmo-hnbgw.cfg +++ b/hnbgw/osmo-hnbgw.cfg @@ -62,6 +62,7 @@ point-code 0.1.4 hnbgw + plmn 001 01 log-prefix hnb-id iuh local-ip 127.0.0.1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40216?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: Ie360247b7be9cf5ac4feeab2a8957131896f7721 Gerrit-Change-Number: 40216 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: HNBGW_Tests.default: Drop unused LLSK config

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40215?usp=email ) Change subject: hnbgw: HNBGW_Tests.default: Drop unused LLSK config ...................................................................... hnbgw: HNBGW_Tests.default: Drop unused LLSK config That's only used in osmo-hnodeb, and it's probably a leftover when copy-pasting from hnodeb directory to create the hnbgw testsuite. Change-Id: Ic04ded35f64b5dac0c5f36ebdf066d751013c438 --- M hnbgw/HNBGW_Tests.default 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/40215/1 diff --git a/hnbgw/HNBGW_Tests.default b/hnbgw/HNBGW_Tests.default index 51bcdac..b8a4863 100644 --- a/hnbgw/HNBGW_Tests.default +++ b/hnbgw/HNBGW_Tests.default @@ -20,7 +20,6 @@ *.STATSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.STATSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.STATSVTY.PROMPT1 := "OsmoHNBGW> " -*.LLSK.socket_type := "SEQPACKET" [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoHNBGW"; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40215?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: Ic04ded35f64b5dac0c5f36ebdf066d751013c438 Gerrit-Change-Number: 40215 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_m3ua_sctp_srv_adm_shutdown

by pespin

Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40196?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Code-Review+2 by pespin, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: stp: Introduce test TC_m3ua_sctp_srv_adm_shutdown ...................................................................... stp: Introduce test TC_m3ua_sctp_srv_adm_shutdown Related: OS#6752 Change-Id: Iad34af7e7758fbd3a0d686a261ccce53bc705817 --- M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml 2 files changed, 48 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/40196/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40196?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: Iad34af7e7758fbd3a0d686a261ccce53bc705817 Gerrit-Change-Number: 40196 Gerrit-PatchSet: 5 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

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 osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40191?usp=email ) Change subject: stp: Update TC_rkm_unreg_active to expect multiple routing contexts ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40191/comment/a6e70a6c_5188… : PS1, Line 15: Depends: libosmo-sigtran.git I646301ec3d08ef98f227cf4d19da1039e40cedd2 > Well, libosmo-sigtran in latest is wrong, so imho it's fine that it starts failing. Acknowledged -- 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: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2dc4d197e6de38781b63e3079ada4c4b4a0db31d Gerrit-Change-Number: 40191 Gerrit-PatchSet: 1 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, 05 May 2025 12:36:02 +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>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce test TC_{cs,ps}_rua_dt_during_sccp_wait_cc

by pespin

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40184?usp=email ) Change subject: hnbgw: Introduce test TC_{cs,ps}_rua_dt_during_sccp_wait_cc ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: ping -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40184?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: I97767db5560edf951202c876726d0c52b5b5b49f Gerrit-Change-Number: 40184 Gerrit-PatchSet: 3 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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 May 2025 12:35:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

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 osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40191?usp=email ) Change subject: stp: Update TC_rkm_unreg_active to expect multiple routing contexts ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2dc4d197e6de38781b63e3079ada4c4b4a0db31d Gerrit-Change-Number: 40191 Gerrit-PatchSet: 1 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, 05 May 2025 12:35:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_m3ua_sctp_srv_adm_shutdown

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40196?usp=email ) Change subject: stp: Introduce test TC_m3ua_sctp_srv_adm_shutdown ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40196?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: Iad34af7e7758fbd3a0d686a261ccce53bc705817 Gerrit-Change-Number: 40196 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> Gerrit-Comment-Date: Mon, 05 May 2025 12:35:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

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 posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40195?usp=email ) Change subject: stp: Introduce test TC_clnt_sctp_adm_shutdown ...................................................................... Patch Set 3: Code-Review+2 -- 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: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8b1c8b633afc1515dedfccd43e642401896b167e Gerrit-Change-Number: 40195 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> Gerrit-Comment-Date: Mon, 05 May 2025 12:35:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025