September 2023 - gerrit-log - lists.osmocom.org

[L] Change in osmo-bts[master]: oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34434?usp=email ) Change subject: oml: implement handling of NM_ATT_IPACC_SUPP_FEATURES ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34434?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I88c6c6af18be054bd152832e60c8afbbd16098a3 Gerrit-Change-Number: 34434 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Sep 2023 23:48:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: oml: ipacc: fix sending hard-coded GPRS Cell attributes

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34357?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: oml: ipacc: fix sending hard-coded GPRS Cell attributes ...................................................................... oml: ipacc: fix sending hard-coded GPRS Cell attributes Change-Id: I7d90ca3d6a660af8e953e890c7919194f5d297d2 Related: OS#4505 --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c M tests/nanobts_omlattr/nanobts_omlattr_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.ok 3 files changed, 40 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/34357/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34357?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: I7d90ca3d6a660af8e953e890c7919194f5d297d2 Gerrit-Change-Number: 34357 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to Rado Carrier MO(s)

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34359?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: abis_nm: send Get Attributes to Rado Carrier MO(s) ...................................................................... abis_nm: send Get Attributes to Rado Carrier MO(s) Change-Id: If7b75689c12a253377f2747babd4d7ebd1db5f87 Related: OS#4505 --- M src/osmo-bsc/nm_rcarrier_fsm.c 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/34359/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34359?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: If7b75689c12a253377f2747babd4d7ebd1db5f87 Gerrit-Change-Number: 34359 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(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-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to GPRS Cell MO(s)

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: 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: abis_nm: send Get Attributes to GPRS Cell MO(s) ...................................................................... abis_nm: send Get Attributes to GPRS Cell MO(s) Change-Id: Ib6d87da49217f1c8d76445ce623a511a07daedbf Related: OS#4505 --- M src/osmo-bsc/nm_gprs_cell_fsm.c 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34360/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?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: Ib6d87da49217f1c8d76445ce623a511a07daedbf Gerrit-Change-Number: 34360 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(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-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: nanoBTS: print [supported] versions of MOs

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32653?usp=email ) Change subject: nanoBTS: print [supported] versions of MOs ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Somehow I forgot that I reviewed this patch back in May, and submitted my own patch doing the same t […] I submitted a patch, keeping Harald as the author: https://gerrit.osmocom.org/c/osmo-bsc/+/34472' I think this one can be abandoned? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32653?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: I9aefcae31dc9139e90161b4690e77d4958021d45 Gerrit-Change-Number: 32653 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Sep 2023 23:04:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: oml: ipacc: print all supported versions of MOs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34472?usp=email ) Change subject: oml: ipacc: print all supported versions of MOs ...................................................................... oml: ipacc: print all supported versions of MOs The first byte is the default version, the other bytes describe the optional other versions supported by the MO. Print them all. Change-Id: I01da4883cf59101ddaef575979519ac48fcf54b0 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/34472/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index d99489b..c690b46 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -217,11 +217,18 @@ mo->ipaccess.obj_version = 0; /* implicit default */ if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION, 1)) { + const uint8_t *versions = TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION); + char buf[256]; + struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; + /* nanoBTS may report several Object Versions; the first one will * be used by default unless requested explicitly before OPSTARTing. */ - mo->ipaccess.obj_version = *TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION); - LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Version is %u (default)\n", - mo->ipaccess.obj_version); + mo->ipaccess.obj_version = versions[0]; + + OSMO_STRBUF_PRINTF(sb, "%u (default)", versions[0]); + for (uint16_t i = 1; i < TLVP_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION); i++) + OSMO_STRBUF_PRINTF(sb, ", %u", versions[i]); + LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Versions supported: %s\n", buf); } osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34472?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: I01da4883cf59101ddaef575979519ac48fcf54b0 Gerrit-Change-Number: 34472 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: abis_nm: handle NM_EV_SW_ACT_REP in ST_OP_DISABLED_{DEPENDENCY,OFFLINE}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34470?usp=email ) Change subject: abis_nm: handle NM_EV_SW_ACT_REP in ST_OP_DISABLED_{DEPENDENCY,OFFLINE} ...................................................................... abis_nm: handle NM_EV_SW_ACT_REP in ST_OP_DISABLED_{DEPENDENCY,OFFLINE} 3GPP TS 52.021 does not strictly mandate that the SW Activated Report can only be received in state DISABLED/OFFLINE. The only requirement is that the software load procedure (if needed) and activation is to be performed in this state. The successful outcome of software activation procedure is indicated by the BTS using the above-mentioned SW Activated Report message, which may be received in ST_OP_DISABLED_{DEPENDENCY,OFFLINE} too. The MO state changes are triggered by the State Changed Event Report messages, and happen asynchronously with the software activation. This patch fixes the following warnings seen with a nanoBTS: NM_BTS_OP(bts2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_GPRS_NSE_OP(nse2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_GPRS_CELL_OP(gprs-cell2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_GPRS_NSVC_OP(nsvc0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_GPRS_NSVC_OP(nsvc1){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_BB_TRANSC_OP(bts2-trx0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts1){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts2){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts3){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts4){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts5){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts6){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_CHAN_OP(bts2-trx0-ts7){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted NM_RCARRIER_OP(bts2-trx0){DISABLED_OFFLINE}: Event SW_ACT_REP not permitted The following warning is still expected to show up though: NM_BTS_SM_OP(bts_sm){ENABLED}: Event SW_ACT_REP not permitted but is caused by a different problem, which is to be fixed later. Change-Id: I00a423adcde5c34977f4c4dad920874687fa493c --- M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/nm_bts_sm_fsm.c M src/osmo-bsc/nm_channel_fsm.c M src/osmo-bsc/nm_gprs_cell_fsm.c M src/osmo-bsc/nm_gprs_nse_fsm.c M src/osmo-bsc/nm_gprs_nsvc_fsm.c M src/osmo-bsc/nm_rcarrier_fsm.c 8 files changed, 103 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/34470/1 diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index b68dc67..ce2f3e9 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -175,6 +175,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(bb_transc, &bb_transc->mo.nm_state, false); + break; case NM_EV_GET_ATTR_REP: bb_transc->mo.get_attr_rep_received = true; bb_transc->mo.get_attr_sent = false; @@ -234,6 +237,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(bb_transc, &bb_transc->mo.nm_state, true); + break; case NM_EV_GET_ATTR_REP: bb_transc->mo.get_attr_rep_received = true; bb_transc->mo.get_attr_sent = false; @@ -375,6 +381,7 @@ }, [NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_GET_ATTR_REP) | X(NM_EV_RSL_CONNECT_ACK) | @@ -390,6 +397,7 @@ }, [NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_GET_ATTR_REP) | X(NM_EV_RSL_CONNECT_ACK) | diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index 544efb4..937b63d 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -179,6 +179,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(bts, &bts->mo.nm_state, false); + break; case NM_EV_GET_ATTR_REP: rx_get_attr_rep(bts, false); return; @@ -232,6 +235,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(bts, &bts->mo.nm_state, true); + break; case NM_EV_GET_ATTR_REP: rx_get_attr_rep(bts, true); return; @@ -366,6 +372,7 @@ }, [NM_BTS_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_GET_ATTR_REP) | X(NM_EV_SET_ATTR_ACK) | @@ -380,6 +387,7 @@ }, [NM_BTS_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_GET_ATTR_REP) | X(NM_EV_SET_ATTR_ACK) | diff --git a/src/osmo-bsc/nm_bts_sm_fsm.c b/src/osmo-bsc/nm_bts_sm_fsm.c index cb67099..70b0656 100644 --- a/src/osmo-bsc/nm_bts_sm_fsm.c +++ b/src/osmo-bsc/nm_bts_sm_fsm.c @@ -120,6 +120,7 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -160,6 +161,9 @@ struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(site_mgr, &site_mgr->mo.nm_state, true); + break; case NM_EV_STATE_CHG_REP: nsd = (struct nm_statechg_signal_data *)data; new_state = &nsd->new_state; @@ -255,6 +259,7 @@ }, [NM_BTS_SM_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SETUP_RAMP_READY), .out_state_mask = @@ -266,6 +271,7 @@ }, [NM_BTS_SM_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SETUP_RAMP_READY), .out_state_mask = diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c index af201cf..1309ebd 100644 --- a/src/osmo-bsc/nm_channel_fsm.c +++ b/src/osmo-bsc/nm_channel_fsm.c @@ -136,6 +136,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(ts, &ts->mo.nm_state, false); + break; case NM_EV_SET_ATTR_ACK: ts->mo.set_attr_ack_received = true; ts->mo.set_attr_sent = false; @@ -186,6 +189,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(ts, &ts->mo.nm_state, true); + break; case NM_EV_SET_ATTR_ACK: ts->mo.set_attr_ack_received = true; ts->mo.set_attr_sent = false; @@ -312,6 +318,7 @@ }, [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), @@ -325,6 +332,7 @@ }, [NM_CHAN_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c index 2f139a6..40514a8 100644 --- a/src/osmo-bsc/nm_gprs_cell_fsm.c +++ b/src/osmo-bsc/nm_gprs_cell_fsm.c @@ -145,6 +145,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(cell, &cell->mo.nm_state, false); + break; case NM_EV_SET_ATTR_ACK: cell->mo.set_attr_ack_received = true; cell->mo.set_attr_sent = false; @@ -196,6 +199,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(cell, &cell->mo.nm_state, true); + break; case NM_EV_SET_ATTR_ACK: cell->mo.set_attr_ack_received = true; cell->mo.set_attr_sent = false; @@ -325,6 +331,7 @@ }, [NM_GPRS_CELL_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), @@ -338,6 +345,7 @@ }, [NM_GPRS_CELL_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c index 882dbaf..df4113c 100644 --- a/src/osmo-bsc/nm_gprs_nse_fsm.c +++ b/src/osmo-bsc/nm_gprs_nse_fsm.c @@ -146,6 +146,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(nse, &nse->mo.nm_state, false); + break; case NM_EV_SET_ATTR_ACK: nse->mo.set_attr_ack_received = true; nse->mo.set_attr_sent = false; @@ -197,6 +200,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(nse, &nse->mo.nm_state, true); + break; case NM_EV_SET_ATTR_ACK: nse->mo.set_attr_ack_received = true; nse->mo.set_attr_sent = false; @@ -327,6 +333,7 @@ }, [NM_GPRS_NSE_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), @@ -340,6 +347,7 @@ }, [NM_GPRS_NSE_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index d441f58..e6e3b39 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -176,6 +176,7 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: case NM_EV_FEATURE_NEGOTIATED: configure_loop(nsvc, &nsvc->mo.nm_state, false); return; @@ -229,6 +230,7 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: case NM_EV_FEATURE_NEGOTIATED: configure_loop(nsvc, &nsvc->mo.nm_state, true); return; @@ -355,6 +357,7 @@ }, [NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_FEATURE_NEGOTIATED) | X(NM_EV_SET_ATTR_ACK) | @@ -369,6 +372,7 @@ }, [NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_FEATURE_NEGOTIATED) | X(NM_EV_SET_ATTR_ACK) | diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index 824b2ed..15e7c9f 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -151,6 +151,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(trx, &trx->mo.nm_state, false); + break; case NM_EV_SET_ATTR_ACK: trx->mo.set_attr_ack_received = true; trx->mo.set_attr_sent = false; @@ -201,6 +204,9 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_SW_ACT_REP: + configure_loop(trx, &trx->mo.nm_state, true); + break; case NM_EV_SET_ATTR_ACK: trx->mo.set_attr_ack_received = true; trx->mo.set_attr_sent = false; @@ -348,6 +354,7 @@ }, [NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), @@ -361,6 +368,7 @@ }, [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = + X(NM_EV_SW_ACT_REP) | X(NM_EV_STATE_CHG_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34470?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: I00a423adcde5c34977f4c4dad920874687fa493c Gerrit-Change-Number: 34470 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34471?usp=email ) Change subject: abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP ...................................................................... abis_nm: delay configure_loop() until NM_MT_SW_ACTIVATED_REP Even though the Abis/OML message flow looks the way it should look on the wire, it does not actually reflect the sequence/flow of events and actions in the NM FSMs. For example (extracted from a PCAP): GPRS Cell(00,00,ff) State Changed Event Report GPRS Cell(00,00,ff) Software Activate Request GPRS Cell(00,00,ff) Software Activate Request ACK GPRS Cell(00,00,ff) Activate Software GPRS Cell(00,00,ff) Activate Software ACK [a] GPRS Cell(00,00,ff) State Changed Event Report [b] GPRS Cell(00,00,ff) Software Activated Report [c] GPRS Cell(00,00,ff) Get Attributes GPRS Cell(00,00,ff) Get Attributes Response [d] GPRS Cell(00,00,ff) IPA Set Attributes GPRS Cell(00,00,ff) IPA Set Attributes ACK GPRS Cell(00,00,ff) Change Administrative State GPRS Cell(00,00,ff) Change Administrative State ACK GPRS Cell(00,00,ff) State Changed Event Report GPRS Cell(00,00,ff) Opstart GPRS Cell(00,00,ff) Opstart ACK A follow-up patch [1] changes the logic generating message [d], so that the IPA Object Version of the GPRS Cell MO is taken into account when adding the attributes. The problem is that both messages [c] and [d] are generated and queued for transmission on the receipt of message [a], but *before* message [b] has been processed. So the IPA Object Version is not known and assumed to be 0 at that point in time. This patch delays configure_loop() until message [b] is received. So far only for nanoBTS and only for those MOs, for which Figure 2 in 3GPP TS 52.021 explicitly mentions that the SW downloading and activation procedures may be required, plus for the ip.access specific MOs which all seem to support the SW activation. osmo-bts does send SW Activated Report only for a subset of MOs, which does not include Baseband Transceiver, Radio Carrier, and Radio Channel. 3GPP TS 52.021 is not clear on whether this message shall be sent by all MOs either, so we consider it optional and delay configure_loop() only for nanoBTS. As a bonus, this patch is expected to fix the following warning: NM_BTS_SM_OP(bts_sm){ENABLED}: Event SW_ACT_REP not permitted Change-Id: I3953a5e41eb27165f9ff203cac7447ee9d311abf Related: [1] Ie0fb3eaf76e1f70e5a19bb088e1674b7e553d32a --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/nm_bts_sm_fsm.c M src/osmo-bsc/nm_rcarrier_fsm.c 6 files changed, 109 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/34471/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 3f7958c..6974dca 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -692,6 +692,17 @@ return false; } +static inline bool is_nanobts(const struct gsm_bts *bts) +{ + switch (bts->type) { + case GSM_BTS_TYPE_NANOBTS: + return true; + default: + break; + } + return false; +} + static inline bool is_osmobts(const struct gsm_bts *bts) { switch (bts->type) { diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 2876d24..275e4f1 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -528,6 +528,7 @@ struct gsm_nm_state nm_state; struct gsm_bts *bts; struct osmo_fsm_inst *fi; + bool sw_act_rep_received; bool opstart_sent; bool adm_unlock_sent; bool get_attr_sent; diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index ce2f3e9..82da6e1 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -61,6 +61,7 @@ { struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; + bb_transc->mo.sw_act_rep_received = false; bb_transc->mo.get_attr_sent = false; bb_transc->mo.get_attr_rep_received = false; bb_transc->mo.adm_unlock_sent = false; @@ -71,11 +72,14 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + bb_transc->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -109,6 +113,10 @@ if (bts_setup_ramp_wait(trx->bts)) return; + /* nanoBTS only: delay until SW Activated Report is received */ + if (is_nanobts(trx->bts) && !bb_transc->mo.sw_act_rep_received) + return; + /* Request TRX-level attributes */ if (!bb_transc->mo.get_attr_sent && !bb_transc->mo.get_attr_rep_received) { uint8_t attr_buf[3]; /* enlarge if needed */ @@ -176,6 +184,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + bb_transc->mo.sw_act_rep_received = true; configure_loop(bb_transc, &bb_transc->mo.nm_state, false); break; case NM_EV_GET_ATTR_REP: @@ -238,6 +247,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + bb_transc->mo.sw_act_rep_received = true; configure_loop(bb_transc, &bb_transc->mo.nm_state, true); break; case NM_EV_GET_ATTR_REP: diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index 937b63d..6350171 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -48,6 +48,7 @@ { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + bts->mo.sw_act_rep_received = false; bts->mo.get_attr_sent = false; bts->mo.get_attr_rep_received = false; bts->mo.set_attr_sent = false; @@ -58,11 +59,14 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts *bts = (struct gsm_bts *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + bts->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -96,6 +100,10 @@ if (bts_setup_ramp_wait(bts)) return; + /* nanoBTS only: delay until SW Activated Report is received */ + if (is_nanobts(bts) && !bts->mo.sw_act_rep_received) + return; + /* Request generic BTS-level attributes */ if (!bts->mo.get_attr_sent && !bts->mo.get_attr_rep_received) { uint8_t attr_buf[3]; /* enlarge if needed */ @@ -180,6 +188,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + bts->mo.sw_act_rep_received = true; configure_loop(bts, &bts->mo.nm_state, false); break; case NM_EV_GET_ATTR_REP: @@ -236,6 +245,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + bts->mo.sw_act_rep_received = true; configure_loop(bts, &bts->mo.nm_state, true); break; case NM_EV_GET_ATTR_REP: diff --git a/src/osmo-bsc/nm_bts_sm_fsm.c b/src/osmo-bsc/nm_bts_sm_fsm.c index 70b0656..6279005 100644 --- a/src/osmo-bsc/nm_bts_sm_fsm.c +++ b/src/osmo-bsc/nm_bts_sm_fsm.c @@ -49,6 +49,7 @@ struct gsm_bts *bts = gsm_bts_sm_get_bts(site_mgr); site_mgr->peer_has_no_avstate_offline = (bts->type == GSM_BTS_TYPE_NANOBTS); + site_mgr->mo.sw_act_rep_received = false; site_mgr->mo.opstart_sent = false; } @@ -61,6 +62,8 @@ switch (event) { case NM_EV_SW_ACT_REP: + site_mgr->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -107,6 +110,10 @@ if (bts_setup_ramp_wait(bts)) return; + /* nanoBTS only: delay until SW Activated Report is received */ + if (is_nanobts(bts) && !site_mgr->mo.sw_act_rep_received) + return; + if (allow_opstart && !site_mgr->mo.opstart_sent) { site_mgr->mo.opstart_sent = true; abis_nm_opstart(bts, NM_OC_SITE_MANAGER, 0xff, 0xff, 0xff); @@ -116,11 +123,14 @@ static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + site_mgr->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -162,6 +172,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + site_mgr->mo.sw_act_rep_received = true; configure_loop(site_mgr, &site_mgr->mo.nm_state, true); break; case NM_EV_STATE_CHG_REP: diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index 15e7c9f..798dfdc 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -58,6 +58,7 @@ { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + trx->mo.sw_act_rep_received = false; trx->mo.set_attr_sent = false; trx->mo.set_attr_ack_received = false; trx->mo.adm_unlock_sent = false; @@ -66,11 +67,14 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; switch (event) { case NM_EV_SW_ACT_REP: + trx->mo.sw_act_rep_received = true; + break; case NM_EV_SETUP_RAMP_READY: break; case NM_EV_STATE_CHG_REP: @@ -104,6 +108,10 @@ if (bts_setup_ramp_wait(trx->bts)) return; + /* nanoBTS only: delay until SW Activated Report is received */ + if (is_nanobts(trx->bts) && !trx->mo.sw_act_rep_received) + return; + if (!trx->mo.set_attr_sent && !trx->mo.set_attr_ack_received) { trx->mo.set_attr_sent = true; msgb = nanobts_gen_set_radio_attr(trx->bts, trx); @@ -152,6 +160,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + trx->mo.sw_act_rep_received = true; configure_loop(trx, &trx->mo.nm_state, false); break; case NM_EV_SET_ATTR_ACK: @@ -205,6 +214,7 @@ switch (event) { case NM_EV_SW_ACT_REP: + trx->mo.sw_act_rep_received = true; configure_loop(trx, &trx->mo.nm_state, true); break; case NM_EV_SET_ATTR_ACK: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34471?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: I3953a5e41eb27165f9ff203cac7447ee9d311abf Gerrit-Change-Number: 34471 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sccp: Introduce test TC_process_rx_ludt

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34469?usp=email ) Change subject: sccp: Introduce test TC_process_rx_ludt ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34469?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: I0880ccce872e79f057e17e29e09a566645365e96 Gerrit-Change-Number: 34469 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Sep 2023 21:33:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by arehbein

Attention is currently required from: daniel, fixeria, laforge, osmith. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 21: (1 comment) File examples/ipa-stream-client.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/2cf94fa4_77e7c5e3 PS21, Line 119: sizeof(struct ipa_head) + sizeof(struct ipa_head_ext > Just to confirm, this offset is no more needed? Yes, the segmentation callback is stripping the IPA headers (see here: https://gerrit.osmocom.org/c/libosmo-netif/+/33652/6/src/ipa.c ) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 21 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Sep 2023 19:38:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023