From 9066b74c1fe5439c79e82cff9ab0fdb503a33332 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 19 Jun 2016 18:06:02 +0200 Subject: Use libvlr in libmsc (large refactoring) Original libvlr code is by Harald Welte , polished and tweaked by Neels Hofmeyr . This is a long series of trial-and-error development collapsed in one patch. This may be split in smaller commits if reviewers prefer that. If we can keep it as one, we have saved ourselves the additional separation work. SMS: The SQL based lookup of SMS for attached subscribers no longer works since the SQL database no longer has the subscriber data. Replace with a round-robin on the SMS recipient MSISDNs paired with a VLR subscriber RAM lookup whether the subscriber is currently attached. If there are many SMS for not-attached subscribers in the SMS database, this will become inefficient: a DB hit returns a pending SMS, the RAM lookup will reveal that the subscriber is not attached, after which the DB is hit for the next SMS. It would become more efficient e.g. by having an MSISDN based hash list for the VLR subscribers and by marking non-attached SMS recipients in the SMS database so that they can be excluded with the SQL query already. There is a sanity limit to do at most 100 db hits per attempt to find a pending SMS. So if there are more than 100 stored SMS waiting for their recipients to actually attach to the MSC, it may take more than one SMS queue trigger to deliver SMS for subscribers that are actually attached. This is not very beautiful, but is merely intended to carry us over to a time when we have a proper separate SMSC entity. Introduce gsm_subscriber_connection ref-counting in libmsc. Remove/Disable VTY and CTRL commands to create subscribers, which is now a task of the OsmoHLR. Adjust the python tests accordingly. Remove VTY cmd subscriber-keep-in-ram. Use OSMO_GSUP_PORT = 4222 instead of 2222. See I4222e21686c823985be8ff1f16b1182be8ad6175. So far use the LAC from conn->bts, will be replaced by conn->lac in Id3705236350d5f69e447046b0a764bbabc3d493c. Related: OS#1592 OS#1974 Change-Id: I639544a6cdda77a3aafc4e3446a55393f60e4050 --- src/libmsc/meas_feed.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/libmsc/meas_feed.c') diff --git a/src/libmsc/meas_feed.c b/src/libmsc/meas_feed.c index 3ddcdc39c..1e7b4cd51 100644 --- a/src/libmsc/meas_feed.c +++ b/src/libmsc/meas_feed.c @@ -18,6 +18,7 @@ #include #include #include +#include #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 */ -- cgit v1.2.3