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

[S] Change in osmo-bts[master]: bts-trx: Drop unused param to internal function

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32202 ) Change subject: bts-trx: Drop unused param to internal function ...................................................................... bts-trx: Drop unused param to internal function Change-Id: Id7ad7629ec13bcec618055c41083cdac0a3102be --- M src/osmo-bts-trx/l1_if.c 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 2ed1868..5f800ae 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -206,7 +206,7 @@ } /* set bts attributes */ -static uint8_t trx_set_bts(struct gsm_bts *bts, struct tlv_parsed *new_attr) +static uint8_t trx_set_bts(struct gsm_bts *bts) { struct phy_instance *pinst = trx_phy_instance(bts->c0); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -569,7 +569,7 @@ switch (foh->msg_type) { case NM_MT_SET_BTS_ATTR: - ev_data.cause = trx_set_bts(obj, new_attr); + ev_data.cause = trx_set_bts(obj); break; case NM_MT_SET_RADIO_ATTR: ev_data.cause = trx_set_trx(obj); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id7ad7629ec13bcec618055c41083cdac0a3102be Gerrit-Change-Number: 32202 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: Clarify configuration of TSC on each timeslot

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32165 ) Change subject: Clarify configuration of TSC on each timeslot ...................................................................... Clarify configuration of TSC on each timeslot Related: OS#5856 Change-Id: Ief21daf63ba76725de9117cbe14ada8b75f147df --- M include/osmo-bts/bts.h M include/osmo-bts/gsm_data.h M src/common/bts.c M src/common/bts_trx.c M src/common/gsm_data.c M src/common/nm_bts_fsm.c M src/common/oml.c M src/common/rsl.c 8 files changed, 102 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 14c78a3..2d0eec7 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -158,6 +158,7 @@ /* Base Station Identification Code (BSIC), lower 3 bits is BCC, * which is used as TSC for the CCCH */ uint8_t bsic; + bool bsic_configured; /* type of BTS */ enum gsm_bts_type_variant variant; enum gsm_band band; diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 69e3b00..5bf6f02 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -91,7 +91,10 @@ /* Training Sequence Code (range 0..7) */ uint8_t tsc_oml; /* configured via OML */ - uint8_t tsc; /* currently in use */ + bool tsc_oml_configured; + uint8_t tsc_rsl; /* configured via RSL (Osmo extension) */ + bool tsc_rsl_configured; + uint8_t tsc; /* TSC currently in use. Preference: RSL, OML, BTS-BSIC-OML */ /* Training Sequence Set (range 0..3) */ uint8_t tsc_set; @@ -194,6 +197,8 @@ bool ts_is_pdch(const struct gsm_bts_trx_ts *ts); +void gsm_ts_apply_configured_tsc(struct gsm_bts_trx_ts *ts); + void gsm_ts_release(struct gsm_bts_trx_ts *ts); #endif /* _GSM_DATA_H */ diff --git a/src/common/bts.c b/src/common/bts.c index 9cc694f..de27ad8 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -351,6 +351,8 @@ power_ctrl_params_def_reset(&bts->ms_dpc_params, false); /* configurable via OML */ + bts->bsic = 0xff; /* invalid value, guarded by bsc_configured=false */ + bts->bsic_configured = false; bts->load.ccch.load_ind_period = 112; bts->rtp_jitter_buf_ms = 100; bts->max_ta = 63; diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 280880f..089f228 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -74,6 +74,10 @@ ts->trx = trx; ts->nr = tn; + ts->tsc_oml_configured = false; + ts->tsc_rsl_configured = false; + ts->tsc = ts->tsc_oml = ts->tsc_rsl = 0xff; + ts->mo.fi = osmo_fsm_inst_alloc(&nm_chan_fsm, trx, ts, LOGL_INFO, NULL); osmo_fsm_inst_update_id_f(ts->mo.fi, "%s-ts%u", @@ -99,6 +103,10 @@ ts->trx = trx; ts->nr = tn; + ts->tsc_oml_configured = false; + ts->tsc_rsl_configured = false; + ts->tsc = ts->tsc_oml = ts->tsc_rsl = 0xff; + /* Link both primary and shadow */ trx->ts[tn].vamos.peer = ts; ts->vamos.peer = &trx->ts[tn]; diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index e5dbf10..dad5587 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -306,6 +306,29 @@ } } +/* Apply ts->tsc based on what was configured coming from different sources. + * Priorities (preferred first, overrides ones afterward): + * 1- RSL OSMO_TSC IE + * 2- OML SetChannelAttr TSC IE + * 3- OML SetBtsAttr BSIC IE + */ +void gsm_ts_apply_configured_tsc(struct gsm_bts_trx_ts *ts) +{ + if (ts->tsc_rsl_configured) { + ts->tsc = ts->tsc_rsl; + return; + } + if (ts->tsc_oml_configured) { + ts->tsc = ts->tsc_oml; + return; + } + if (ts->trx->bts->bsic_configured) { + ts->tsc = BTS_TSC(ts->trx->bts); + return; + } + ts->tsc = 0xff; /* invalid value */ +} + void gsm_ts_release(struct gsm_bts_trx_ts *ts) { unsigned int ln; @@ -318,4 +341,8 @@ /* Make sure pchan_is is reset, since PCU act_req to release it will be * ignored as the lchan will already be released. */ ts->dyn.pchan_is = ts->dyn.pchan_want = GSM_PCHAN_NONE; + + ts->tsc_oml_configured = false; + ts->tsc_rsl_configured = false; + ts->tsc = ts->tsc_oml = ts->tsc_rsl = 0xff; } diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 063ffe8..ea3a6c3 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -60,6 +60,8 @@ struct gsm_bts *bts = (struct gsm_bts *)fi->priv; /* Reset state: */ bts->si_valid = 0; + bts->bsic_configured = false; + bts->bsic = 0xff; /* invalid value */ TALLOC_FREE(bts->mo.nm_attr); bts_cbch_reset(bts); diff --git a/src/common/oml.c b/src/common/oml.c index 724e4f8..5ffb6ff 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -712,8 +712,35 @@ bts->c0->arfcn = ntohs(tlvp_val16_unal(&tp, NM_ATT_BCCH_ARFCN)); /* 9.4.9 BSIC */ - if (TLVP_PRES_LEN(&tp, NM_ATT_BSIC, 1)) + if (TLVP_PRES_LEN(&tp, NM_ATT_BSIC, 1)) { + struct gsm_bts_trx *trx; + uint8_t bts_tsc; + bts->bsic = *TLVP_VAL(&tp, NM_ATT_BSIC); + bts->bsic_configured = true; + bts_tsc = BTS_TSC(bts); + + /* Apply TSC update on each TS if required: */ + llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ + unsigned int tn; + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + + /* First some config validation: */ + if (ts->tsc_oml_configured && + ts->tsc_oml != bts_tsc && + !osmo_bts_has_feature(bts->features, BTS_FEAT_MULTI_TSC)) { + LOGPFOH(DOML, LOGL_ERROR, foh, "SET BTS ATTR: this BTS model does not " + "support TSC %u != BSIC-BCC %u (TSC %u)\n", + ts->tsc_oml, bts->bsic, bts_tsc); + return oml_fom_ack_nack(msg, NM_NACK_PARAM_RANGE); + } + + /* Now update TS TSC if needed: */ + gsm_ts_apply_configured_tsc(ts); + } + } + } /* call into BTS driver to apply new attributes to hardware */ return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_BTS, bts); @@ -984,20 +1011,25 @@ /* 9.4.60 TSC */ if (TLVP_PRES_LEN(&tp, NM_ATT_TSC, 1)) { - ts->tsc_oml = ts->tsc = *TLVP_VAL(&tp, NM_ATT_TSC); - if (ts->tsc != BTS_TSC(bts) && + ts->tsc_oml = *TLVP_VAL(&tp, NM_ATT_TSC); + ts->tsc_oml_configured = true; + } + + if (ts->tsc_oml_configured) { + if (bts->bsic_configured && + ts->tsc_oml != BTS_TSC(bts) && !osmo_bts_has_feature(bts->features, BTS_FEAT_MULTI_TSC)) { LOGPFOH(DOML, LOGL_ERROR, foh, "SET CHAN ATTR: this BTS model does not " - "support TSC %u != BSIC-BCC %u\n", ts->tsc, BTS_TSC(bts)); + "support TSC %u != BSIC-BCC %u\n", ts->tsc_oml, BTS_TSC(bts)); talloc_free(tp_merged); return oml_fom_ack_nack(msg, NM_NACK_PARAM_RANGE); } - } else { - /* If there is no TSC specified, use the BCC */ - ts->tsc_oml = ts->tsc = BTS_TSC(bts); + gsm_ts_apply_configured_tsc(ts); } - LOGPFOH(DOML, LOGL_INFO, foh, "SET CHAN ATTR (TSC=%u pchan=%s", - ts->tsc, gsm_pchan_name(ts->pchan)); + + LOGPFOH(DOML, LOGL_INFO, foh, "SET CHAN ATTR (TSC=%d pchan=%s", + ts->tsc_oml_configured ? (int)ts->tsc_oml : -1, + gsm_pchan_name(ts->pchan)); if (ts->hopping.enabled) LOGPC(DOML, LOGL_INFO, " hsn=%u maio=%u chan_num=%u", ts->hopping.hsn, ts->hopping.maio, ts->hopping.arfcn_num); diff --git a/src/common/rsl.c b/src/common/rsl.c index a8c16a7..da5ad68 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -294,11 +294,14 @@ if (TLVP_PRES_LEN(tp, RSL_IE_OSMO_TRAINING_SEQUENCE, 2)) { const uint8_t *ie = TLVP_VAL(tp, RSL_IE_OSMO_TRAINING_SEQUENCE); lchan->ts->tsc_set = ie[0] & 0x03; /* Range: 0..3 */ - lchan->ts->tsc = ie[1] & 0x07; /* Range: 0..7 */ + lchan->ts->tsc_rsl = ie[1] & 0x07; /* Range: 0..7 */ + lchan->ts->tsc_rsl_configured = true; } else { - lchan->ts->tsc = lchan->ts->tsc_oml; + lchan->ts->tsc_rsl_configured = false; + lchan->ts->tsc_rsl = 0xff; lchan->ts->tsc_set = 0; } + gsm_ts_apply_configured_tsc(lchan->ts); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief21daf63ba76725de9117cbe14ada8b75f147df Gerrit-Change-Number: 32165 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: bts_model_apply_oml(): Drop unneded code

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32195 ) Change subject: bts_model_apply_oml(): Drop unneded code ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: > "only ... […] Ack. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a0d38a122f50ffe749ebc4f1cc11235ca516586 Gerrit-Change-Number: 32195 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 17:10:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: bts-trx: Drop unused param to internal function

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32202 ) Change subject: bts-trx: Drop unused param to internal function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id7ad7629ec13bcec618055c41083cdac0a3102be Gerrit-Change-Number: 32202 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 17:08:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: bsc_mgw_setup: use mgcp_client_pool_empty()

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32207 ) Change subject: bsc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... bsc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 --- M TODO-RELEASE M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 22 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 2658cdd..690e9ea 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -13,4 +13,5 @@ libosmogsm >1.8.0 circuit switched data stuff (gsm0808_enc/dec_channel_type etc.) libosmo-abis >1.4.0 osmo_ortp.h: add RTP_PT_CSDATA libosmo-sccp >1.7.0 osmo_sccp_{get,set}_priv() -libosmocore >1.8.0 GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO \ No newline at end of file +libosmocore >1.8.0 GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO +libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty() diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 5866ec1..50cc0e0 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -839,8 +839,12 @@ /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and * (re)connect them manually from the VTY. */ - pool_members_initalized = mgcp_client_pool_connect(bsc_gsmnet->mgw.mgw_pool); - if (pool_members_initalized) { + if (!mgcp_client_pool_empty(bsc_gsmnet->mgw.mgw_pool)) { + pool_members_initalized = mgcp_client_pool_connect(bsc_gsmnet->mgw.mgw_pool); + if (!pool_members_initalized) { + LOGP(DNM, LOGL_ERROR, "MGW pool failed to initialize any pool members\n"); + return -EINVAL; + } LOGP(DNM, LOGL_NOTICE, "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n", pool_members_initalized); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 Gerrit-Change-Number: 32207 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(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-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... msc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 --- M TODO-RELEASE M src/osmo-msc/msc_main.c 2 files changed, 21 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..a2695f2 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty() diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index c87749d..7f60ea8 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -560,8 +560,12 @@ /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and * (re)connect them manually from the VTY. */ - pool_members_initalized = mgcp_client_pool_connect(msc_network->mgw.mgw_pool); - if (pool_members_initalized) { + if (!mgcp_client_pool_empty(msc_network->mgw.mgw_pool)) { + pool_members_initalized = mgcp_client_pool_connect(msc_network->mgw.mgw_pool); + if (!pool_members_initalized) { + LOGP(DMSC, LOGL_ERROR, "MGW pool failed to initialize any pool members\n"); + return -EINVAL; + } LOGP(DMSC, LOGL_NOTICE, "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n", pool_members_initalized); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(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-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(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: Tue, 04 Apr 2023 16:08:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: hnbgw_mgw_setup: use mgcp_client_pool_empty()

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 ) Change subject: hnbgw_mgw_setup: use mgcp_client_pool_empty() ...................................................................... hnbgw_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 --- M TODO-RELEASE M src/osmo-hnbgw/hnbgw.c 2 files changed, 21 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index cec63db..cf72895 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ osmo-hnbgw cfg config deprecated: 'sccp cr max-payload-len <0-999999>' libosmo-sigtran >=1.7.0 Ensure SCCP CR max payload length of 130 bytes is enforced. Uses osmo_scu_prim_hdr_name_c() +libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty() diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 0624803..bd45dda 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -693,8 +693,12 @@ /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and * (re)connect them manually from the VTY. */ - pool_members_initalized = mgcp_client_pool_connect(g_hnb_gw->mgw_pool); - if (pool_members_initalized) { + if (!mgcp_client_pool_empty(g_hnb_gw->mgw_pool)) { + pool_members_initalized = mgcp_client_pool_connect(g_hnb_gw->mgw_pool); + if (!pool_members_initalized) { + LOGP(DMGW, LOGL_ERROR, "MGW pool failed to initialize any pool members\n"); + return -EINVAL; + } LOGP(DMGW, LOGL_NOTICE, "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'mgcp').\n", pool_members_initalized); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 Gerrit-Change-Number: 32208 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(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-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: hnbgw_mgw_setup: use mgcp_client_pool_empty()

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 ) Change subject: hnbgw_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 Gerrit-Change-Number: 32208 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 16:02:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-msc[master]: msc_main: close SMS db on startup error

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32085 ) Change subject: msc_main: close SMS db on startup error ...................................................................... Patch Set 2: (2 comments) File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/c/osmo-msc/+/32085/comment/85b7f54e_eff28ee8 PS2, Line 745: sms_queue_start BTW, can we move the DB init down below? Not saying this must be done, but I think this would simplify the flow a bit (less gotos). https://gerrit.osmocom.org/c/osmo-msc/+/32085/comment/c58e4fec_c2110e14 PS2, Line 832: error_close_sms_db AFAICS, `db_fini()` can be called at any time, even if the database is not initialized. Thus this additional label can be avoided. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9bb799048db5fcdb2a2520107bd75d5f7a865459 Gerrit-Change-Number: 32085 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 16:01:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:51:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: bsc_mgw_setup: use mgcp_client_pool_empty()

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32207 ) Change subject: bsc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 Gerrit-Change-Number: 32207 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:51:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_client_pool: add mgcp_client_pool_empty()

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32205 ) Change subject: mgcp_client_pool: add mgcp_client_pool_empty() ...................................................................... mgcp_client_pool: add mgcp_client_pool_empty() Check if the private struct mgcp_client_pool has an empty member_list. Clients that support both the legacy config and the pool config can use this to properly exit with error if pool members are configured, but no connection to any of the pool members can be established. Currently clients can't distinguish a config without pool members and a config with pool members that is broken and will fall back to using the defaults of the legacy config in both cases. Related: OS#5993 Change-Id: I009483ac9dfd6627e414f14d43b89f40ea4644db --- M include/osmocom/mgcp_client/mgcp_client_pool.h M src/libosmo-mgcp-client/mgcp_client_pool.c 2 files changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/mgcp_client/mgcp_client_pool.h b/include/osmocom/mgcp_client/mgcp_client_pool.h index 46d7e90..ba31fb0 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool.h @@ -12,6 +12,7 @@ int mgcp_client_pool_config_write(struct vty *vty, const char *indent); unsigned int mgcp_client_pool_connect(struct mgcp_client_pool *pool); void mgcp_client_pool_register_single(struct mgcp_client_pool *pool, struct mgcp_client *mgcp_client); +bool mgcp_client_pool_empty(const struct mgcp_client_pool *pool); struct mgcp_client *mgcp_client_pool_get(struct mgcp_client_pool *pool); void mgcp_client_pool_put(struct mgcp_client *mgcp_client); diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index fe3cccd..4156664 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -75,6 +75,11 @@ pool->mgcp_client_single = mgcp_client; } +bool mgcp_client_pool_empty(const struct mgcp_client_pool *pool) +{ + return llist_empty(&pool->member_list); +} + /*! Lookup the selected MGCP client config by its reference number */ struct mgcp_client_pool_member *mgcp_client_pool_find_member_by_nr(struct mgcp_client_pool *pool, unsigned int nr) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I009483ac9dfd6627e414f14d43b89f40ea4644db Gerrit-Change-Number: 32205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_client_pool: add mgcp_client_pool_empty()

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32205 ) Change subject: mgcp_client_pool: add mgcp_client_pool_empty() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I009483ac9dfd6627e414f14d43b89f40ea4644db Gerrit-Change-Number: 32205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:50:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: NM: NACK received OML OPSTART if no attributes were set beforehand

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32212 ) Change subject: NM: NACK received OML OPSTART if no attributes were set beforehand ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I771ecc2f60873a3549e8a07a2e57c7948dfc993e Gerrit-Change-Number: 32212 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:25:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: nm: Apply OPSTART through NM FSMs

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32211 ) Change subject: nm: Apply OPSTART through NM FSMs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5df0bfb4cc812c11c7a00a8ffa882ae1915d562f Gerrit-Change-Number: 32211 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:24:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: Simplify implementation of bts_model_opstart() in all bts types

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32210 ) Change subject: Simplify implementation of bts_model_opstart() in all bts types ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I54632201afe87eb3e02bc75cbade163917239ab6 Gerrit-Change-Number: 32210 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:23:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: lc15,oc2g,sysmo: Update GPRS NM object state at the right time

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32209 ) Change subject: lc15,oc2g,sysmo: Update GPRS NM object state at the right time ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2f331954835496504f1fafa572bd46ee83b03a63 Gerrit-Change-Number: 32209 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:23:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: bts_model_apply_oml(): Improve definition of parameter

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32204 ) Change subject: bts_model_apply_oml(): Improve definition of parameter ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ife2e98a791455d5f7e7052356d559af2f1d4d185 Gerrit-Change-Number: 32204 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:22:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32194 ) Change subject: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs ...................................................................... Patch Set 2: (1 comment) File src/common/nm_bb_transc_fsm.c: https://gerrit.osmocom.org/c/osmo-bts/+/32194/comment/2c76dfaf_7d5b79c4 PS2, Line 132: (struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type > can we not afford a local variable? IMHO it's really unusual to typ-cast a poinetr to msgb_l3 and […] yes I can do so. I'll probably do it in a followup commit though, since there's a bunch of commits doing several iterations of cleanup in the several same places. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id68868e25bbf96227ab6459fcd3c9181852ed28e Gerrit-Change-Number: 32194 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:20:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: nm: Drop NM_EV_SETATTR_{ACK/NACK}

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32196 ) Change subject: nm: Drop NM_EV_SETATTR_{ACK/NACK} ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I281c07bb5ad88ee03542f092141cebe036d10aee Gerrit-Change-Number: 32196 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:18:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32194 ) Change subject: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/common/nm_bb_transc_fsm.c: https://gerrit.osmocom.org/c/osmo-bts/+/32194/comment/b492c938_85289805 PS2, Line 132: (struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type can we not afford a local variable? IMHO it's really unusual to typ-cast a poinetr to msgb_l3 and dereference it to pass as argument. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id68868e25bbf96227ab6459fcd3c9181852ed28e Gerrit-Change-Number: 32194 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:17:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: bts_model_apply_oml(): Drop unneded code

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32195 ) Change subject: bts_model_apply_oml(): Drop unneded code ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: "only ... only" in the changelog is a bit difficult to read -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a0d38a122f50ffe749ebc4f1cc11235ca516586 Gerrit-Change-Number: 32195 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:15:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: Clarify configuration of TSC on each timeslot

by laforge

Attention is currently required from: pespin, fixeria, keith, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32165 ) Change subject: Clarify configuration of TSC on each timeslot ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief21daf63ba76725de9117cbe14ada8b75f147df Gerrit-Change-Number: 32165 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:14:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: bts-trx: Drop unused param to internal function

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32202 ) Change subject: bts-trx: Drop unused param to internal function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id7ad7629ec13bcec618055c41083cdac0a3102be Gerrit-Change-Number: 32202 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 15:08:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: Simplify implementation of bts_model_opstart() in all bts types

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32210 ) Change subject: Simplify implementation of bts_model_opstart() in all bts types ...................................................................... Simplify implementation of bts_model_opstart() in all bts types Use mo->fi directly to avoid repeating code paths for each obj_class. Change-Id: I54632201afe87eb3e02bc75cbade163917239ab6 --- M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 7 files changed, 25 insertions(+), 74 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/10/32210/1 diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index da2f348..0bbb2de 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1869,19 +1869,14 @@ switch (mo->obj_class) { case NM_OC_SITE_MANAGER: - rc = osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BTS: - rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); + case NM_OC_BASEB_TRANSC: + rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL); break; case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx *) obj; rc = trx_init(trx); break; - case NM_OC_BASEB_TRANSC: - bb_transc = (struct gsm_bts_bb_trx *) obj; - rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_CHANNEL: ts = (struct gsm_bts_trx_ts*) obj; rc = ts_opstart(ts); diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index 6809133..2e37fe7 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1874,19 +1874,14 @@ switch (mo->obj_class) { case NM_OC_SITE_MANAGER: - rc = osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BTS: - rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); + case NM_OC_BASEB_TRANSC: + rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL); break; case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx *) obj; rc = trx_init(trx); break; - case NM_OC_BASEB_TRANSC: - bb_transc = (struct gsm_bts_bb_trx *) obj; - rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_CHANNEL: ts = (struct gsm_bts_trx_ts*) obj; rc = ts_opstart(ts); diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index d8142cb..21a8d6a 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1767,26 +1767,20 @@ /* callback from OML */ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { - struct gsm_bts_bb_trx *bb_transc; struct gsm_bts_trx* trx; struct gsm_bts_trx_ts *ts; int rc; switch (mo->obj_class) { case NM_OC_SITE_MANAGER: - rc = osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BTS: - rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); + case NM_OC_BASEB_TRANSC: + rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL); break; case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx*) obj; rc = trx_init(trx); break; - case NM_OC_BASEB_TRANSC: - bb_transc = (struct gsm_bts_bb_trx *) obj; - rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_CHANNEL: ts = (struct gsm_bts_trx_ts*) obj; rc = ts_connect_as(ts, ts->pchan, pchan_act_compl_cb, NULL); diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 03e1825..78ae544 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -121,28 +121,14 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { int rc; - struct gsm_bts_bb_trx *bb_transc; - struct gsm_bts_trx* trx; - struct gsm_bts_trx_ts* ts; switch (mo->obj_class) { case NM_OC_SITE_MANAGER: - rc = osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BTS: - rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_RADIO_CARRIER: - trx = (struct gsm_bts_trx*) obj; - rc = osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BASEB_TRANSC: - bb_transc = (struct gsm_bts_bb_trx *) obj; - rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; + case NM_OC_RADIO_CARRIER: case NM_OC_CHANNEL: - ts = (struct gsm_bts_trx_ts *) obj; - rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL); + rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL); break; case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 3954244..a610111 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1743,26 +1743,20 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { - struct gsm_bts_bb_trx *bb_transc; struct gsm_bts_trx* trx; struct gsm_bts_trx_ts *ts; int rc; switch (mo->obj_class) { case NM_OC_SITE_MANAGER: - rc = osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BTS: - rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); + case NM_OC_BASEB_TRANSC: + rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL); break; case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx *) obj; rc = trx_init(trx); break; - case NM_OC_BASEB_TRANSC: - bb_transc = (struct gsm_bts_bb_trx *) obj; - rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_CHANNEL: ts = (struct gsm_bts_trx_ts*) obj; rc = ts_opstart(ts); diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 544e077..9d4b82d 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -576,31 +576,21 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { - struct gsm_bts_bb_trx *bb_transc; struct gsm_bts_trx *trx; - struct gsm_bts_trx_ts *ts; int rc; switch (mo->obj_class) { case NM_OC_SITE_MANAGER: - rc = osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BTS: - rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); + case NM_OC_BASEB_TRANSC: + case NM_OC_CHANNEL: + rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL); break; case NM_OC_RADIO_CARRIER: /* activate transceiver */ trx = (struct gsm_bts_trx *) obj; rc = trx_init(trx); break; - case NM_OC_BASEB_TRANSC: - bb_transc = (struct gsm_bts_bb_trx *) obj; - rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_CHANNEL: - ts = (struct gsm_bts_trx_ts *) obj; - rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: case NM_OC_GPRS_NSVC: diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index d208349..dae3316 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -156,28 +156,14 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { int rc; - struct gsm_bts_bb_trx *bb_transc; - struct gsm_bts_trx* trx; - struct gsm_bts_trx_ts *ts; switch (mo->obj_class) { case NM_OC_SITE_MANAGER: - rc = osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BTS: - rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_RADIO_CARRIER: - trx = (struct gsm_bts_trx*) obj; - rc = osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_BASEB_TRANSC: - bb_transc = (struct gsm_bts_bb_trx *) obj; - rc = osmo_fsm_inst_dispatch(bb_transc->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; case NM_OC_CHANNEL: - ts = (struct gsm_bts_trx_ts *) obj; - rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL); + rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL); break; case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I54632201afe87eb3e02bc75cbade163917239ab6 Gerrit-Change-Number: 32210 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: nm: Apply OPSTART through NM FSMs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32211 ) Change subject: nm: Apply OPSTART through NM FSMs ...................................................................... nm: Apply OPSTART through NM FSMs This way we have further control on how to handle the OPSTART messages received. For instance, NACK them if the NM object FSMs are not at the expected correct state. Related: OS#5992 Change-Id: I5df0bfb4cc812c11c7a00a8ffa882ae1915d562f --- M include/osmo-bts/nm_common_fsm.h M src/common/nm_bb_transc_fsm.c M src/common/nm_bts_fsm.c M src/common/nm_bts_sm_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_common_fsm.c M src/common/nm_radio_carrier_fsm.c M src/common/oml.c 8 files changed, 56 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/11/32211/1 diff --git a/include/osmo-bts/nm_common_fsm.h b/include/osmo-bts/nm_common_fsm.h index 8861a93..f785e1d 100644 --- a/include/osmo-bts/nm_common_fsm.h +++ b/include/osmo-bts/nm_common_fsm.h @@ -31,6 +31,7 @@ enum nm_fsm_events { NM_EV_SW_ACT, NM_EV_RX_SETATTR, /* data: struct nm_fsm_ev_setattr_data */ + NM_EV_RX_OPSTART, NM_EV_OPSTART_ACK, NM_EV_OPSTART_NACK, NM_EV_SHUTDOWN_START, diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 3d6b4e6..4853a94 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -134,6 +134,9 @@ ((struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type, rc); break; + case NM_EV_RX_OPSTART: + bts_model_opstart(trx->bts, &bb_transc->mo, bb_transc); + break; case NM_EV_OPSTART_ACK: bb_transc->mo.opstart_success = true; oml_mo_opstart_ack(&bb_transc->mo); @@ -250,6 +253,7 @@ [NM_BBTRANSC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_RX_SETATTR) | + X(NM_EV_RX_OPSTART) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK) | X(NM_EV_RSL_UP) | diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 1726d90..3056404 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -122,6 +122,9 @@ ((struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type, rc); break; + case NM_EV_RX_OPSTART: + bts_model_opstart(bts, &bts->mo, bts); + break; case NM_EV_OPSTART_ACK: bts->mo.opstart_success = true; oml_mo_opstart_ack(&bts->mo); @@ -182,6 +185,7 @@ [NM_BTS_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_RX_SETATTR) | + X(NM_EV_RX_OPSTART) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK), .out_state_mask = diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c index ac3c00d..7b3e38d 100644 --- a/src/common/nm_bts_sm_fsm.c +++ b/src/common/nm_bts_sm_fsm.c @@ -98,6 +98,9 @@ ((struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type, rc); break; + case NM_EV_RX_OPSTART: + bts_model_opstart(NULL, &site_mgr->mo, site_mgr); + break; case NM_EV_OPSTART_ACK: site_mgr->mo.opstart_success = true; oml_mo_opstart_ack(&site_mgr->mo); @@ -158,6 +161,7 @@ [NM_BTS_SM_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_RX_SETATTR) | + X(NM_EV_RX_OPSTART) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK), .out_state_mask = diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 5385559..057a761 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -106,9 +106,12 @@ ((struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type, rc); break; + case NM_EV_RX_OPSTART: + LOGPFSML(fi, LOGL_NOTICE, "BSC trying to activate TS while still in avail=dependency. " + "Allowing it to stay backward-compatible with older osmo-bts versions, but BSC is wrong.\n"); + bts_model_opstart(ts->trx->bts, &ts->mo, ts); + break; case NM_EV_OPSTART_ACK: - LOGPFSML(fi, LOGL_NOTICE, "BSC trying to activate TS while still in avail=dependency. " - "Allowing it to stay backward-compatible with older osmo-bts versions, but BSC is wrong.\n"); ts->mo.opstart_success = true; oml_mo_opstart_ack(&ts->mo); nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_ENABLED); @@ -154,6 +157,9 @@ ((struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type, rc); break; + case NM_EV_RX_OPSTART: + bts_model_opstart(ts->trx->bts, &ts->mo, ts); + break; case NM_EV_OPSTART_ACK: ts->mo.opstart_success = true; oml_mo_opstart_ack(&ts->mo); @@ -229,8 +235,9 @@ [NM_CHAN_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = X(NM_EV_RX_SETATTR) | - X(NM_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */ - X(NM_EV_OPSTART_NACK) | + X(NM_EV_RX_OPSTART) | /* backward compatibility, buggy BSC */ + X(NM_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */ + X(NM_EV_OPSTART_NACK) | /* backward compatibility, buggy BSC */ X(NM_EV_BBTRANSC_ENABLED) | X(NM_EV_RCARRIER_ENABLED) | X(NM_EV_BBTRANSC_DISABLED) | @@ -246,6 +253,7 @@ [NM_CHAN_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_RX_SETATTR) | + X(NM_EV_RX_OPSTART) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK) | X(NM_EV_BBTRANSC_DISABLED) | diff --git a/src/common/nm_common_fsm.c b/src/common/nm_common_fsm.c index 5298e4d..f742357 100644 --- a/src/common/nm_common_fsm.c +++ b/src/common/nm_common_fsm.c @@ -26,6 +26,7 @@ const struct value_string nm_fsm_event_names[] = { { NM_EV_SW_ACT, "SW_ACT" }, { NM_EV_RX_SETATTR, "RX_SETATTR" }, + { NM_EV_RX_OPSTART, "RX_OPSTART" }, { NM_EV_OPSTART_ACK, "OPSTART_ACK" }, { NM_EV_OPSTART_NACK, "OPSTART_NACK" }, { NM_EV_SHUTDOWN_START, "SHUTDOWN_START" }, diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index 06ce98c..c3a4cb5 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -115,6 +115,9 @@ ((struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type, rc); break; + case NM_EV_RX_OPSTART: + bts_model_opstart(trx->bts, &trx->mo, trx); + break; case NM_EV_OPSTART_ACK: trx->mo.opstart_success = true; oml_mo_opstart_ack(&trx->mo); @@ -224,6 +227,7 @@ [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_RX_SETATTR) | + X(NM_EV_RX_OPSTART) | X(NM_EV_OPSTART_ACK) | X(NM_EV_OPSTART_NACK) | X(NM_EV_RSL_UP) | diff --git a/src/common/oml.c b/src/common/oml.c index 5ef3978..846bb23 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1069,6 +1069,7 @@ struct abis_om_fom_hdr *foh = msgb_l3(msg); struct gsm_abis_mo *mo; void *obj; + int rc; DEBUGPFOH(DOML, foh, "Rx OPSTART\n"); @@ -1084,8 +1085,17 @@ return oml_mo_opstart_ack(mo); } - /* Step 3: Ask BTS driver to apply the opstart */ - return bts_model_opstart(bts, mo, obj); + if (!mo->fi) { + /* Some NM objets still don't have FSMs implemented, such as + * NM_OC_GPRS_NSE, NM_OC_GPRS_CELL or NM_OC_GPRS_NSVC. For those, don't go through FSM: + */ + return bts_model_opstart(bts, mo, obj); + } + + rc = osmo_fsm_inst_dispatch(mo->fi, NM_EV_RX_OPSTART, NULL); + if (rc < 0) + return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); + return rc; } static int oml_rx_chg_adm_state(struct gsm_bts *bts, struct msgb *msg) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5df0bfb4cc812c11c7a00a8ffa882ae1915d562f Gerrit-Change-Number: 32211 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: lc15,oc2g,sysmo: Update GPRS NM object state at the right time

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32209 ) Change subject: lc15,oc2g,sysmo: Update GPRS NM object state at the right time ...................................................................... lc15,oc2g,sysmo: Update GPRS NM object state at the right time Change-Id: I2f331954835496504f1fafa572bd46ee83b03a63 --- M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-sysmo/oml.c 3 files changed, 12 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/09/32209/1 diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 9a73513..da2f348 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1889,14 +1889,8 @@ case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: case NM_OC_GPRS_NSVC: - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, -1, -1); + oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1); rc = oml_mo_opstart_ack(mo); - if (mo->obj_class == NM_OC_BTS) { - oml_mo_state_chg(&bts->mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nse.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.cell.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_OK, -1); - } break; default: rc = oml_mo_opstart_nack(mo, NM_NACK_OBJCLASS_NOTSUPP); diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index 553ef53..6809133 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1878,10 +1878,6 @@ break; case NM_OC_BTS: rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); - oml_mo_state_chg(&bts->mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nse.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.cell.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_OK, -1); break; case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx *) obj; @@ -1898,7 +1894,7 @@ case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: case NM_OC_GPRS_NSVC: - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, -1, -1); + oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1); rc = oml_mo_opstart_ack(mo); break; default: diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index a00cb93..3954244 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1754,10 +1754,6 @@ break; case NM_OC_BTS: rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); - oml_mo_state_chg(&bts->mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nse.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.cell.mo, -1, NM_AVSTATE_OK, -1); - oml_mo_state_chg(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_OK, -1); break; case NM_OC_RADIO_CARRIER: trx = (struct gsm_bts_trx *) obj; @@ -1774,7 +1770,7 @@ case NM_OC_GPRS_NSE: case NM_OC_GPRS_CELL: case NM_OC_GPRS_NSVC: - oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, -1, -1); + oml_mo_state_chg(mo, NM_OPSTATE_ENABLED, NM_AVSTATE_OK, -1); rc = oml_mo_opstart_ack(mo); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2f331954835496504f1fafa572bd46ee83b03a63 Gerrit-Change-Number: 32209 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: NM: NACK received OML OPSTART if no attributes were set beforehand

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32212 ) Change subject: NM: NACK received OML OPSTART if no attributes were set beforehand ...................................................................... NM: NACK received OML OPSTART if no attributes were set beforehand Related: OS#5992 Change-Id: I771ecc2f60873a3549e8a07a2e57c7948dfc993e --- M src/common/nm_bb_transc_fsm.c M src/common/nm_bts_fsm.c M src/common/nm_bts_sm_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_radio_carrier_fsm.c 5 files changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/12/32212/1 diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 4853a94..bec029e 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -135,6 +135,13 @@ rc); break; case NM_EV_RX_OPSTART: +#if 0 + /* Disabled because osmo-bsc doesn't send SetAttr on SITE_MGR object */ + if (!bb_transc->mo.setattr_success) { + oml_mo_opstart_nack(&bb_transc->mo, NM_NACK_CANT_PERFORM); + return; + } +#endif bts_model_opstart(trx->bts, &bb_transc->mo, bb_transc); break; case NM_EV_OPSTART_ACK: diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 3056404..3126bde 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -123,6 +123,10 @@ rc); break; case NM_EV_RX_OPSTART: + if (!bts->mo.setattr_success) { + oml_mo_opstart_nack(&bts->mo, NM_NACK_CANT_PERFORM); + return; + } bts_model_opstart(bts, &bts->mo, bts); break; case NM_EV_OPSTART_ACK: diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c index 7b3e38d..42649b5 100644 --- a/src/common/nm_bts_sm_fsm.c +++ b/src/common/nm_bts_sm_fsm.c @@ -99,6 +99,13 @@ rc); break; case NM_EV_RX_OPSTART: +#if 0 + /* Disabled because osmo-bsc doesn't send SetAttr on SITE_MGR object */ + if (!site_mgr->mo.setattr_success) { + oml_mo_opstart_nack(&site_mgr->mo, NM_NACK_CANT_PERFORM); + return; + } +#endif bts_model_opstart(NULL, &site_mgr->mo, site_mgr); break; case NM_EV_OPSTART_ACK: diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 057a761..573e9e0 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -109,6 +109,10 @@ case NM_EV_RX_OPSTART: LOGPFSML(fi, LOGL_NOTICE, "BSC trying to activate TS while still in avail=dependency. " "Allowing it to stay backward-compatible with older osmo-bts versions, but BSC is wrong.\n"); + if (!ts->mo.setattr_success) { + oml_mo_opstart_nack(&ts->mo, NM_NACK_CANT_PERFORM); + return; + } bts_model_opstart(ts->trx->bts, &ts->mo, ts); break; case NM_EV_OPSTART_ACK: @@ -158,6 +162,10 @@ rc); break; case NM_EV_RX_OPSTART: + if (!ts->mo.setattr_success) { + oml_mo_opstart_nack(&ts->mo, NM_NACK_CANT_PERFORM); + return; + } bts_model_opstart(ts->trx->bts, &ts->mo, ts); break; case NM_EV_OPSTART_ACK: diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index c3a4cb5..5963b57 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -116,6 +116,10 @@ rc); break; case NM_EV_RX_OPSTART: + if (!trx->mo.setattr_success) { + oml_mo_opstart_nack(&trx->mo, NM_NACK_CANT_PERFORM); + return; + } bts_model_opstart(trx->bts, &trx->mo, trx); break; case NM_EV_OPSTART_ACK: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I771ecc2f60873a3549e8a07a2e57c7948dfc993e Gerrit-Change-Number: 32212 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: hnbgw_mgw_setup: use mgcp_client_pool_empty()

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 ) Change subject: hnbgw_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 Gerrit-Change-Number: 32208 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 14:33:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 14:33:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: bsc_mgw_setup: use mgcp_client_pool_empty()

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32207 ) Change subject: bsc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 Gerrit-Change-Number: 32207 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 14:33:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: hnbgw_mgw_setup: use mgcp_client_pool_empty()

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 to look at the new patch set (#3). Change subject: hnbgw_mgw_setup: use mgcp_client_pool_empty() ...................................................................... hnbgw_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 --- M TODO-RELEASE M src/osmo-hnbgw/hnbgw.c 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/08/32208/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 Gerrit-Change-Number: 32208 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: bsc_mgw_setup: use mgcp_client_pool_empty()

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207 to look at the new patch set (#3). Change subject: bsc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... bsc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 --- M TODO-RELEASE M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/32207/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 Gerrit-Change-Number: 32207 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 to look at the new patch set (#4). Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... msc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 --- M TODO-RELEASE M src/osmo-msc/msc_main.c 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/32206/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 14:32:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 2: (1 comment) File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/c/osmo-msc/+/32206/comment/d58c8d84_f0effe15 PS2, Line 565: if (pool_members_initalized) { > Can you perhaps now change this to have the error as early termination? it's way clearer imho since […] agreed, this is more readable. thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 14:08:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: hnbgw_mgw_setup: use mgcp_client_pool_empty()

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 to look at the new patch set (#2). Change subject: hnbgw_mgw_setup: use mgcp_client_pool_empty() ...................................................................... hnbgw_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 --- M TODO-RELEASE M src/osmo-hnbgw/hnbgw.c 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/08/32208/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 Gerrit-Change-Number: 32208 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: bsc_mgw_setup: use mgcp_client_pool_empty()

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207 to look at the new patch set (#2). Change subject: bsc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... bsc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 --- M TODO-RELEASE M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/32207/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 Gerrit-Change-Number: 32207 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 to look at the new patch set (#3). Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... msc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 --- M TODO-RELEASE M src/osmo-msc/msc_main.c 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/32206/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... Patch Set 2: (1 comment) File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/c/osmo-msc/+/32206/comment/bf7bdf94_ca8bbdcb PS2, Line 565: if (pool_members_initalized) { Can you perhaps now change this to have the error as early termination? it's way clearer imho since there starts to be several branches: ``` if (!pool_members_initalized) { LOGP(DMSC, LOGL_ERROR, "MGW pool failed to configure any pool members\n"); return -EINVAL; } LOGP(DMSC, LOGL_NOTICE, "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n", pool_members_initalized); return 0; ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 13:57:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_client_pool: add mgcp_client_pool_empty()

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32205 ) Change subject: mgcp_client_pool: add mgcp_client_pool_empty() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I009483ac9dfd6627e414f14d43b89f40ea4644db Gerrit-Change-Number: 32205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 13:54:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: hnbgw_mgw_setup: use mgcp_client_pool_empty()

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 ) Change subject: hnbgw_mgw_setup: use mgcp_client_pool_empty() ...................................................................... hnbgw_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 --- M TODO-RELEASE M src/osmo-hnbgw/hnbgw.c 2 files changed, 25 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/08/32208/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index cec63db..cf72895 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ osmo-hnbgw cfg config deprecated: 'sccp cr max-payload-len <0-999999>' libosmo-sigtran >=1.7.0 Ensure SCCP CR max payload length of 130 bytes is enforced. Uses osmo_scu_prim_hdr_name_c() +libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty() diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 0624803..14f04af 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -693,12 +693,16 @@ /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and * (re)connect them manually from the VTY. */ - pool_members_initalized = mgcp_client_pool_connect(g_hnb_gw->mgw_pool); - if (pool_members_initalized) { - LOGP(DMGW, LOGL_NOTICE, - "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'mgcp').\n", - pool_members_initalized); - return 0; + if (!mgcp_client_pool_empty(g_hnb_gw->mgw_pool)) { + pool_members_initalized = mgcp_client_pool_connect(g_hnb_gw->mgw_pool); + if (pool_members_initalized) { + LOGP(DMGW, LOGL_NOTICE, + "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'mgcp').\n", + pool_members_initalized); + return 0; + } + LOGP(DMGW, LOGL_ERROR, "MGW pool failed to configure any pool members\n"); + return -EINVAL; } /* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927 Gerrit-Change-Number: 32208 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: bsc_mgw_setup: use mgcp_client_pool_empty()

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32207 ) Change subject: bsc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... bsc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 --- M TODO-RELEASE M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 26 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/32207/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 2658cdd..690e9ea 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -13,4 +13,5 @@ libosmogsm >1.8.0 circuit switched data stuff (gsm0808_enc/dec_channel_type etc.) libosmo-abis >1.4.0 osmo_ortp.h: add RTP_PT_CSDATA libosmo-sccp >1.7.0 osmo_sccp_{get,set}_priv() -libosmocore >1.8.0 GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO \ No newline at end of file +libosmocore >1.8.0 GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO +libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty() diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 5866ec1..c6afb50 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -839,12 +839,16 @@ /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and * (re)connect them manually from the VTY. */ - pool_members_initalized = mgcp_client_pool_connect(bsc_gsmnet->mgw.mgw_pool); - if (pool_members_initalized) { - LOGP(DNM, LOGL_NOTICE, - "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n", - pool_members_initalized); - return 0; + if (!mgcp_client_pool_empty(bsc_gsmnet->mgw.mgw_pool)) { + pool_members_initalized = mgcp_client_pool_connect(bsc_gsmnet->mgw.mgw_pool); + if (pool_members_initalized) { + LOGP(DNM, LOGL_NOTICE, + "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n", + pool_members_initalized); + return 0; + } + LOGP(DNM, LOGL_ERROR, "MGW pool failed to configure any pool members\n"); + return -EINVAL; } /* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40 Gerrit-Change-Number: 32207 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by osmith

osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... msc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db Related: OS#5993 Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 --- M TODO-RELEASE M src/osmo-msc/msc_main.c 2 files changed, 25 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/32206/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 ) Change subject: msc_mgw_setup: use mgcp_client_pool_empty() ...................................................................... msc_mgw_setup: use mgcp_client_pool_empty() Don't fall back to the legacy config if the pool is configured but no connection to any pool member can be established. Related: OS#5993 Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 --- M TODO-RELEASE M src/osmo-msc/msc_main.c 2 files changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/32206/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..a2695f2 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty() diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index a1e91ce..9417c0b 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -560,12 +560,16 @@ /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and * (re)connect them manually from the VTY. */ - pool_members_initalized = mgcp_client_pool_connect(msc_network->mgw.mgw_pool); - if (pool_members_initalized) { - LOGP(DMSC, LOGL_NOTICE, - "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n", - pool_members_initalized); - return 0; + if (!mgcp_client_pool_empty(msc_network->mgw.mgw_pool)) { + pool_members_initalized = mgcp_client_pool_connect(msc_network->mgw.mgw_pool); + if (pool_members_initalized) { + LOGP(DMSC, LOGL_NOTICE, + "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n", + pool_members_initalized); + return 0; + } + LOGP(DMSC, LOGL_ERROR, "MGW pool failed to configure any pool members\n"); + return -EINVAL; } /* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3 Gerrit-Change-Number: 32206 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_client_pool: add mgcp_client_pool_empty()

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32205 ) Change subject: mgcp_client_pool: add mgcp_client_pool_empty() ...................................................................... mgcp_client_pool: add mgcp_client_pool_empty() Check if the private struct mgcp_client_pool has an empty member_list. Clients that support both the legacy config and the pool config can use this to properly exit with error if pool members are configured, but no connection to any of the pool members can be established. Currently clients can't distinguish a config without pool members and a config with pool members that is broken and will fall back to using the defaults of the legacy config in both cases. Related: OS#5993 Change-Id: I009483ac9dfd6627e414f14d43b89f40ea4644db --- M include/osmocom/mgcp_client/mgcp_client_pool.h M src/libosmo-mgcp-client/mgcp_client_pool.c 2 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/05/32205/1 diff --git a/include/osmocom/mgcp_client/mgcp_client_pool.h b/include/osmocom/mgcp_client/mgcp_client_pool.h index 46d7e90..ba31fb0 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool.h @@ -12,6 +12,7 @@ int mgcp_client_pool_config_write(struct vty *vty, const char *indent); unsigned int mgcp_client_pool_connect(struct mgcp_client_pool *pool); void mgcp_client_pool_register_single(struct mgcp_client_pool *pool, struct mgcp_client *mgcp_client); +bool mgcp_client_pool_empty(const struct mgcp_client_pool *pool); struct mgcp_client *mgcp_client_pool_get(struct mgcp_client_pool *pool); void mgcp_client_pool_put(struct mgcp_client *mgcp_client); diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index fe3cccd..4156664 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -75,6 +75,11 @@ pool->mgcp_client_single = mgcp_client; } +bool mgcp_client_pool_empty(const struct mgcp_client_pool *pool) +{ + return llist_empty(&pool->member_list); +} + /*! Lookup the selected MGCP client config by its reference number */ struct mgcp_client_pool_member *mgcp_client_pool_find_member_by_nr(struct mgcp_client_pool *pool, unsigned int nr) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I009483ac9dfd6627e414f14d43b89f40ea4644db Gerrit-Change-Number: 32205 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[XL] Change in libosmocore[master]: Add osmo_io with initial poll backend

by pespin

Attention is currently required from: osmith, Hoernchen, neels, fixeria, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Patch Set 8: Code-Review+2 (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/09aac23c_b3f6595f PS8, Line 169: llist_add_tail(&msghdr->list, &iofd->tx_queue.msg_queue); > I had that at first, but msgb_enqueue_count() takes a struct msgb * and derefereces the ->list point […] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 8 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 11:48:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[XL] Change in libosmocore[master]: Add osmo_io with initial poll backend

by pespin

Attention is currently required from: osmith, Hoernchen, neels, fixeria, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Patch Set 8: (1 comment) File src/core/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/845e0276_d33c2d06 PS8, Line 85: if (iofd->closed) > closed, in_callback, and to_free […] Nice, thanks. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 8 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 11:48:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[XL] Change in libosmocore[master]: Add osmo_io with initial poll backend

by daniel

Attention is currently required from: osmith, Hoernchen, neels, pespin, fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Patch Set 8: (2 comments) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/f516f35b_750d09f6 PS8, Line 169: llist_add_tail(&msghdr->list, &iofd->tx_queue.msg_queue); > Could be msgb_enqueue_count(), but it can stay this way too. I had that at first, but msgb_enqueue_count() takes a struct msgb * and derefereces the ->list pointer in msgb_enqueue(). So this would require casting a msghdr * to a msgb * and relying on the fact that the list member is in the same position in both structs which I quite dislike. File src/core/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/b043b551_197e07ec PS8, Line 85: if (iofd->closed) > is this the new -EBADF to handle case where recvmsg_cb closes th iofd? What if iofd is freed by recv […] closed, in_callback, and to_free Closed is the early-return that prevents the write from being considered when the fd is already closed. in_callback is set to true while inside this function. If osmo_iofd_free() is called while in_callback is true then it will only close the fd and defer actually freeing the data and just set to_free to true. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 8 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 11:43:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

2024

2023

2022

gerrit-log April 2023