diff options
| author | Benoit Bolsee <benoit.bolsee@wtl.be> | 2017-07-05 11:46:55 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-08-27 03:52:45 +0200 |
| commit | 3d9388e0b980791254604f4ca0581b201c6241bb (patch) | |
| tree | a7c258385d94c03e19291db33c97b0368b1a9eaf | |
| parent | ff15ca20737f0a36a1a1adb18a1cf35fd7e14cb3 (diff) | |
smpp: fix return cause
Return cause 38 when default SMPP route is unavailable. This
is better than cause 1.
Change-Id: If3241d50a78fa611981e55fef6ae4c72b0a2a167
| -rw-r--r-- | src/libmsc/gsm_04_11.c | 1 | ||||
| -rw-r--r-- | src/libmsc/smpp_openbsc.c | 9 | ||||
| -rw-r--r-- | src/libmsc/smpp_smsc.c | 16 | ||||
| -rw-r--r-- | src/libmsc/smpp_smsc.h | 3 |
4 files changed, 17 insertions, 12 deletions
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index bdf2ad7cc..6c6a1fbaf 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -296,6 +296,7 @@ int sms_route_mt_sms(struct gsm_subscriber_connection *conn, struct msgb *msg, if (smpp_first) { rc = smpp_try_deliver(gsms, conn, deferred); if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) + /* unknown subscriber, try local */ goto try_local; if (rc < 0) { LOGP(DLSMS, LOGL_ERROR, "%s: SMS delivery error: %d.", diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 24a465373..b3f9bbb4d 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -709,17 +709,18 @@ int smpp_try_deliver(struct gsm_sms *sms, { struct osmo_esme *esme; struct osmo_smpp_addr dst; + int rc; memset(&dst, 0, sizeof(dst)); dst.ton = sms->dst.ton; dst.npi = sms->dst.npi; memcpy(dst.addr, sms->dst.addr, sizeof(dst.addr)); - esme = smpp_route(g_smsc, &dst); - if (!esme) - return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; + rc = smpp_route(g_smsc, &dst, &esme); + if (!rc) + rc = deliver_to_esme(esme, sms, conn, deferred); - return deliver_to_esme(esme, sms, conn, deferred); + return rc; } struct smsc *smsc_from_vty(struct vty *v) diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 4c2e4aac8..04afc49bb 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -270,8 +270,7 @@ void smpp_esme_put(struct osmo_esme *esme) } /*! \brief try to find a SMPP route (ESME) for given destination */ -struct osmo_esme * -smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest) +int smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest, struct osmo_esme **pesme) { struct osmo_smpp_route *r; struct osmo_smpp_acl *acl = NULL; @@ -314,15 +313,20 @@ smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest) struct osmo_esme *esme; DEBUGP(DSMPP, "ACL even has ESME, we can route to it!\n"); esme = acl->esme; - if (esme->bind_flags & ESME_BIND_RX) - return esme; - else + if (esme->bind_flags & ESME_BIND_RX) { + *pesme = esme; + return 0; + } else LOGP(DSMPP, LOGL_NOTICE, "[%s] is matching route, " "but not bound for Rx, discarding MO SMS\n", esme->system_id); } - return NULL; + *pesme = NULL; + if (acl) + return GSM48_CC_CAUSE_NETWORK_OOO; + else + return GSM48_CC_CAUSE_UNASSIGNED_NR; } diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index 4bee59b6b..fded236d6 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -126,8 +126,7 @@ void smpp_smsc_stop(struct smsc *smsc); void smpp_esme_get(struct osmo_esme *esme); void smpp_esme_put(struct osmo_esme *esme); -struct osmo_esme * -smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest); +int smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest, struct osmo_esme **emse); struct osmo_smpp_acl *smpp_acl_alloc(struct smsc *smsc, const char *sys_id); struct osmo_smpp_acl *smpp_acl_by_system_id(struct smsc *smsc, |