aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-12-20 03:03:44 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-12-21 01:46:47 +0100
commit209ee2a699d60fa75f0c4eb886b8a85c3be7f00f (patch)
treeba57b1d2e242ef9207b265dda30c503c61d64d1f
parent2615c175f11d1254990997b4ae78c972e7e39583 (diff)
move trans->assignment_done to cc.assignment_started
The flag is set to true when an assignment has been started, and it is only relevant for a CC transaction. So fix naming and place in cc struct. Cosmetic preparation for I1f8746e7babfcd3028a4d2c0ba260c608c686c76 and I0ba216b737909e92080a722db26e3577726c63cb/ Change-Id: I8dacf46141ba0b664e85b0867ade330c97d8495f
-rw-r--r--include/osmocom/msc/transaction.h4
-rw-r--r--src/libmsc/msc_mgcp.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h
index 0760c077c..74eaf6097 100644
--- a/include/osmocom/msc/transaction.h
+++ b/include/osmocom/msc/transaction.h
@@ -52,9 +52,6 @@ struct gsm_trans {
/* bearer capabilities (rate and codec) */
struct gsm_mncc_bearer_cap bearer_cap;
- /* status of the assignment, true when done */
- bool assignment_done;
-
/* if true, TCH_RTP_CREATE is sent after the
* assignment is done */
bool tch_rtp_create;
@@ -71,6 +68,7 @@ struct gsm_trans {
struct osmo_timer_list timer;
struct osmo_timer_list timer_guard;
struct gsm_mncc msg; /* stores setup/disconnect/release message */
+ bool assignment_started;
} cc;
struct {
struct gsm411_smc_inst smc_inst;
diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c
index 5a8ee7960..8e2e7a97f 100644
--- a/src/libmsc/msc_mgcp.c
+++ b/src/libmsc/msc_mgcp.c
@@ -951,7 +951,7 @@ static struct osmo_fsm fsm_msc_mgcp = {
.event_names = msc_mgcp_fsm_evt_names,
};
-/* Try to invoke call assignment and set trans->assignment_done flag if invoked.
+/* Try to invoke call assignment and set trans->cc.assignment_started flag if invoked.
* This is relevant for already ongoing calls -- scenario:
* - subscriber is in an active voice call,
* - another call is coming in.
@@ -960,10 +960,10 @@ static struct osmo_fsm fsm_msc_mgcp = {
int msc_mgcp_try_call_assignment(struct gsm_trans *trans)
{
struct ran_conn *conn = trans->conn;
- if (trans->assignment_done)
+ if (trans->cc.assignment_started)
return 0;
LOGPFSMSL(conn->fi, DMGCP, LOGL_INFO, "Starting call assignment\n");
- trans->assignment_done = true;
+ trans->cc.assignment_started = true;
return msc_mgcp_call_assignment(trans);
}