summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2012-07-02 17:12:08 +0200
committerHarald Welte <laforge@gnumonks.org>2012-07-13 14:24:27 +0200
commit348c9632042b1863f77e283d65fd7977c7cdb261 (patch)
tree0f26d37a412b507f9f33b741635d26e5c9fa5cdf
parent41239d5c227a41016af7107e30aa415b18e35600 (diff)
pre-fix measurement reports with subscriber identity
... otherwise it's impossible to distinguish them from each other.
-rw-r--r--openbsc/src/libbsc/abis_rsl.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index a38ab21..291c774 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -918,11 +918,15 @@ static void print_meas_rep_uni(struct gsm_meas_rep_unidir *mru,
prefix, mru->full.rx_qual, prefix, mru->sub.rx_qual);
}
-static void print_meas_rep(struct gsm_meas_rep *mr)
+static void print_meas_rep(struct gsm_lchan *lchan, struct gsm_meas_rep *mr)
{
int i;
+ char *name = "";
- DEBUGP(DMEAS, "MEASUREMENT RESULT NR=%d ", mr->nr);
+ if (lchan && lchan->conn && lchan->conn->subscr)
+ name = subscr_name(lchan->conn->subscr);
+
+ DEBUGP(DMEAS, "[%s] MEASUREMENT RESULT NR=%d ", name, mr->nr);
if (mr->flags & MEAS_REP_F_DL_DTX)
DEBUGPC(DMEAS, "DTXd ");
@@ -1027,7 +1031,7 @@ static int rsl_rx_meas_res(struct msgb *msg)
return rc;
}
- print_meas_rep(mr);
+ print_meas_rep(msg->lchan, mr);
send_lchan_signal(S_LCHAN_MEAS_REP, msg->lchan, mr);