summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-07-13 10:39:51 +0200
committerIvan Kluchnikov <kluchnikovi@gmail.com>2015-08-20 19:19:39 +0300
commit3ef203ee0ab7ec9da8eb1c81fac92090e520226a (patch)
tree62f3514eb8d58b45b189e072b027487817b140d2
parent85a304a4fe71e2b74e1881cc517c23950252796a (diff)
sms: Do not go through the routing a second time
If we have tried SMPP first and it was not routable, and then tried the local delivery there is no point in trying SMPP with the same parameters again. Leave early and return unknown sub to the caller.
-rw-r--r--openbsc/src/libmsc/gsm_04_11.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index b316d62..c2cec26 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -281,13 +281,15 @@ int sms_route_mt_sms(struct gsm_subscriber_connection *conn, struct msgb *msg,
int rc;
#ifdef BUILD_SMPP
+ int smpp_first = smpp_route_smpp_first(gsms, conn);
+
/*
* Route through SMPP first before going to the local database. In case
* of a unroutable message and no local subscriber, SMPP will be tried
* twice. In case of an unknown subscriber continue with the normal
* delivery of the SMS.
*/
- if (smpp_route_smpp_first(gsms, conn)) {
+ if (smpp_first) {
rc = smpp_try_deliver(gsms, conn);
if (rc == 1)
goto try_local;
@@ -306,6 +308,10 @@ try_local:
gsms->dst.addr);
if (!gsms->receiver) {
#ifdef BUILD_SMPP
+ /* Avoid a second look-up */
+ if (smpp_first)
+ return 1; /* cause 1: unknown subscriber */
+
rc = smpp_try_deliver(gsms, conn);
if (rc == 1) {
rc = 1; /* cause 1: unknown subscriber */