diff options
Diffstat (limited to 'src/osmo-bsc/assignment_fsm.c')
| -rw-r--r-- | src/osmo-bsc/assignment_fsm.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 5304d6c88..1c4e6fdfc 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -200,18 +200,22 @@ static void send_assignment_complete(struct gsm_subscriber_connection *conn, str static void assignment_success(struct gsm_subscriber_connection *conn) { + /* Take on the new lchan */ + gscon_change_primary_lchan(conn, conn->assignment.new_lchan); + conn->assignment.new_lchan = NULL; + /* apply LCLS configuration (if any) */ lcls_apply_config(conn); - send_assignment_complete(conn, conn->assignment.new_lchan); + send_assignment_complete(conn, conn->lchan); /* If something went wrong during send_assignment_complete(), the fi will be gone from * error handling in there. Almost a success, but then again the whole thing failed. */ - if (!conn->assignment.fi) + if (!conn->assignment.fi) { + /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan, + * the conn will notice that its primary lchan is gone and should clean itself up. */ + lchan_release(conn->lchan); return; - - /* Take on the new lchan */ - gscon_change_primary_lchan(conn, conn->assignment.new_lchan); - conn->assignment.new_lchan = NULL; + } /* Rembered this only for error handling: should assignment fail, assignment_reset() will release * the MGW endpoint right away. If successful, the conn continues to use the endpoint. */ |