neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/27901 )
Change subject: emerg call: tweak log, comments
......................................................................
emerg call: tweak log, comments
Change-Id: I01e457ae6a9a951a2525c2159cb5979a0cb8bd95
---
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/gsm_04_08_rr.c
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index 94b6349..c50cfeb 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -1960,7 +1960,7 @@
if (rqd->reason == GSM_CHREQ_REASON_EMERG) {
if (bts->si_common.rach_control.t2 & 0x4) {
LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD: MS attempts
EMERGENCY CALL although EMERGENCY CALLS "
- "are not allowed in sysinfo (spec violation by
MS!)\n");
+ "are not allowed in sysinfo (cfg: network / bts
/ rach emergency call allowed 0)\n");
rsl_tx_imm_ass_rej(bts, &rqd->ref);
talloc_free(rqd);
return 0;
@@ -2067,7 +2067,7 @@
lchan_release(release_lchan, !!(release_lchan->conn),
true, GSM48_RR_CAUSE_PREMPTIVE_REL,
gscon_last_eutran_plmn(release_lchan->conn));
} else {
- /* BTS is shutting down, give up... */
+ /* if BTS has shut down, give up... */
if (rqd->release_lchan->ts->fi->state == TS_ST_NOT_INITIALIZED)
return false;
diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c
index d1d61d6..02bb996 100644
--- a/src/osmo-bsc/gsm_04_08_rr.c
+++ b/src/osmo-bsc/gsm_04_08_rr.c
@@ -1061,14 +1061,15 @@
if (msg_type == GSM48_MT_CC_EMERG_SETUP) {
if (msg->lchan->ts->trx->bts->si_common.rach_control.t2
& 0x4) {
LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts
EMERGENCY SETUP although EMERGENCY CALLS"
- " are not allowed in sysinfo (spec
violation by MS!)\n");
+ " are not allowed in sysinfo (cfg:
network / bts / rach emergency call allowed 0)\n");
lchan_release(msg->lchan, true, true,
GSM48_RR_CAUSE_PREMPTIVE_REL,
gscon_last_eutran_plmn(msg->lchan->conn));
break;
}
if (!conn->sccp.msc->allow_emerg) {
LOG_LCHAN(msg->lchan, LOGL_NOTICE, "MS attempts
EMERGENCY SETUP, but EMERGENCY CALLS are"
- " denied on this BSC (check BTS
config!)\n");
+ " denied on MSC %d (cfg: msc %d /
allow-emergency deny)\n",
+ conn->sccp.msc->nr,
conn->sccp.msc->nr);
lchan_release(msg->lchan, true, true,
GSM48_RR_CAUSE_PREMPTIVE_REL,
gscon_last_eutran_plmn(msg->lchan->conn));
break;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27901
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I01e457ae6a9a951a2525c2159cb5979a0cb8bd95
Gerrit-Change-Number: 27901
Gerrit-PatchSet: 3
Gerrit-Owner: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
