summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorneels <nhofmeyr@sysmocom.de>2020-01-08 19:20:21 +0000
committerneels <nhofmeyr@sysmocom.de>2020-01-08 19:20:21 +0000
commita468af2c64a85978a1d5e394539e900e3b3a2050 (patch)
tree58433dc5555f5bf706820dd56a728ff035bd28ed
parentffb248dd787eb854e049d990afc40f0e604268f2 (diff)
Revert "fix memleaks in mtp_user_prim_cb()"
This reverts commit ffb248dd787eb854e049d990afc40f0e604268f2. Reason for revert: ttcn-msc-tests fail, apparently there are lots more xua_msg_free() in scrc_rx_mtp_xfer_ind_xua() that need to be dropped Change-Id: I008bcb6d5bad9e6347e7cd670159816f51331189
-rw-r--r--src/sccp_scoc.c2
-rw-r--r--src/sccp_user.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index e2768ea..7570764 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -1413,6 +1413,7 @@ static void tx_coerr_from_xua(struct osmo_sccp_instance *inst,
/* sent to SCRC for transmission */
sccp_scrc_rx_scoc_conn_msg(inst, xua);
+ xua_msg_free(xua);
}
/* Generate a RELCO based in input arguments */
@@ -1450,6 +1451,7 @@ static void tx_relco_from_xua(struct osmo_sccp_instance *inst,
/* send to SCRC for transmission */
sccp_scrc_rx_scoc_conn_msg(inst, xua);
+ xua_msg_free(xua);
}
/* Generate a RLSD based in input arguments */
diff --git a/src/sccp_user.c b/src/sccp_user.c
index 49cc212..929445f 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -174,7 +174,6 @@ static int mtp_user_prim_cb(struct osmo_prim_hdr *oph, void *ctx)
xua->mtp = omp->u.transfer;
/* hand this primitive into SCCP via the SCRC code */
rc = scrc_rx_mtp_xfer_ind_xua(inst, xua);
- xua_msg_free(xua);
break;
default:
LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n",