[MERGED] osmo-bts[master]: error log: two minor clarifications

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Jun 17 15:50:48 UTC 2016


Harald Welte has submitted this change and it was merged.

Change subject: error log: two minor clarifications
......................................................................


error log: two minor clarifications

Change-Id: I95e4331f51f650d5077eb3a8f897f754d5d2b779
---
M src/common/pcu_sock.c
M src/common/rsl.c
2 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index cfffb2e..d52cdb1 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -556,8 +556,10 @@
 	lchan = trx->ts[act_req->ts_nr].lchan;
 	lchan->rel_act_kind = LCHAN_REL_ACT_PCU;
 	if (lchan->type != GSM_LCHAN_PDTCH) {
-		LOGP(DPCU, LOGL_ERROR, "Lchan is not of type PDCH, but %d.\n",
-			lchan->type);
+		LOGP(DPCU, LOGL_ERROR,
+		     "%s request, but lchan is not of type PDTCH (is %s)\n",
+		     (act_req->activate) ? "Activate" : "Deactivate",
+		     gsm_lchant_name(lchan->type));
 		return -EINVAL;
 	}
 	if (act_req->activate)
diff --git a/src/common/rsl.c b/src/common/rsl.c
index adf17f6..224a41a 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -755,7 +755,7 @@
 
 	if (lchan->state != LCHAN_S_NONE) {
 		LOGP(DRSL, LOGL_ERROR,
-		     "%s: error lchan is not available state: %s.\n",
+		     "%s: error: lchan is not available, but in state: %s.\n",
 		     gsm_lchan_name(lchan), gsm_lchans_name(lchan->state));
 		return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL);
 	}

-- 
To view, visit https://gerrit.osmocom.org/312
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I95e4331f51f650d5077eb3a8f897f754d5d2b779
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list