diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-02-03 02:42:47 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-03-09 18:34:14 +0100 |
| commit | de1346ebad0f3c2e221dc288fa533af06c461c96 (patch) | |
| tree | 7c026cb42942cee43a037dfa0b9e1c2166d92896 /openbsc/src/libmsc/meas_feed.c | |
| parent | 1952de1e6590684985cdc83ce2b5fa829332c0ee (diff) | |
Use libvlr in libmsc (large refactoring)
Original libvlr code is by Harald Welte <laforge@gnumonks.org>,
polished and tweaked by Neels Hofmeyr <nhofmeyr@sysmocom.de>.
This is a long series of development collapsed in one patch. The original
history may still be available as branch neels/vlr_orig.
TODO: This commit may be split in several smaller changes before merging to
master.
Related: OS#1592
Change-Id: I702ba504ce2de93507312c28eca8d11f09f4ee8b
Diffstat (limited to 'openbsc/src/libmsc/meas_feed.c')
| -rw-r--r-- | openbsc/src/libmsc/meas_feed.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openbsc/src/libmsc/meas_feed.c b/openbsc/src/libmsc/meas_feed.c index 3ddcdc39c..1e7b4cd51 100644 --- a/openbsc/src/libmsc/meas_feed.c +++ b/openbsc/src/libmsc/meas_feed.c @@ -18,6 +18,7 @@ #include <openbsc/gsm_subscriber.h> #include <openbsc/meas_feed.h> #include <openbsc/vty.h> +#include <openbsc/vlr.h> #include "meas_feed.h" @@ -35,13 +36,13 @@ static int process_meas_rep(struct gsm_meas_rep *mr) { struct msgb *msg; struct meas_feed_meas *mfm; - struct gsm_subscriber *subscr; + struct vlr_subscr *vsub; /* ignore measurements as long as we don't know who it is */ - if (!mr->lchan || !mr->lchan->conn || !mr->lchan->conn->subscr) + if (!mr->lchan || !mr->lchan->conn || !mr->lchan->conn->vsub) return 0; - subscr = mr->lchan->conn->subscr; + vsub = mr->lchan->conn->vsub; msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed"); if (!msg) @@ -53,8 +54,8 @@ static int process_meas_rep(struct gsm_meas_rep *mr) mfm->hdr.version = MEAS_FEED_VERSION; /* fill in MEAS_FEED_MEAS specific header */ - osmo_strlcpy(mfm->imsi, subscr->imsi, sizeof(mfm->imsi)); - osmo_strlcpy(mfm->name, subscr->name, sizeof(mfm->name)); + osmo_strlcpy(mfm->imsi, vsub->imsi, sizeof(mfm->imsi)); + osmo_strlcpy(mfm->name, vsub->name, sizeof(mfm->name)); osmo_strlcpy(mfm->scenario, g_mfs.scenario, sizeof(mfm->scenario)); /* copy the entire measurement report */ |