fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32564 ) Change subject: oml: gsm_objclass2{mo,obj}(): set cause for unknown obj_class ...................................................................... oml: gsm_objclass2{mo,obj}(): set cause for unknown obj_class This patch makes BTS_Tests_OML.TC_wrong_obj_class pass. Change-Id: I30e109a7c86e651fb7055a80ef0656d8563475c8 Fixes: OS#5966 --- M src/common/oml.c 1 file changed, 22 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/common/oml.c b/src/common/oml.c index 9d9778e..361f59e 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1740,7 +1740,7 @@ { struct gsm_bts_trx *trx; - switch (obj_class) { + switch ((enum abis_nm_obj_class)obj_class) { case NM_OC_BTS: return &bts->mo; case NM_OC_RADIO_CARRIER: @@ -1771,8 +1771,11 @@ if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) goto nm_nack_objinst_unkn; return &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr].mo; + default: + if (c != NULL) + *c = NM_NACK_OBJCLASS_NOTSUPP; + return NULL; } - return NULL; nm_nack_trxnr_unkn: if (c != NULL) @@ -1792,7 +1795,7 @@ { struct gsm_bts_trx *trx; - switch (obj_class) { + switch ((enum abis_nm_obj_class)obj_class) { case NM_OC_BTS: return bts; case NM_OC_RADIO_CARRIER: @@ -1823,8 +1826,11 @@ if (obj_inst->trx_nr >= ARRAY_SIZE(g_bts_sm->gprs.nse.nsvc)) goto nm_nack_objinst_unkn; return &g_bts_sm->gprs.nse.nsvc[obj_inst->trx_nr]; + default: + if (c != NULL) + *c = NM_NACK_OBJCLASS_NOTSUPP; + return NULL; } - return NULL; nm_nack_trxnr_unkn: if (c != NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I30e109a7c86e651fb7055a80ef0656d8563475c8 Gerrit-Change-Number: 32564 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged