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

[M] Change in osmo-bsc[master]: oml: ipacc: parse Object Version from SW Activated Report

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34356?usp=email ) Change subject: oml: ipacc: parse Object Version from SW Activated Report ...................................................................... oml: ipacc: parse Object Version from SW Activated Report Change-Id: I39105096a6b29bd7e4fb15287653074527c3e024 Related: OS#4505 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts_ipaccess_nanobts.c 2 files changed, 46 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/34356/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7d36baa..01fbf69 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -538,6 +538,12 @@ bool rsl_connect_sent; bool rsl_connect_ack_received; bool force_rf_lock; + /* vendor specific fields below */ + union { + struct { + uint8_t obj_version; + } ipaccess; + }; }; /* Ericsson OM2000 Managed Object */ diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 8669d64..374b82d 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -201,44 +201,66 @@ struct gsm_bts_trx *trx; struct gsm_gprs_nsvc *nsvc; struct gsm_bts_trx_ts *ts; + struct gsm_abis_mo *mo; + struct tlv_parsed tp; if (!is_ipa_abisip_bts(bts)) return 0; switch (foh->obj_class) { case NM_OC_SITE_MANAGER: - osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SW_ACT_REP, NULL); + mo = &bts->site_mgr->mo; break; case NM_OC_BTS: - osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_SW_ACT_REP, NULL); + mo = &bts->mo; break; case NM_OC_BASEB_TRANSC: if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) return -EINVAL; - osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT_REP, NULL); + mo = &trx->bb_transc.mo; break; case NM_OC_RADIO_CARRIER: if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) return -EINVAL; - osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT_REP, NULL); + mo = &trx->mo; break; case NM_OC_CHANNEL: if (!(ts = abis_nm_get_ts(mb))) return -EINVAL; - osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SW_ACT_REP, NULL); + mo = &ts->mo; break; case NM_OC_GPRS_NSE: - osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_SW_ACT_REP, NULL); + mo = &bts->site_mgr->gprs.nse.mo; break; case NM_OC_GPRS_CELL: - osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_SW_ACT_REP, NULL); + mo = &bts->gprs.cell.mo; break; case NM_OC_GPRS_NSVC: if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr))) return -EINVAL; - osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_SW_ACT_REP, NULL); + mo = &nsvc->mo; break; + default: + LOGPFOH(DNM, LOGL_NOTICE, foh, "%s(): unknown Object Class\n", __func__); + return -ENODEV; } + + if (abis_nm_tlv_parse(&tp, bts, &foh->data[0], msgb_l3len(mb) - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } + + mo->ipaccess.obj_version = 0; /* implicit default */ + if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION, 1)) { + /* nanoBTS may report several Object Versions; the first one will + * be used by default unless requested explicitly before OPSTARTing. */ + mo->ipaccess.obj_version = *TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION); + LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Version is %u (default)\n", + mo->ipaccess.obj_version); + } + + osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL); + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34356?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I39105096a6b29bd7e4fb15287653074527c3e024 Gerrit-Change-Number: 34356 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: nm_{bb_transc,bts}_fsm: rework sending of Get Attributes

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34354?usp=email ) Change subject: nm_{bb_transc,bts}_fsm: rework sending of Get Attributes ...................................................................... nm_{bb_transc,bts}_fsm: rework sending of Get Attributes * Make it easier to append the attributes conditionally. * Remove irrelevant comments about the order of attributes. * Request NM_ATT_IPACC_SUPP_FEATURES from Abis/IP models only. Change-Id: Ice5bddd51481a3ef9fcffd77a4c292ea211bf179 Related: OS#4505 --- M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_bts_fsm.c 2 files changed, 36 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/34354/1 diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index c70904b..4b5e2b2 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -111,13 +111,18 @@ /* Request TRX-level attributes */ if (!bb_transc->mo.get_attr_sent && !bb_transc->mo.get_attr_rep_received) { - bb_transc->mo.get_attr_sent = true; - /* N. B: we rely on attribute order when parsing response in abis_nm_rx_get_attr_resp() */ - const uint8_t trx_attr[] = { NM_ATT_MANUF_STATE, NM_ATT_SW_CONFIG, NM_ATT_IPACC_SUPP_FEATURES }; - /* we should not request more attributes than we're ready to handle */ - OSMO_ASSERT(sizeof(trx_attr) < MAX_BTS_ATTR); + uint8_t attr_buf[MAX_BTS_ATTR]; + uint8_t *ptr = &attr_buf[0]; + + *(ptr++) = NM_ATT_MANUF_STATE; + *(ptr++) = NM_ATT_SW_CONFIG; + if (is_ipa_abisip_bts(trx->bts)) + *(ptr++) = NM_ATT_IPACC_SUPP_FEATURES; + + OSMO_ASSERT((ptr - attr_buf) <= sizeof(attr_buf)); abis_nm_get_attr(trx->bts, NM_OC_BASEB_TRANSC, 0, trx->nr, 0xff, - trx_attr, sizeof(trx_attr)); + &attr_buf[0], (ptr - attr_buf)); + bb_transc->mo.get_attr_sent = true; } if (bb_transc->mo.get_attr_rep_received && diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index e601e18..a9b6604 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -98,13 +98,18 @@ /* Request generic BTS-level attributes */ if (!bts->mo.get_attr_sent && !bts->mo.get_attr_rep_received) { - bts->mo.get_attr_sent = true; - /* N. B: we rely on attribute order when parsing response in abis_nm_rx_get_attr_resp() */ - const uint8_t bts_attr[] = { NM_ATT_MANUF_ID, NM_ATT_SW_CONFIG, NM_ATT_IPACC_SUPP_FEATURES}; - /* we should not request more attributes than we're ready to handle */ - OSMO_ASSERT(sizeof(bts_attr) < MAX_BTS_ATTR); + uint8_t attr_buf[MAX_BTS_ATTR]; + uint8_t *ptr = &attr_buf[0]; + + *(ptr++) = NM_ATT_MANUF_ID; + *(ptr++) = NM_ATT_SW_CONFIG; + if (is_ipa_abisip_bts(bts)) + *(ptr++) = NM_ATT_IPACC_SUPP_FEATURES; + + OSMO_ASSERT((ptr - attr_buf) <= sizeof(attr_buf)); abis_nm_get_attr(bts, NM_OC_BTS, 0, 0xff, 0xff, - bts_attr, sizeof(bts_attr)); + &attr_buf[0], (ptr - attr_buf)); + bts->mo.get_attr_sent = true; } if (bts->mo.get_attr_rep_received && -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ice5bddd51481a3ef9fcffd77a4c292ea211bf179 Gerrit-Change-Number: 34354 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34357?usp=email ) Change subject: oml: ipacc: fix sending hard-coded GPRS Cell attributes ...................................................................... oml: ipacc: fix sending hard-coded GPRS Cell attributes Change-Id: I7d90ca3d6a660af8e953e890c7919194f5d297d2 Related: OS#4505 --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 1 file changed, 37 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/34357/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index 1f64c0e..ddbb05a 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -1,6 +1,6 @@ /* ip.access nanoBTS specific code, OML attribute table generator */ -/* (C) 2016 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> +/* (C) 2016-2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> * All Rights Reserved * * Author: Philipp Maier @@ -226,6 +226,7 @@ struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts) { const struct gsm_gprs_cell *cell = &bts->gprs.cell; + const struct gprs_rlc_cfg *rlcc = &cell->rlc_cfg; struct msgb *msgb; uint8_t buf[2]; msgb = msgb_alloc(1024, "nanobts_attr_bts"); @@ -236,45 +237,48 @@ buf[0] = bts->gprs.rac; msgb_tl16v_put(msgb, NM_ATT_IPACC_RAC, 1, buf); - buf[0] = 5; /* repeat time (50ms) */ - buf[1] = 3; /* repeat count */ + buf[0] = rlcc->paging.repeat_time / 50; /* units of 50ms */ + buf[1] = rlcc->paging.repeat_count; msgb_tl16v_put(msgb, NM_ATT_IPACC_GPRS_PAGING_CFG, 2, buf); /* BVCI 925 */ - buf[0] = bts->gprs.cell.bvci >> 8; - buf[1] = bts->gprs.cell.bvci & 0xff; + buf[0] = cell->bvci >> 8; + buf[1] = cell->bvci & 0xff; msgb_tl16v_put(msgb, NM_ATT_IPACC_BVCI, 2, buf); /* all timers in seconds, unless otherwise stated */ const struct abis_nm_ipacc_att_rlc_cfg rlc_cfg = { - .t3142 = 20, /* T3142 */ - .t3169 = 5, /* T3169 */ - .t3191 = 5, /* T3191 */ - .t3193_10ms = 160, /* T3193 (units of 10ms) */ - .t3195 = 5, /* T3195 */ - .n3101 = 10, /* N3101 */ - .n3103 = 4, /* N3103 */ - .n3105 = 8, /* N3105 */ - .rlc_cv_countdown = 15, /* RLC CV countdown */ + .t3142 = rlcc->parameter[RLC_T3142], + .t3169 = rlcc->parameter[RLC_T3169], + .t3191 = rlcc->parameter[RLC_T3191], + .t3193_10ms = rlcc->parameter[RLC_T3193] / 10, + .t3195 = rlcc->parameter[RLC_T3195], + .n3101 = rlcc->parameter[RLC_N3101], + .n3103 = rlcc->parameter[RLC_N3103], + .n3105 = rlcc->parameter[RLC_N3105], + .rlc_cv_countdown = rlcc->parameter[CV_COUNTDOWN], }; msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG, sizeof(rlc_cfg), (const uint8_t *)&rlc_cfg); if (is_osmobts(bts) || cell->mo.ipaccess.obj_version >= 4) { + /* CS1..CS4 flags encoded in the first octet */ + buf[0] = rlcc->cs_mask & 0x0f; + /* MCS1..MSC8 flags encoded in the second octet */ + buf[1] = 0x00; if (bts->gprs.mode == BTS_GPRS_EGPRS) { - buf[0] = 0x8f; - buf[1] = 0xff; - } else { - buf[0] = 0x0f; - buf[1] = 0x00; + /* MSC9 is special and also goes to the first octet */ + if (rlcc->cs_mask & (1 << GPRS_MCS9)) + buf[0] |= (1 << 7); + buf[1] = (rlcc->cs_mask >> 4) & 0xff; } msgb_tl16v_put(msgb, NM_ATT_IPACC_CODING_SCHEMES, 2, buf); } if (is_osmobts(bts) || cell->mo.ipaccess.obj_version >= 20) { const struct abis_nm_ipacc_att_rlc_cfg_2 rlc_cfg_2 = { - .t_dl_tbf_ext_10ms = htons(250), /* 0..500 */ - .t_ul_tbf_ext_10ms = htons(250), /* 0..500 */ - .initial_cs = 2, /* CS2 */ + .t_dl_tbf_ext_10ms = htons(rlcc->parameter[T_DL_TBF_EXT] / 10), + .t_ul_tbf_ext_10ms = htons(rlcc->parameter[T_UL_TBF_EXT] / 10), + .initial_cs = rlcc->initial_cs, }; msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_2, sizeof(rlc_cfg_2), (const uint8_t *)&rlc_cfg_2); @@ -282,7 +286,7 @@ if (is_osmobts(bts) || cell->mo.ipaccess.obj_version >= 30) { const struct abis_nm_ipacc_att_rlc_cfg_3 rlc_cfg_3 = { - .initial_mcs = 2, /* MCS2 */ + .initial_mcs = rlcc->initial_mcs, }; msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_3, sizeof(rlc_cfg_3), (const uint8_t *)&rlc_cfg_3); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34357?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7d90ca3d6a660af8e953e890c7919194f5d297d2 Gerrit-Change-Number: 34357 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: oml: ipacc: fix copy-pasted talloc chunk names

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34358?usp=email ) Change subject: oml: ipacc: fix copy-pasted talloc chunk names ...................................................................... oml: ipacc: fix copy-pasted talloc chunk names Change-Id: Ib0858c0d84b9bd2d3a4d732cfedb045862d2efed Related: OS#4505 --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 1 file changed, 20 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/34358/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index ddbb05a..bc6c59e 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -99,7 +99,8 @@ struct msgb *msgb; uint8_t buf[256]; int rlt; - msgb = msgb_alloc(1024, "nanobts_attr_bts"); + + msgb = msgb_alloc(1024, __func__); if (!msgb) return NULL; @@ -183,7 +184,8 @@ struct abis_nm_ipacc_att_ns_cfg ns_cfg; struct abis_nm_ipacc_att_bssgp_cfg bssgp_cfg; struct gsm_bts *bts = gsm_bts_sm_get_bts(bts_sm); - msgb = msgb_alloc(1024, "nanobts_attr_bts"); + + msgb = msgb_alloc(1024, __func__); if (!msgb) return NULL; @@ -229,7 +231,8 @@ const struct gprs_rlc_cfg *rlcc = &cell->rlc_cfg; struct msgb *msgb; uint8_t buf[2]; - msgb = msgb_alloc(1024, "nanobts_attr_bts"); + + msgb = msgb_alloc(1024, __func__); if (!msgb) return NULL; @@ -299,7 +302,8 @@ { struct msgb *msgb; uint8_t buf[256]; - msgb = msgb_alloc(1024, "nanobts_attr_bts"); + + msgb = msgb_alloc(1024, __func__); if (!msgb) return NULL; @@ -344,7 +348,8 @@ { struct msgb *msgb; uint8_t buf[256]; - msgb = msgb_alloc(1024, "nanobts_attr_bts"); + + msgb = msgb_alloc(1024, __func__); if (!msgb) return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34358?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0858c0d84b9bd2d3a4d732cfedb045862d2efed Gerrit-Change-Number: 34358 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34359?usp=email ) Change subject: abis_nm: send Get Attributes to Rado Carrier MO(s) ...................................................................... abis_nm: send Get Attributes to Rado Carrier MO(s) Change-Id: If7b75689c12a253377f2747babd4d7ebd1db5f87 Related: OS#4505 --- M src/osmo-bsc/nm_rcarrier_fsm.c 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/34359/1 diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index 824b2ed..71cb47f 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -58,6 +58,8 @@ { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + trx->mo.get_attr_sent = false; + trx->mo.get_attr_rep_received = false; trx->mo.set_attr_sent = false; trx->mo.set_attr_ack_received = false; trx->mo.adm_unlock_sent = false; @@ -104,6 +106,22 @@ if (bts_setup_ramp_wait(trx->bts)) return; + if (!trx->mo.get_attr_sent && !trx->mo.get_attr_rep_received) { + uint8_t attr_buf[2]; /* enlarge if needed */ + uint8_t *ptr = &attr_buf[0]; + + *(ptr++) = NM_ATT_SW_CONFIG; + if (is_ipa_abisip_bts(trx->bts)) + *(ptr++) = NM_ATT_IPACC_SUPP_FEATURES; + + OSMO_ASSERT((ptr - attr_buf) <= sizeof(attr_buf)); + abis_nm_get_attr(trx->bts, NM_OC_RADIO_CARRIER, 0, trx->nr, 0xff, + &attr_buf[0], (ptr - attr_buf)); + trx->mo.get_attr_sent = true; + } + + /* OS#6172: old osmo-bts versions do NACK Get Attributes for Radio Carrier, + * so we do not check if trx->mo.get_attr_rep_received is set here. */ if (!trx->mo.set_attr_sent && !trx->mo.set_attr_ack_received) { trx->mo.set_attr_sent = true; msgb = nanobts_gen_set_radio_attr(trx->bts, trx); @@ -151,6 +169,11 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_GET_ATTR_REP: + trx->mo.get_attr_rep_received = true; + trx->mo.get_attr_sent = false; + configure_loop(trx, &trx->mo.nm_state, false); + return; case NM_EV_SET_ATTR_ACK: trx->mo.set_attr_ack_received = true; trx->mo.set_attr_sent = false; @@ -201,6 +224,11 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_GET_ATTR_REP: + trx->mo.get_attr_rep_received = true; + trx->mo.get_attr_sent = false; + configure_loop(trx, &trx->mo.nm_state, true); + return; case NM_EV_SET_ATTR_ACK: trx->mo.set_attr_ack_received = true; trx->mo.set_attr_sent = false; @@ -349,6 +377,7 @@ [NM_RCARRIER_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = X(NM_EV_STATE_CHG_REP) | + X(NM_EV_GET_ATTR_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), .out_state_mask = @@ -362,6 +391,7 @@ [NM_RCARRIER_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_STATE_CHG_REP) | + X(NM_EV_GET_ATTR_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), .out_state_mask = -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34359?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If7b75689c12a253377f2747babd4d7ebd1db5f87 Gerrit-Change-Number: 34359 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email ) Change subject: abis_nm: send Get Attributes to GPRS Cell MO(s) ...................................................................... abis_nm: send Get Attributes to GPRS Cell MO(s) Change-Id: Ib6d87da49217f1c8d76445ce623a511a07daedbf Related: OS#4505 --- M src/osmo-bsc/nm_gprs_cell_fsm.c 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34360/1 diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c index 2f139a6..702e852 100644 --- a/src/osmo-bsc/nm_gprs_cell_fsm.c +++ b/src/osmo-bsc/nm_gprs_cell_fsm.c @@ -48,6 +48,8 @@ { struct gsm_gprs_cell *cell = (struct gsm_gprs_cell *)fi->priv; + cell->mo.get_attr_sent = false; + cell->mo.get_attr_rep_received = false; cell->mo.set_attr_sent = false; cell->mo.set_attr_ack_received = false; cell->mo.adm_unlock_sent = false; @@ -98,6 +100,22 @@ if (bts_setup_ramp_wait(bts)) return; + if (!cell->mo.get_attr_sent && !cell->mo.get_attr_rep_received) { + uint8_t attr_buf[2]; /* enlarge if needed */ + uint8_t *ptr = &attr_buf[0]; + + *(ptr++) = NM_ATT_SW_CONFIG; + if (is_ipa_abisip_bts(bts)) + *(ptr++) = NM_ATT_IPACC_SUPP_FEATURES; + + OSMO_ASSERT((ptr - attr_buf) <= sizeof(attr_buf)); + abis_nm_get_attr(bts, NM_OC_GPRS_CELL, 0, bts->nr, 0xff, + &attr_buf[0], (ptr - attr_buf)); + cell->mo.get_attr_sent = true; + } + + /* OS#6172: old osmo-bts versions do NACK Get Attributes for GPRS Cell, + * so we do not check if cell->mo.get_attr_rep_received is set here. */ if (!cell->mo.set_attr_sent && !cell->mo.set_attr_ack_received) { cell->mo.set_attr_sent = true; msgb = nanobts_gen_set_cell_attr(bts); @@ -145,6 +163,11 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_GET_ATTR_REP: + cell->mo.get_attr_rep_received = true; + cell->mo.get_attr_sent = false; + configure_loop(cell, &cell->mo.nm_state, false); + return; case NM_EV_SET_ATTR_ACK: cell->mo.set_attr_ack_received = true; cell->mo.set_attr_sent = false; @@ -196,6 +219,11 @@ const struct gsm_nm_state *new_state; switch (event) { + case NM_EV_GET_ATTR_REP: + cell->mo.get_attr_rep_received = true; + cell->mo.get_attr_sent = false; + configure_loop(cell, &cell->mo.nm_state, true); + return; case NM_EV_SET_ATTR_ACK: cell->mo.set_attr_ack_received = true; cell->mo.set_attr_sent = false; @@ -326,6 +354,7 @@ [NM_GPRS_CELL_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = X(NM_EV_STATE_CHG_REP) | + X(NM_EV_GET_ATTR_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), .out_state_mask = @@ -339,6 +368,7 @@ [NM_GPRS_CELL_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_STATE_CHG_REP) | + X(NM_EV_GET_ATTR_REP) | X(NM_EV_SET_ATTR_ACK) | X(NM_EV_SETUP_RAMP_READY), .out_state_mask = -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib6d87da49217f1c8d76445ce623a511a07daedbf Gerrit-Change-Number: 34360 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: abis_nm: separate parsing of osmo-bts features into a function

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34322?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Code-Review+2 by laforge, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: abis_nm: separate parsing of osmo-bts features into a function ...................................................................... abis_nm: separate parsing of osmo-bts features into a function This commit prepares for adding handling of additional attributes. The parse_attr_resp_info_attr() is already quite complex, so take a chance to simplify it a bit. Change-Id: Ia5919a8311cd6a7fc16d02d2196276881e96f4c5 Related: OS#4505 --- M src/osmo-bsc/abis_nm.c 1 file changed, 62 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/34322/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34322?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia5919a8311cd6a7fc16d02d2196276881e96f4c5 Gerrit-Change-Number: 34322 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: abis_nm: parse feature flags in NM_ATT_IPACC_SUPP_FEATURES

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34323?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: abis_nm: parse feature flags in NM_ATT_IPACC_SUPP_FEATURES ...................................................................... abis_nm: parse feature flags in NM_ATT_IPACC_SUPP_FEATURES Since change [1], among with the other attributes we started requesting NM_ATT_IPACC_SUPP_FEATURES from the BTS. This patch adds the logic for parsing the response (so far only printing supported features). Change-Id: I64cffa0bdead3617cc169c83b0f6ddf74f0866a7 Related: [1] 43440e1fc5758c52e80a0d182afa7c9d16b21426 Depends: libosmocore.git Ia4208e10d61843dd6ae77398f6624c918dc81ea4 Related: OS#4505 --- M include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 3 files changed, 97 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/34323/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34323?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I64cffa0bdead3617cc169c83b0f6ddf74f0866a7 Gerrit-Change-Number: 34323 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: bts_siemens_bs11: remove ip.access nanoBTS specific code

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34321?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin Change subject: bts_siemens_bs11: remove ip.access nanoBTS specific code ...................................................................... bts_siemens_bs11: remove ip.access nanoBTS specific code This code is unreachable, because this file is all about Siemens BS11. Take a chance to remove redundant BTS type check in nm_reconfig_bts(). Change-Id: I2db92fe448b1f4cd25c1e5c6e1bb9593795c9cb2 Related: OS#4505 --- M src/osmo-bsc/bts_siemens_bs11.c 1 file changed, 41 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/34321/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34321?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2db92fe448b1f4cd25c1e5c6e1bb9593795c9cb2 Gerrit-Change-Number: 34321 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in libosmo-sccp[master]: Allow configuring per-ASP SCTP INIT parameters

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34353?usp=email ) Change subject: Allow configuring per-ASP SCTP INIT parameters ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34353?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I4c104f0313b549efab7fae2e81a163474e9bcd4b Gerrit-Change-Number: 34353 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Sep 2023 08:54:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023