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

fix handover start: dealloc ho if event not permitted 

Before this, a handover request in a conn state that disallows it would leave a
lingering handover state in the conn, also thwarting any future handover
attempts. (It would be deallocated on conn teardown, so no memleak.)

Change-Id: I839a05495ae93c5dbbd1616efa2469e5b1990a61
This commit is contained in:
Neels Hofmeyr 2018-07-11 04:26:34 +02:00 committed by Harald Welte
parent e67ebf0d44
commit bb7ea61725
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osmo-bsc/handover_logic.c
View File

@ -82,6 +82,7 @@ static struct bsc_handover *bsc_ho_by_old_lchan(struct gsm_lchan *old_lchan)
int bsc_handover_start(enum hodec_id from_hodec_id, struct gsm_lchan *old_lchan, struct gsm_bts *new_bts,
enum gsm_chan_t new_lchan_type)
{
int rc;
struct gsm_subscriber_connection *conn;
struct bsc_handover *ho;
static uint8_t ho_ref = 0;
@ -132,7 +133,14 @@ int bsc_handover_start(enum hodec_id from_hodec_id, struct gsm_lchan *old_lchan,
gsm_lchant_name(new_lchan_type),
do_assignment ? "Assignment" : "Handover");
return osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_HO_START, NULL);
rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_HO_START, NULL);
if (rc < 0) {
LOGPHO(ho, LOGL_ERROR, "Failed to trigger handover, conn state does not allow it\n");
conn->ho = NULL;
talloc_free(ho);
}
return rc;
}
/*! Start actual handover. Call bsc_handover_start() instead; The only legal caller is the GSCON FSM in