[MERGED] openbsc[master]: libmsc: use GSM411_RP_CAUSE_MO_NUM_UNASSIGNED as return value

[Pablo Neira Ayuso]

Pablo Neira Ayuso has submitted this change and it was merged.

Change subject: libmsc: use GSM411_RP_CAUSE_MO_NUM_UNASSIGNED as return value
......................................................................


libmsc: use GSM411_RP_CAUSE_MO_NUM_UNASSIGNED as return value

Instead of hardcoded value of 1 plus comment of the right hand side of
the statement.

Change-Id: I865bdbd6da17a0389044a8e749deeeebcb9cae06
---
M openbsc/src/libmsc/gsm_04_11.c
M openbsc/src/libmsc/smpp_openbsc.c
2 files changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index 6164a08..a94b971 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -293,7 +293,7 @@
 	 */
 	if (smpp_first) {
 		rc = smpp_try_deliver(gsms, conn);
-		if (rc == 1)
+		if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED)
 			goto try_local;
 		if (rc < 0) {
 	 		LOGP(DLSMS, LOGL_ERROR, "%s: SMS delivery error: %d.",
@@ -317,12 +317,11 @@
 		/* Avoid a second look-up */
 		if (smpp_first) {
 			rate_ctr_inc(&conn->network->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]);
-			return 1; /* cause 1: unknown subscriber */
+			return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED;
 		}
 
 		rc = smpp_try_deliver(gsms, conn);
-		if (rc == 1) {
-			rc = 1; /* cause 1: unknown subscriber */
+		if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) {
 			rate_ctr_inc(&conn->network->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]);
 		} else if (rc < 0) {
 	 		LOGP(DLSMS, LOGL_ERROR, "%s: SMS delivery error: %d.",
@@ -333,7 +332,7 @@
 					MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]);
 		}
 #else
-		rc = 1; /* cause 1: unknown subscriber */
+		rc = GSM411_RP_CAUSE_MO_NUM_UNASSIGNED;
 		rate_ctr_inc(&conn->network->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER]);
 #endif
 		return rc;
diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c
index 1671a62..ec9dda3 100644
--- a/openbsc/src/libmsc/smpp_openbsc.c
+++ b/openbsc/src/libmsc/smpp_openbsc.c
@@ -559,7 +559,7 @@
 
 	esme = smpp_route(g_smsc, &dst);
 	if (!esme)
-		return 1; /* unknown subscriber */
+		return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED;
 
 	return deliver_to_esme(esme, sms, conn);
 }

-- 
To view, visit https://gerrit.osmocom.org/2487
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I865bdbd6da17a0389044a8e749deeeebcb9cae06
Gerrit-PatchSet: 2
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pablo Neira Ayuso <pablo at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Keith Whyte <keith at rhizomatica.org>
Gerrit-Reviewer: Pablo Neira Ayuso <pablo at gnumonks.org>