From 9210660b1124ff6fd15a0c83a709b98efe9ac8d4 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 15 Feb 2017 00:20:44 +0100 Subject: vlr: get SMS working, by SMS recipient MSISDN round-robin 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. Change-Id: I1acf9debb6ba9164e6edcfd5bc5e48e8c98f2b01 --- openbsc/src/libmsc/vty_interface_layer3.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'openbsc/src/libmsc/vty_interface_layer3.c') diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 5ed0b0fe1..7fa66d3e4 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -158,16 +158,17 @@ DEFUN(sms_send_pend, { struct gsm_network *gsmnet = gsmnet_from_vty(vty); struct gsm_sms *sms; - int id = 0; + unsigned long long sms_id = 0; while (1) { - sms = db_sms_get_unsent_by_subscr(gsmnet, id, UINT_MAX); + sms = db_sms_get_next_unsent(gsmnet, sms_id, UINT_MAX); if (!sms) break; - gsm411_send_sms_subscr(sms->receiver, sms); + if (sms->receiver) + gsm411_send_sms_subscr(sms->receiver, sms); - id = sms->receiver->id + 1; + sms_id = sms->id + 1; } return CMD_SUCCESS; @@ -268,7 +269,7 @@ DEFUN(subscriber_send_pending_sms, return CMD_WARNING; } - sms = db_sms_get_unsent_by_subscr(gsmnet, vsub->id, UINT_MAX); + sms = db_sms_get_unsent_for_subscr(vsub, UINT_MAX); if (sms) gsm411_send_sms_subscr(sms->receiver, sms); -- cgit v1.2.3