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

[M] Change in osmo-bts[master]: gsm_objclass2mo(): Change signature so we can obtain a nack cause in ...
by arehbein 26 Mar '23

26 Mar '23

Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/32075 to look at the new patch set (#3). Change subject: gsm_objclass2mo(): Change signature so we can obtain a nack cause in case of error ...................................................................... gsm_objclass2mo(): Change signature so we can obtain a nack cause in case of error Depends on change (osmo-bts): Ia538e3f3d416408f69f9d8e6c8c746eddd9f005a Change dependency can be removed if we adapt the function signature of the function removed by it; however that seems like unnecessary work for no good reason. Related: OS#5961 Related: OS#5967 Change-Id: I37e6b23ed95260a8188910cf9754faffcba519c5 --- M include/osmo-bts/oml.h M src/common/oml.c 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 9 files changed, 63 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/32075/3 -- 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: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bts[master]: gsm_objclass2mo(): Change signature so we can obtain a nack cause in ...
by arehbein 26 Mar '23

26 Mar '23

arehbein has uploaded a new patch set (#2). ( 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 ...................................................................... gsm_objclass2mo(): Change signature so we can obtain a nack cause in case of error Depends on change (osmo-bts): Ia538e3f3d416408f69f9d8e6c8c746eddd9f005a Change dependency can be removed if we adapt the function signature of the function removed by it; however that seems like unnecessary work for no good reason. Related: OS#5961 Related: OS#5967 Change-Id: I37e6b23ed95260a8188910cf9754faffcba519c5 --- M include/osmo-bts/oml.h M src/common/oml.c 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 9 files changed, 55 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/32075/2 -- 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: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[L] Change in libosmocore[master]: tests/conv: separate test logic
by arehbein 26 Mar '23

26 Mar '23

Attention is currently required from: fixeria. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/1627 ) Change subject: tests/conv: separate test logic ...................................................................... Patch Set 4: (1 comment) File tests/conv/conv.c: https://gerrit.osmocom.org/c/libosmocore/+/1627/comment/99699c9d_53b31686 PS4, Line 42: return -1; > Yeah, it's tests. I would not be spending time fixing this. Would it be possible to separate test code in Coverity from 'regular' code? I'd say that would make the Coverity issue list more useful -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/1627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idbdc7e19cb9b9a36cd1fccd621cd858e87530d98 Gerrit-Change-Number: 1627 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 26 Mar 2023 22:07:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: common: Remove unused function gsm_objclass2nmstate()
by arehbein 26 Mar '23

26 Mar '23

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32074 ) Change subject: common: Remove unused function gsm_objclass2nmstate() ...................................................................... common: Remove unused function gsm_objclass2nmstate() Change-Id: Ia538e3f3d416408f69f9d8e6c8c746eddd9f005a --- M src/common/oml.c 1 file changed, 9 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/32074/1 diff --git a/src/common/oml.c b/src/common/oml.c index ff3d0e9..61635ec 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1660,20 +1660,6 @@ return mo; } -/* obtain the gsm_nm_state data structure for a given object instance */ -struct gsm_nm_state * -gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) -{ - struct gsm_abis_mo *mo; - - mo = gsm_objclass2mo(bts, obj_class, obj_inst); - if (!mo) - return NULL; - - return &mo->nm_state; -} - /* obtain the in-memory data structure of a given object instance */ void * gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia538e3f3d416408f69f9d8e6c8c746eddd9f005a Gerrit-Change-Number: 32074 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: gsm_objclass2mo(): First check if TRX number is valid
by arehbein 26 Mar '23

26 Mar '23

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32073 ) Change subject: gsm_objclass2mo(): First check if TRX number is valid ...................................................................... gsm_objclass2mo(): First check if TRX number is valid This is the first step in fixing the error handling w.r.t. NACK messages. The next step will be to have the function to receive an additional out-parameter that contains the cause of error if this function fails. Related: OS#5961 Related: OS#5967 Change-Id: I9f21f1a0a9dab897d4fd89ab6b7341ca4aec8b22 --- M src/common/oml.c 1 file changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/32073/1 diff --git a/src/common/oml.c b/src/common/oml.c index 724e4f8..ff3d0e9 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1614,30 +1614,30 @@ { struct gsm_bts_trx *trx; struct gsm_abis_mo *mo = NULL; - + /* Handle finding TRX number first */ + switch (obj_class) { + case NM_OC_RADIO_CARRIER: + case NM_OC_BASEB_TRANSC: + case NM_OC_CHANNEL: + case NM_OC_GPRS_NSVC: + if (obj_inst->trx_nr >= bts->num_trx) + return NULL; + if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) + return NULL; + break; + } + /* Other cases, set mo */ switch (obj_class) { case NM_OC_BTS: mo = &bts->mo; 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); mo = &trx->mo; 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); mo = &trx->bb_transc.mo; 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; mo = &trx->ts[obj_inst->ts_nr].mo; -- 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: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: gsm_objclass2mo(): Change signature so we can obtain a nack cause in ...
by arehbein 26 Mar '23

26 Mar '23

arehbein has uploaded this change for review. ( 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 ...................................................................... gsm_objclass2mo(): Change signature so we can obtain a nack cause in case of error Depends on change (osmo-bts): Ia538e3f3d416408f69f9d8e6c8c746eddd9f005a Change dependency can be removed if we adapt the function signature of the function removed by it; however that seems like unnecessary work for no good reason. Related: OS#5961 Related: OS#5967 Change-Id: I37e6b23ed95260a8188910cf9754faffcba519c5 --- M include/osmo-bts/oml.h M src/common/oml.c M src/osmo-bts-lc15/oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 6 files changed, 49 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/32075/1 diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h index 90c9077..5ba3281 100644 --- a/include/osmo-bts/oml.h +++ b/include/osmo-bts/oml.h @@ -76,8 +76,9 @@ 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_abis_mo * +gsm_objclass2mo(enum abis_nm_nack_cause *c, 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/common/oml.c b/src/common/oml.c index 61635ec..06b2b15 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -507,6 +507,7 @@ const struct gsm_abis_mo *mo; struct tlv_parsed tp; int rc; + enum abis_nm_nack_cause c; if (!foh || !bts) return -EINVAL; @@ -514,7 +515,7 @@ DEBUGPFOH(DOML, foh, "Rx GET ATTR\n"); /* Determine which OML object is addressed */ - mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); if (!mo) { LOGPFOH(DOML, LOGL_ERROR, foh, "Get Attributes for unknown Object Instance\n"); return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN); @@ -1013,14 +1014,16 @@ struct abis_om_fom_hdr *foh = msgb_l3(msg); struct gsm_abis_mo *mo; void *obj; + enum abis_nm_nack_cause c; + DEBUGPFOH(DOML, foh, "Rx OPSTART\n"); /* Step 1: Resolve MO by obj_class/obj_inst */ - mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst); if (!mo || !obj) - return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN); + return oml_fom_ack_nack(msg, c); /* Step 2: Do some global dependency/consistency checking */ if (mo->nm_state.operational == NM_OPSTATE_ENABLED) { @@ -1040,6 +1043,7 @@ uint8_t adm_state; void *obj; int rc; + enum abis_nm_nack_cause c; DEBUGPFOH(DOML, foh, "Rx CHG ADM STATE\n"); @@ -1057,10 +1061,10 @@ adm_state = *TLVP_VAL(&tp, NM_ATT_ADM_STATE); /* Step 1: Resolve MO by obj_class/obj_inst */ - mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst); if (!mo || !obj) - return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN); + return oml_fom_ack_nack(msg, c); /* Step 2: Do some global dependency/consistency checking */ if (mo->nm_state.administrative == adm_state) { @@ -1374,24 +1378,25 @@ struct tlv_parsed tp, *tp_merged; void *obj; int rc; + enum abis_nm_nack_cause c; DEBUGPFOH(DOML, foh, "Rx IPA SET ATTR\n"); rc = oml_tlv_parse(&tp, foh->data, msgb_l3len(msg) - sizeof(*foh)); if (rc < 0) { - mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); if (!mo) - return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN); + return oml_fom_ack_nack(msg, c); oml_tx_failure_event_rep(mo, NM_SEVER_MAJOR, OSMO_EVT_MAJ_UNSUP_ATTR, "New value for IPAC Set Attribute not supported\n"); return oml_fom_ack_nack(msg, NM_NACK_INCORR_STRUCT); } /* Resolve MO by obj_class/obj_inst */ - mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst); if (!mo || !obj) - return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN); + return oml_fom_ack_nack(msg, c); rc = oml_ipa_mo_set_attr(bts, mo, obj, &tp); if (rc == 0) { @@ -1607,10 +1612,12 @@ mo->nm_state.administrative = NM_STATE_LOCKED; } -/* obtain the MO structure for a given object instance */ +/* Obtain the MO structure for a given object instance + * \param[out] c nack cause for reply in case of error + */ struct gsm_abis_mo * -gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, - const struct abis_om_obj_inst *obj_inst) +gsm_objclass2mo(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; struct gsm_abis_mo *mo = NULL; @@ -1621,8 +1628,10 @@ case NM_OC_CHANNEL: case NM_OC_GPRS_NSVC: if (obj_inst->trx_nr >= bts->num_trx) + *c = NM_NACK_OBJINST_UNKN; return NULL; if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) + *c = NM_NACK_OBJINST_UNKN; return NULL; break; } @@ -1639,6 +1648,7 @@ break; case NM_OC_CHANNEL: if (obj_inst->ts_nr >= TRX_NR_TS) + *c = NM_NACK_OBJINST_UNKN; return NULL; mo = &trx->ts[obj_inst->ts_nr].mo; break; @@ -1653,6 +1663,7 @@ break; case NM_OC_GPRS_NSVC: if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) + *c = NM_NACK_OBJINST_UNKN; return NULL; mo = &bts->gprs.nsvc[obj_inst->trx_nr].mo; break; diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 675e3fe..aea9903 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1831,7 +1831,8 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + enum abis_nm_nack_cause c; + struct gsm_abis_mo *mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); struct nm_fsm_ev_setattr_data ev_data = { .msg = msg, .cause = 0, diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 46fa84b..767272e 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -97,7 +97,8 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + enum abis_nm_nack_cause c; + struct gsm_abis_mo *mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); struct nm_fsm_ev_setattr_data ev_data = { .msg = msg, .cause = 0, diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 2ed1868..d23442a 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -552,7 +552,8 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + enum abis_nm_nack_cause c; + struct gsm_abis_mo *mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); struct nm_fsm_ev_setattr_data ev_data = { .msg = msg, .cause = 0, diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index 64e2f8d..440ddb7 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -132,7 +132,8 @@ struct tlv_parsed *new_attr, int kind, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); - struct gsm_abis_mo *mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + enum abis_nm_nack_cause c; + struct gsm_abis_mo *mo = gsm_objclass2mo(&c, bts, foh->obj_class, &foh->obj_inst); struct nm_fsm_ev_setattr_data ev_data = { .msg = msg, .cause = 0, -- 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: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: common: Fix nack message cause
by arehbein 26 Mar '23

26 Mar '23

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32076 ) Change subject: common: Fix nack message cause ...................................................................... common: Fix nack message cause Give more specific causes than NM_NACK_OBJINST_UNKN Related: OS#5961 Related: OS#5967 Change-Id: I1ad47e2ba362e2ce676757310df8cc70641343a7 --- M src/common/oml.c 1 file changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/32076/1 diff --git a/src/common/oml.c b/src/common/oml.c index 06b2b15..1212c9c 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1627,12 +1627,14 @@ case NM_OC_BASEB_TRANSC: case NM_OC_CHANNEL: case NM_OC_GPRS_NSVC: - if (obj_inst->trx_nr >= bts->num_trx) - *c = NM_NACK_OBJINST_UNKN; + if (obj_inst->trx_nr >= bts->num_trx) { + *c = NM_NACK_PARAM_RANGE; return NULL; - if (!(trx = gsm_bts_trx_num(bts, obj_inst->trx_nr))) - *c = 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 */ @@ -1648,8 +1650,7 @@ break; case NM_OC_CHANNEL: if (obj_inst->ts_nr >= TRX_NR_TS) - *c = NM_NACK_OBJINST_UNKN; - return NULL; + goto objclass_invalid; mo = &trx->ts[obj_inst->ts_nr].mo; break; case NM_OC_SITE_MANAGER: @@ -1663,12 +1664,15 @@ break; case NM_OC_GPRS_NSVC: if (obj_inst->trx_nr >= ARRAY_SIZE(bts->gprs.nsvc)) - *c = NM_NACK_OBJINST_UNKN; - return NULL; + goto objclass_invalid; mo = &bts->gprs.nsvc[obj_inst->trx_nr].mo; break; } return mo; + +objclass_invalid: + *c = NM_NACK_OBJCLASS_INVAL; + return NULL; } /* obtain the in-memory data structure of a given object instance */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ad47e2ba362e2ce676757310df8cc70641343a7 Gerrit-Change-Number: 32076 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: fix pcu_rx(): actually discard malformed container message
by fixeria 26 Mar '23

26 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32072 ) Change subject: fix pcu_rx(): actually discard malformed container message ...................................................................... fix pcu_rx(): actually discard malformed container message Currently we do log an error, but then still call pcu_rx_container(), passing it a malformed message. The function does have an additional length check inside, but let's better discard it early. Change-Id: I8410ecf35442ab75741a5c9cd29d640ce5508e57 Related: OS#5963 --- M src/pcu_l1_if.cpp 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/72/32072/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index bbeb3aa..577ba57 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -1285,6 +1285,8 @@ if (pcu_prim_length < exp_len) { LOGP(DL1IF, LOGL_ERROR, "Received %zu bytes on PCU Socket, but primitive container size" \ "is %zu, discarding\n", pcu_prim_length, exp_len); + rc = -EINVAL; + break; } rc = pcu_rx_container(bts, &pcu_prim->u.container); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8410ecf35442ab75741a5c9cd29d640ce5508e57 Gerrit-Change-Number: 32072 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-msc[master]: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G
by laforge 26 Mar '23

26 Mar '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32069 ) Change subject: 3G: decapsulate IuUP to AMR at the MGW; allow 3G<-AMR->2G ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/32069/comment/02aad75a_26066248 PS1, Line 9: plain AMR/RTP on the MSC's MGW hop. I presume by this you mean the "core" side connection of the msc-colocated MGW? I.e. what in a MO-to-MT call is the RTP between the two endpoints on the msc-colocated MGW - or in other words, the side that would get passed to an external SIP side if osmo-sip-connector is in use? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I386a6a426c318040b019ab5541689c67e94672a1 Gerrit-Change-Number: 32069 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 26 Mar 2023 20:37:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-msc[master]: fix msc_vlr_test_call SDP mncc_rtp
by laforge 26 Mar '23

26 Mar '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32068 ) Change subject: fix msc_vlr_test_call SDP mncc_rtp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia0b3253f85c716e45f925da3f58f025af1f15ec9 Gerrit-Change-Number: 32068 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 26 Mar 2023 20:34:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0