diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-12 23:59:07 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2018-03-22 04:35:28 +0000 |
| commit | d6a769b51cb01f0a93fda9c792d7e1367e8e027b (patch) | |
| tree | f4243698fe0dcf0b7b8390a74e368ac6ee937d3f /src/libmsc/transaction.c | |
| parent | 3cffc2055d01b55e03e04c6d125581be93916ed0 (diff) | |
trans_free: tear down conn when last transaction is done
In trans_free(), call subscr_conn_release_when_unused(), so that we are sure to
clean up after the last transaction is done.
This fixes an error where a conn lingered after a CC failure, because that code
path forgot to trigger cleanup.
Rationale: so far we were triggering the release check after each DTAP dispatch
(compl_l3 and "normal" DTAP), which is sufficient for properly closed
transactions. We also need a check for when a timeout clears an erratic trans.
Adjust test expectation of test_call_mo_to_unknown_timeout to show that the
error is now fixed.
msc_vlr_test_reject_concurrency now sees an additional release checking event
when the SMS transaction is done, which is expected and does not affect the
test otherwise.
Related: OS#2779
Change-Id: I46ff2e9b09b67e4e0d79cccf8c04936f17281fcb
Diffstat (limited to 'src/libmsc/transaction.c')
| -rw-r--r-- | src/libmsc/transaction.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index cdaba9c79..4a3b064db 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -117,6 +117,7 @@ struct gsm_trans *trans_alloc(struct gsm_network *net, void trans_free(struct gsm_trans *trans) { enum msc_subscr_conn_use conn_usage_token = MSC_CONN_USE_UNTRACKED; + struct gsm_subscriber_connection *conn; switch (trans->protocol) { case GSM48_PDISC_CC: @@ -153,8 +154,15 @@ void trans_free(struct gsm_trans *trans) if (trans->conn) msc_subscr_conn_put(trans->conn, conn_usage_token); + conn = trans->conn; trans->conn = NULL; talloc_free(trans); + + /* trans_free() should always happen while the conn_fsm is still around. */ + OSMO_ASSERT(conn->conn_fsm); + + /* Possibly this was the last transaction used by this conn. */ + subscr_conn_release_when_unused(conn); } /*! allocate an unused transaction ID for the given subscriber |