pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29718 ) Change subject: bts_rcv_imm_ass_cnf(): Improve logging ...................................................................... bts_rcv_imm_ass_cnf(): Improve logging Related: OS#5700 Change-Id: I29a290d1e8b6e237a74ac8fab8dd5e5e5db71796 --- M src/bts.cpp 1 file changed, 10 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index 646dc76..f77c5a2 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -666,7 +666,7 @@ int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t fn) { - struct gprs_rlcmac_dl_tbf *dl_tbf = NULL; + struct gprs_rlcmac_dl_tbf *dl_tbf; const struct gsm48_imm_ass *imm_ass = (struct gsm48_imm_ass *)data; uint8_t plen; uint32_t tlli; @@ -681,9 +681,9 @@ data += 1 + plen; if ((*data & 0xf0) != 0xd0) { - LOGP(DRLCMAC, LOGL_ERROR, "Got IMM.ASS confirm, but rest " + LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but rest " "octets do not start with bit sequence 'HH01' " - "(Packet Downlink Assignment)\n"); + "(Packet Downlink Assignment)\n", fn); return -EINVAL; } @@ -695,15 +695,17 @@ tlli |= (*data++) >> 4; ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); - if (ms) - dl_tbf = ms_dl_tbf(ms); + if (!ms) { + LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", fn, tlli); + return -EINVAL; + } + dl_tbf = ms_dl_tbf(ms); if (!dl_tbf) { - LOGP(DRLCMAC, LOGL_ERROR, "Got IMM.ASS confirm, but TLLI=%08x " - "does not exit\n", tlli); + LOGPMS(ms, DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but MS has no DL TBF!\n", fn); return -EINVAL; } - LOGP(DRLCMAC, LOGL_DEBUG, "Got IMM.ASS confirm for TLLI=%08x\n", tlli); + LOGPTBFDL(dl_tbf, LOGL_DEBUG, "FN=%u Got IMM.ASS confirm\n", fn); osmo_fsm_inst_dispatch(dl_tbf->state_fsm.fi, TBF_EV_ASSIGN_PCUIF_CNF, NULL); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I29a290d1e8b6e237a74ac8fab8dd5e5e5db71796 Gerrit-Change-Number: 29718 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged