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

[M] Change in osmo-pcu[master]: ms: Drop setting (egprs_)ms_class during bts_alloc_ms()

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32341 ) Change subject: ms: Drop setting (egprs_)ms_class during bts_alloc_ms() ...................................................................... Patch Set 2: (1 comment) File src/tbf_dl.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/32341/comment/c660d425_8084a440 PS2, Line 220: ms = bts_alloc_ms(bts); > is it not needed to set ms_class and egprs_ms_class here? Not really, because it is set below in lines 224-229. Beforehand they were passed here during allocation because well, something had to be passed. As a result, later on if the MS was allocated here (line 220), the conditions below rresolved as false and nothing was done. If the MS already existed, then the conditions below could resolve to true and be applied there. Now we simply apply them in lines 224-229 if needed and be done with it, much clearer. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I36f07dc389f7abe205fc4bcddbde93735f5d5cfc Gerrit-Change-Number: 32341 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Apr 2023 12:47:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: common: Fix NACK message for unknown TRX

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32355 ) Change subject: common: Fix NACK message for unknown TRX ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This can probably be merged/reworked into the other commits when you drop the movemement to have 2 switches instead of 1? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I12a1132079e66df7e8b59a212cd8ceecbdfc63e8 Gerrit-Change-Number: 32355 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Apr 2023 12:44:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: gsm_objclass2obj(): Change signature so we can obtain a nack cause in...

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32354 ) Change subject: gsm_objclass2obj(): Change signature so we can obtain a nack cause in case of error ...................................................................... Patch Set 1: Code-Review-1 (2 comments) File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/32354/comment/5ba12def_b468da27 PS1, Line 1799: gsm_objclass2obj(enum abis_nm_nack_cause *c, struct gsm_bts *bts, uint8_t obj_class, same here, this should be at the end and be able to pass NULL to it. https://gerrit.osmocom.org/c/osmo-bts/+/32354/comment/a9fc8d89_3b6d957a PS1, Line 1804: /* Handle finding TRX number first */ Same here, please don't move this into a new switch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If734ea2c8cae4c1f99b02520dffa4e3862a67745 Gerrit-Change-Number: 32354 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Apr 2023 12:43:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: gsm_objclass2mo(): First check if TRX number is valid

by pespin

Attention is currently required from: arehbein, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32073 ) Change subject: gsm_objclass2mo(): First check if TRX number is valid ...................................................................... Patch Set 4: Code-Review-1 (1 comment) Patchset: PS4: I would really drop this commit entirely, I think it's much clear having 1 switch instead of 2 as it is now, even if a few lines are repeated on each one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9f21f1a0a9dab897d4fd89ab6b7341ca4aec8b22 Gerrit-Change-Number: 32073 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Apr 2023 12:41:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: gsm_objclass2mo(): Change signature so we can obtain a nack cause in ...

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32075 ) Change subject: gsm_objclass2mo(): Change signature so we can obtain a nack cause in case of error ...................................................................... Patch Set 5: Code-Review-1 (1 comment) Patchset: PS5: My comment was not addressed yet. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I37e6b23ed95260a8188910cf9754faffcba519c5 Gerrit-Change-Number: 32075 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Apr 2023 12:39:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-bts[master]: common: Fix NACK message for unknown TRX

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32355 ) Change subject: common: Fix NACK message for unknown TRX ...................................................................... common: Fix NACK message for unknown TRX Set NACK cause to NM_NACK_TRXNR_UNKN (previous value was NM_NACK_OBJINST_UNKN) if TRX number is out of range/TRX cannot be found for the given number Related: OS#5967 Change-Id: I12a1132079e66df7e8b59a212cd8ceecbdfc63e8 --- M src/common/oml.c 1 file changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/55/32355/1 diff --git a/src/common/oml.c b/src/common/oml.c index 09ed6ea..c0d5b13 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1748,8 +1748,10 @@ case NM_OC_RADIO_CARRIER: case NM_OC_BASEB_TRANSC: case NM_OC_CHANNEL: - if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) - goto nm_nack_objinst_unkn; + if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) { + *c = NM_NACK_TRXNR_UNKN; + return NULL; + } break; } /* Other cases, set mo */ @@ -1806,8 +1808,10 @@ case NM_OC_RADIO_CARRIER: case NM_OC_BASEB_TRANSC: case NM_OC_CHANNEL: - if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) - goto nm_nack_objinst_unkn; + if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) { + *c = NM_NACK_TRXNR_UNKN; + return NULL; + } break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I12a1132079e66df7e8b59a212cd8ceecbdfc63e8 Gerrit-Change-Number: 32355 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[L] Change in osmo-pcu[master]: ms: Use osmo_use_count to track references

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32350 ) Change subject: ms: Use osmo_use_count to track references ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib65629224e6bd5683bb9192ba4354e965e8d39ec Gerrit-Change-Number: 32350 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Apr 2023 11:45:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[M] Change in osmo-bts[master]: gsm_objclass2obj(): Change signature so we can obtain a nack cause in...

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32354 ) Change subject: gsm_objclass2obj(): Change signature so we can obtain a nack cause in case of error ...................................................................... gsm_objclass2obj(): Change signature so we can obtain a nack cause in case of error Related: OS#5961 Related: OS#5967 Change-Id: If734ea2c8cae4c1f99b02520dffa4e3862a67745 --- M include/osmo-bts/oml.h M src/common/oml.c M src/osmo-bts-trx/trx_provision_fsm.c 3 files changed, 35 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/54/32354/1 diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h index 9c01010..2e7b949 100644 --- a/include/osmo-bts/oml.h +++ b/include/osmo-bts/oml.h @@ -83,7 +83,7 @@ struct gsm_nm_state *gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, const struct abis_om_obj_inst *obj_inst); -void *gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, +void *gsm_objclass2obj(enum abis_nm_nack_cause *c, struct gsm_bts *bts, uint8_t obj_class, const struct abis_om_obj_inst *obj_inst); #endif // _OML_H */ diff --git a/src/common/oml.c b/src/common/oml.c index af6b19d..09ed6ea 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1103,7 +1103,7 @@ /* Step 1: Resolve MO by obj_class/obj_inst */ mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); - obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst); + obj = gsm_objclass2obj(&c, bts, foh->obj_class, &foh->obj_inst); if (!mo || !obj) return oml_fom_ack_nack(msg, c); @@ -1149,7 +1149,7 @@ /* Step 1: Resolve MO by obj_class/obj_inst */ mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); - obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst); + obj = gsm_objclass2obj(&c, bts, foh->obj_class, &foh->obj_inst); if (!mo || !obj) return oml_fom_ack_nack(msg, c); @@ -1492,7 +1492,7 @@ /* Resolve MO by obj_class/obj_inst */ mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); - obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst); + obj = gsm_objclass2obj(&c, bts, foh->obj_class, &foh->obj_inst); if (!mo || !obj) return oml_fom_ack_nack(msg, c); @@ -1796,37 +1796,34 @@ /* obtain the in-memory data structure of a given object instance */ void * -gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, +gsm_objclass2obj(enum abis_nm_nack_cause *c, struct gsm_bts *bts, uint8_t obj_class, const struct abis_om_obj_inst *obj_inst) { struct gsm_bts_trx *trx; void *obj = NULL; + /* Handle finding TRX number first */ + switch (obj_class) { + case NM_OC_RADIO_CARRIER: + case NM_OC_BASEB_TRANSC: + case NM_OC_CHANNEL: + if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) + goto nm_nack_objinst_unkn; + break; + } switch (obj_class) { case NM_OC_BTS: obj = bts; break; case NM_OC_RADIO_CARRIER: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); obj = trx; break; case NM_OC_BASEB_TRANSC: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); obj = &trx->bb_transc; break; case NM_OC_CHANNEL: - if (obj_inst->trx_nr >= bts->num_trx) { - return NULL; - } - trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); if (obj_inst->ts_nr >= TRX_NR_TS) - return NULL; + goto nm_nack_objinst_unkn; obj = &trx->ts[obj_inst->ts_nr]; break; case NM_OC_SITE_MANAGER: @@ -1834,7 +1831,7 @@ break; case NM_OC_GPRS_NSE: if (obj_inst->bts_nr > 0) - return NULL; + goto nm_nack_objinst_unkn; obj = &g_bts_sm->gprs.nse; break; case NM_OC_GPRS_CELL: @@ -1842,11 +1839,15 @@ break; case NM_OC_GPRS_NSVC: if (obj_inst->bts_nr > 0) - return NULL; + goto nm_nack_objinst_unkn; if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) - return NULL; + goto nm_nack_objinst_unkn; obj = &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr]; break; } return obj; + +nm_nack_objinst_unkn: + *c = NM_NACK_OBJINST_UNKN; + return NULL; } diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 8b20b10..38ca18f 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -327,6 +327,7 @@ { struct nm_statechg_signal_data *nsd; struct gsm_bts_trx *trx; + enum abis_nm_nack_cause c; if (subsys != SS_GLOBAL) return -EINVAL; @@ -340,7 +341,7 @@ return 0; if (nsd->old_state != NM_OPSTATE_ENABLED && nsd->new_state == NM_OPSTATE_ENABLED) { - trx = gsm_objclass2obj(nsd->mo->bts, nsd->mo->obj_class, &nsd->mo->obj_inst); + trx = gsm_objclass2obj(&c, nsd->mo->bts, nsd->mo->obj_class, &nsd->mo->obj_inst); l1if_trx_start_power_ramp(trx, NULL); } return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If734ea2c8cae4c1f99b02520dffa4e3862a67745 Gerrit-Change-Number: 32354 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[M] Change in osmo-pcu[master]: Merge bts_alloc_ms() and ms_alloc()

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32349 ) Change subject: Merge bts_alloc_ms() and ms_alloc() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2a06d17588572a21dc5a14ddbde83766076b446d Gerrit-Change-Number: 32349 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Apr 2023 11:36:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in osmo-pcu[master]: ms: store in bts->ms_list during alloc/destroy of ms object

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32346 ) Change subject: ms: store in bts->ms_list during alloc/destroy of ms object ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id53f8dfb9963366dd4b19a324615bbc83c4f23e7 Gerrit-Change-Number: 32346 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Apr 2023 11:32:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023