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

[M] Change in osmo-bts[master]: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs
by pespin 04 Apr '23

04 Apr '23

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/0f953697_6ee88442 PS2, Line 132: (struct abis_om_fom_hdr *)msgb_l3(setattr_data->msg))->msg_type > yes I can do so. […] Marking this patch as WIP since actually in here there may be a change in behavior, because I think oml_fom_ack_nack keeps the content of the originating message when transmitting the ACK. -- 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 18:28:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: bts-trx: Drop unused param to internal function
by pespin 04 Apr '23

04 Apr '23

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 0

[M] Change in osmo-bts[master]: Clarify configuration of TSC on each timeslot
by pespin 04 Apr '23

04 Apr '23

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 0

[M] Change in osmo-bts[master]: bts_model_apply_oml(): Drop unneded code
by fixeria 04 Apr '23

04 Apr '23

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 0

[S] Change in osmo-bts[master]: bts-trx: Drop unused param to internal function
by fixeria 04 Apr '23

04 Apr '23

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 0

[S] Change in osmo-bsc[master]: bsc_mgw_setup: use mgcp_client_pool_empty()
by osmith 04 Apr '23

04 Apr '23

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 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()
by osmith 04 Apr '23

04 Apr '23

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 0

[S] Change in osmo-msc[master]: msc_mgw_setup: use mgcp_client_pool_empty()
by osmith 04 Apr '23

04 Apr '23

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 0

[S] Change in osmo-hnbgw[master]: hnbgw_mgw_setup: use mgcp_client_pool_empty()
by osmith 04 Apr '23

04 Apr '23

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 0

[S] Change in osmo-hnbgw[master]: hnbgw_mgw_setup: use mgcp_client_pool_empty()
by fixeria 04 Apr '23

04 Apr '23

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 0