cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Neels Hofmeyr 2018-12-20 03:03:44 +01:00 committed by gsmevent admin
parent 37944691de
commit f1b0fe143e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osmocom/msc/transaction.h
View File

@ -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;

6
src/libmsc/msc_mgcp.c
View File

@ -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);
}