paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

libmsc: do not leak pending SMPP command object on error path

Browse Source 
Make sure the SMPP command object is released on errors.

Change-Id: I474584425d23fb379a9d71b33e29ac0e24f01e61
This commit is contained in:
Pablo Neira Ayuso
2017-08-07 14:01:01 +01:00
committed by Neels Hofmeyr
parent f226bd5236
commit 20515896b3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libmsc/smpp_openbsc.c
View File

@@ -521,7 +521,7 @@ void smpp_cmd_ack(struct osmo_smpp_cmd *cmd)
conn = connection_for_subscr(cmd->vsub);
if (!conn) {
LOGP(DSMPP, LOGL_ERROR, "No connection to subscriber anymore\n");
return;
goto out;
}
trans = trans_find_by_id(conn, GSM48_PDISC_SMS,
@@ -529,10 +529,11 @@ void smpp_cmd_ack(struct osmo_smpp_cmd *cmd)
if (!trans) {
LOGP(DSMPP, LOGL_ERROR, "GSM transaction %u is gone\n",
cmd->sms->gsm411.transaction_id);
return;
goto out;
}
gsm411_send_rp_ack(trans, cmd->sms->gsm411.msg_ref);
out:
smpp_cmd_free(cmd);
}
@@ -545,7 +546,7 @@ void smpp_cmd_err(struct osmo_smpp_cmd *cmd, uint32_t status)
conn = connection_for_subscr(cmd->vsub);
if (!conn) {
LOGP(DSMPP, LOGL_ERROR, "No connection to subscriber anymore\n");
return;
goto out;
}
trans = trans_find_by_id(conn, GSM48_PDISC_SMS,
@@ -553,14 +554,14 @@ void smpp_cmd_err(struct osmo_smpp_cmd *cmd, uint32_t status)
if (!trans) {
LOGP(DSMPP, LOGL_ERROR, "GSM transaction %u is gone\n",
cmd->sms->gsm411.transaction_id);
return;
goto out;
}
if (smpp_to_gsm411_err(status, &gsm411_cause) < 0)
gsm411_cause = GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER;
gsm411_send_rp_error(trans, cmd->sms->gsm411.msg_ref, gsm411_cause);
out:
smpp_cmd_free(cmd);
}