Harald Welte has submitted this change and it was merged.
Change subject: resurrect meas_feed.c: make it compile, add logging
......................................................................
resurrect meas_feed.c: make it compile, add logging
Change-Id: I34ac25bcc460e87e813090b6d7c5085cffa2d78f
---
M src/libbsc/Makefile.am
M src/libbsc/meas_feed.c
2 files changed, 34 insertions(+), 16 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am
index 8956363..744278b 100644
--- a/src/libbsc/Makefile.am
+++ b/src/libbsc/Makefile.am
@@ -64,5 +64,6 @@
penalty_timers.c \
handover_decision_2.c \
bsc_subscr_conn_fsm.c \
+ meas_feed.c \
$(NULL)
diff --git a/src/libbsc/meas_feed.c b/src/libbsc/meas_feed.c
index 1e7b4cd..2e80754 100644
--- a/src/libbsc/meas_feed.c
+++ b/src/libbsc/meas_feed.c
@@ -13,14 +13,12 @@
#include <osmocom/vty/command.h>
#include <osmocom/vty/vty.h>
-#include <openbsc/meas_rep.h>
-#include <openbsc/signal.h>
-#include <openbsc/gsm_subscriber.h>
-#include <openbsc/meas_feed.h>
-#include <openbsc/vty.h>
-#include <openbsc/vlr.h>
-
-#include "meas_feed.h"
+#include <osmocom/bsc/meas_rep.h>
+#include <osmocom/bsc/signal.h>
+#include <osmocom/bsc/bsc_subscriber.h>
+#include <osmocom/bsc/meas_feed.h>
+#include <osmocom/bsc/vty.h>
+#include <osmocom/bsc/debug.h>
struct meas_feed_state {
struct osmo_wqueue wqueue;
@@ -29,20 +27,25 @@
uint16_t dst_port;
};
-
-static struct meas_feed_state g_mfs;
+static struct meas_feed_state g_mfs = {};
static int process_meas_rep(struct gsm_meas_rep *mr)
{
struct msgb *msg;
struct meas_feed_meas *mfm;
- struct vlr_subscr *vsub;
+ struct bsc_subscr *bsub;
/* ignore measurements as long as we don't know who it is */
- if (!mr->lchan || !mr->lchan->conn || !mr->lchan->conn->vsub)
+ if (!mr->lchan) {
+ LOGP(DMEAS, LOGL_DEBUG, "meas_feed: no lchan, not sending
report\n");
return 0;
+ }
+ if (!mr->lchan->conn) {
+ LOGP(DMEAS, LOGL_DEBUG, "meas_feed: lchan without conn, not
sending report\n");
+ return 0;
+ }
- vsub = mr->lchan->conn->vsub;
+ bsub = mr->lchan->conn->bsub;
msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed");
if (!msg)
@@ -54,8 +57,16 @@
mfm->hdr.version = MEAS_FEED_VERSION;
/* fill in MEAS_FEED_MEAS specific header */
- osmo_strlcpy(mfm->imsi, vsub->imsi, sizeof(mfm->imsi));
- osmo_strlcpy(mfm->name, vsub->name, sizeof(mfm->name));
+ if (bsub)
+ osmo_strlcpy(mfm->imsi, bsub->imsi, sizeof(mfm->imsi));
+ /* This used to be a human readable meaningful name set in the old
osmo-nitb's subscriber
+ * database. Now we're several layers away from that (and possibly
don't even have a name in
+ * osmo-hlr either), hence this is a legacy item now that we should
leave empty ... *but*:
+ * here in the BSC we often don't know the subscriber's full identity
information. For example,
+ * we might only know the TMSI, and hence would pass an empty IMSI
above. So after all, feed
+ * bsc_subscr_name(), which possibly will feed the IMSI again, but in
case only the TMSI is known
+ * would add that to the information set as "TMSI:0x12345678". */
+ osmo_strlcpy(mfm->name, bsc_subscr_name(bsub), sizeof(mfm->name));
osmo_strlcpy(mfm->scenario, g_mfs.scenario, sizeof(mfm->scenario));
/* copy the entire measurement report */
@@ -71,8 +82,13 @@
mfm->ss_nr = mr->lchan->nr;
/* and send it to the socket */
- if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0)
+ if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) {
+ LOGP(DMEAS, LOGL_ERROR, "meas_feed %s: sending measurement
report failed\n",
+ gsm_lchan_name(mr->lchan));
msgb_free(msg);
+ } else
+ LOGP(DMEAS, LOGL_DEBUG, "meas_feed %s: sent measurement
report\n",
+ gsm_lchan_name(mr->lchan));
return 0;
}
@@ -126,6 +142,7 @@
g_mfs.wqueue.write_cb = feed_write_cb;
g_mfs.wqueue.read_cb = feed_read_cb;
osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL);
+ LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal
callback\n");
}
if (already_initialized) {
--
To view, visit https://gerrit.osmocom.org/7994
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34ac25bcc460e87e813090b6d7c5085cffa2d78f
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
