Review at https://gerrit.osmocom.org/2589
libmsc: Map SMPP command status to GSM 04.11 cause Send SMS RP ERROR with a failure cause that relates to the status returned by the ESME in the deliver_sm_resp. Actual mapping array is limited as most phones I tested don't seem to care about the failure cause anyway, although some will display a different notification for GSM411_RP_CAUSE_MO_NUM_UNASSIGNED Change-Id: I61fb2d9ef4f2d2eabdc49b53d9966ad328d15e51 --- M openbsc/src/libmsc/smpp_openbsc.c M openbsc/src/libmsc/smpp_smsc.c M openbsc/src/libmsc/smpp_smsc.h 3 files changed, 55 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/89/2589/1 diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c index 8111d92..2b6aec6 100644 --- a/openbsc/src/libmsc/smpp_openbsc.c +++ b/openbsc/src/libmsc/smpp_openbsc.c @@ -461,6 +461,49 @@ } } +#define SMPP_TO_GSM411_MAX 4 + +struct x { + uint32_t smpp_status_code; + uint8_t gsm411_cause; +} smpp_to_gsm411_err_array[4] = { + + /* Seems like most phones don't care about the failure cause, + * although some will display a different notification for + * GSM411_RP_CAUSE_MO_NUM_UNASSIGNED + */ + + { + .smpp_status_code = ESME_RSYSERR, + .gsm411_cause = GSM411_RP_CAUSE_MO_DEST_OUT_OF_ORDER, + }, + { + .smpp_status_code = ESME_RINVDSTADR, + .gsm411_cause = GSM411_RP_CAUSE_MO_NUM_UNASSIGNED, + }, + { + .smpp_status_code = ESME_RMSGQFUL, + .gsm411_cause = GSM411_RP_CAUSE_MO_CONGESTION, + }, + { + .smpp_status_code = ESME_RINVSRCADR, + .gsm411_cause = GSM411_RP_CAUSE_MO_SMS_REJECTED, + }, +}; + +static int smpp_to_gsm411_err(uint32_t smpp_status_code, + int *gsm411_cause) +{ + int i; + for (i = 0; i < SMPP_TO_GSM411_MAX; i++) { + if (smpp_to_gsm411_err_array[i].smpp_status_code == smpp_status_code) { + *gsm411_cause = smpp_to_gsm411_err_array[i].gsm411_cause; + return 0; + } + } + return -1; +} + static void smpp_cmd_free(struct osmo_smpp_cmd *cmd) { osmo_timer_del(&cmd->response_timer); @@ -501,10 +544,12 @@ smpp_cmd_free(cmd); } -void smpp_cmd_err(struct osmo_smpp_cmd *cmd) +void smpp_cmd_err(struct osmo_smpp_cmd *cmd, uint32_t status) { struct gsm_subscriber_connection *conn; struct gsm_trans *trans; + int gsm411_cause; + int rc; conn = connection_for_subscr(cmd->subscr); if (!conn) { @@ -520,14 +565,19 @@ return; } + rc = smpp_to_gsm411_err(status, &gsm411_cause); + if (rc < 0) { + gsm411_cause = GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER; + } + gsm411_send_rp_error(trans, cmd->sms->gsm411.msg_ref, - GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER); + gsm411_cause); smpp_cmd_free(cmd); } static void smpp_deliver_sm_cb(void *data) { - smpp_cmd_err(data); + smpp_cmd_err(data, ESME_RSYSERR); } static int smpp_cmd_enqueue(struct osmo_esme *esme, diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c index bd25918..48a1192 100644 --- a/openbsc/src/libmsc/smpp_smsc.c +++ b/openbsc/src/libmsc/smpp_smsc.c @@ -681,11 +681,10 @@ return -1; } - /* Map SMPP command status to GSM 04.11 cause? */ if (deliver_r.command_status == ESME_ROK) smpp_cmd_ack(cmd); else - smpp_cmd_err(cmd); + smpp_cmd_err(cmd, deliver_r.command_status); LOGP(DSMPP, LOGL_INFO, "[%s] Rx DELIVER-SM RESP (%s)\n", esme->system_id, get_value_string(smpp_status_strs, diff --git a/openbsc/src/libmsc/smpp_smsc.h b/openbsc/src/libmsc/smpp_smsc.h index b95a1f5..d8e82e4 100644 --- a/openbsc/src/libmsc/smpp_smsc.h +++ b/openbsc/src/libmsc/smpp_smsc.h @@ -97,7 +97,7 @@ struct osmo_smpp_cmd *smpp_cmd_find_by_seqnum(struct osmo_esme *esme, uint32_t sequence_number); void smpp_cmd_ack(struct osmo_smpp_cmd *cmd); -void smpp_cmd_err(struct osmo_smpp_cmd *cmd); +void smpp_cmd_err(struct osmo_smpp_cmd *cmd, uint32_t status); void smpp_cmd_flush_pending(struct osmo_esme *esme); struct smsc { -- To view, visit https://gerrit.osmocom.org/2589 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61fb2d9ef4f2d2eabdc49b53d9966ad328d15e51 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Keith Whyte <ke...@rhizomatica.org>