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

[M] Change in osmo-bsc[master]: gsm_data: refactor/simplify and expose gsm_objclass2mo()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34420?usp=email ) Change subject: gsm_data: refactor/simplify and expose gsm_objclass2mo() ...................................................................... gsm_data: refactor/simplify and expose gsm_objclass2mo() Change-Id: Ic03fdfabf84a1b5cd8046101c1575296914c6332 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_data.c 2 files changed, 29 insertions(+), 47 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7f79162..fa9213b 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -890,6 +890,8 @@ void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts, uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3); +struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst); struct gsm_nm_state * gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, const struct abis_om_obj_inst *obj_inst); diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 9a32e07..580fa84 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -327,85 +327,56 @@ } /* obtain the MO structure for a given object instance */ -static inline struct gsm_abis_mo * -gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) +struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, + const struct abis_om_obj_inst *obj_inst) { struct gsm_bts_trx *trx; - struct gsm_abis_mo *mo = NULL; switch (obj_class) { case NM_OC_BTS: - mo = &bts->mo; - break; + return &bts->mo; 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); - mo = &trx->mo; - break; + return trx != NULL ? &trx->mo : NULL; 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); - mo = &trx->bb_transc.mo; - break; + return trx != NULL ? &trx->bb_transc.mo : NULL; 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; - mo = &trx->ts[obj_inst->ts_nr].mo; - break; + trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); + return trx != NULL ? &trx->ts[obj_inst->ts_nr].mo : NULL; case NM_OC_SITE_MANAGER: - mo = &bts->site_mgr->mo; - break; + return &bts->site_mgr->mo; case NM_OC_BS11: switch (obj_inst->bts_nr) { case BS11_OBJ_CCLK: - mo = &bts->bs11.cclk.mo; - break; + return &bts->bs11.cclk.mo; case BS11_OBJ_BBSIG: - if (obj_inst->ts_nr > bts->num_trx) - return NULL; trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->bs11.bbsig.mo; - break; + return trx != NULL ? &trx->bs11.bbsig.mo : NULL; case BS11_OBJ_PA: - if (obj_inst->ts_nr > bts->num_trx) - return NULL; trx = gsm_bts_trx_num(bts, obj_inst->trx_nr); - mo = &trx->bs11.pa.mo; - break; - default: - return NULL; + return trx != NULL ? &trx->bs11.pa.mo : NULL; } break; case NM_OC_BS11_RACK: - mo = &bts->bs11.rack.mo; - break; + return &bts->bs11.rack.mo; case NM_OC_BS11_ENVABTSE: if (obj_inst->trx_nr >= ARRAY_SIZE(bts->bs11.envabtse)) return NULL; - mo = &bts->bs11.envabtse[obj_inst->trx_nr].mo; - break; + return &bts->bs11.envabtse[obj_inst->trx_nr].mo; case NM_OC_GPRS_NSE: - mo = &bts->site_mgr->gprs.nse.mo; - break; + return &bts->site_mgr->gprs.nse.mo; case NM_OC_GPRS_CELL: - mo = &bts->gprs.cell.mo; - break; + return &bts->gprs.cell.mo; case NM_OC_GPRS_NSVC: if (obj_inst->trx_nr >= ARRAY_SIZE(bts->site_mgr->gprs.nsvc)) return NULL; - mo = &bts->site_mgr->gprs.nsvc[obj_inst->trx_nr].mo; - break; + return &bts->site_mgr->gprs.nsvc[obj_inst->trx_nr].mo; } - return mo; + + return NULL; } /* obtain the gsm_nm_state data structure for a given object instance */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34420?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: Ic03fdfabf84a1b5cd8046101c1575296914c6332 Gerrit-Change-Number: 34420 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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, 9 months

1
0
0 0

[S] Change in libosmocore[master]: gsm_12_21.h: fix values for NM_IPAC_F_GPRS_CODING_MCS[1-9]

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34427?usp=email ) Change subject: gsm_12_21.h: fix values for NM_IPAC_F_GPRS_CODING_MCS[1-9] ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: well, it is probably simply a question of endianness of the underlying CPU, right? It's a 16 bit value, and you can either do htons/ntohs on it and use #defines in one order, or not do any htons/ntohs + assume running on little-endian and have the #define the other way? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34427?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I85316af9b57e8113077305798cb2d82a24e48e00 Gerrit-Change-Number: 34427 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:29:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

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

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34356?usp=email ) Change subject: oml: ipacc: parse Object Version from SW Activated Report ...................................................................... Patch Set 3: Code-Review+2 -- 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: 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:26:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: gsm_data: refactor/simplify and expose gsm_objclass2mo()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34420?usp=email ) Change subject: gsm_data: refactor/simplify and expose gsm_objclass2mo() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34420?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: Ic03fdfabf84a1b5cd8046101c1575296914c6332 Gerrit-Change-Number: 34420 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:26:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34421?usp=email ) Change subject: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34421?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: Ic6c0dfe950459d07a8f506b5007a65fea1950c18 Gerrit-Change-Number: 34421 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:25:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: test SDP forwarding via MNCC

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email ) Change subject: sip: test SDP forwarding via MNCC ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2ae8449e673f5027f01d428d3718c006f76d93e Gerrit-Change-Number: 34417 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:25:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email ) Change subject: sip: tweak failure reporting for SIP messages ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File sip/SIP_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/cbd7d03c_8cd1… PS1, Line 195: og("FAIL: expected SIP message ", sip_expect); : setverdict(fail, "Received unexpected SIP message"); > see log2str() in code. Yeah, "f_shutdown(__FILE__, __LINE__, fail, log2str(...))" is the usual construct. If logging ahead of setverdict is useful for some reason, then we might also shift that into the f_shutdown() helper function to avoid duplicate statements like here. Not a blocker herer, but might warrant some general cleanup -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:24:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by pespin

Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email ) Change subject: sip: tweak failure reporting for SIP messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:10:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

by pespin

Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email ) Change subject: sip: tweak failure reporting for SIP messages ...................................................................... Patch Set 2: (1 comment) File sip/SIP_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/57cb8df1_7df1… PS1, Line 195: og("FAIL: expected SIP message ", sip_expect); : setverdict(fail, "Received unexpected SIP message"); > IIRC the reason why i got into the behavior to log separately is that message dumps in verdicts aren […] see log2str() in code. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id48016657ebb83953fe74f65332f318edf8f75e6 Gerrit-Change-Number: 34415 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:10:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-msc[master]: make two functions static

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34435?usp=email ) Change subject: make two functions static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1de0f35f1606c997777f34bbf4033e069aadbc64 Gerrit-Change-Number: 34435 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 08:08:47 +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