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@sysmocom.de> Gerrit-MessageType: newchange