paulmataruso/osmo-bsc
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc.git synced 2025-11-03 05:33:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASCI: Do not release channel, if SAPI 0 is released

Browse Source 
A VGCS channel must not release, if all SAPIs (including 0) are
released. lchan FSM will ignore this.

Change-Id: Ief1e1894362c4917f6e0092268690f68c8193750
Related: OS#4852
This commit is contained in:
Andreas Eversberg
2023-05-04 17:13:40 +02:00
committed by laforge
parent 0a2e79e946
commit fd35bc917a
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/bsc/lchan_fsm.h
View File

@@ -78,6 +78,8 @@ static inline bool lchan_state_is(const struct gsm_lchan *lchan, uint32_t state)
bool lchan_may_receive_data(struct gsm_lchan *lchan);
bool lchan_is_asci(struct gsm_lchan *lchan);
void lchan_forget_conn(struct gsm_lchan *lchan);
void lchan_fsm_skip_error(struct gsm_lchan *lchan);

19
src/osmo-bsc/lchan_fsm.c
View File

@@ -69,6 +69,13 @@ bool lchan_may_receive_data(struct gsm_lchan *lchan)
}
}
bool lchan_is_asci(struct gsm_lchan *lchan)
{
if (lchan->activate.info.vgcs || lchan->activate.info.vbs)
return true;
return false;
}
static void lchan_on_mode_modify_success(struct gsm_lchan *lchan)
{
lchan->modify.concluded = true;
@@ -1228,8 +1235,13 @@ static void handle_rll_rel_ind_or_conf(struct osmo_fsm_inst *fi, uint32_t event,
/* Releasing SAPI 0 means the conn becomes invalid; but not if the link_id contains a SACCH flag. */
if (lchan->conn && sapi == 0 && !(link_id & 0xc0)) {
LOG_LCHAN(lchan, LOGL_DEBUG, "lchan is releasing\n");
gscon_lchan_releasing(lchan->conn, lchan);
/* A VGCS/VBS channel must stay active, even if all SAPIs are released.
* When a talker releases, the channel is available for the listeners and the next talker. The actual
* channel release is performed by the VGCS/VBS call control. */
if (!lchan_is_asci(lchan)) {
LOG_LCHAN(lchan, LOGL_DEBUG, "lchan is releasing\n");
gscon_lchan_releasing(lchan->conn, lchan);
}
/* if SAPI=0 is gone, it makes no sense if other SAPIs are still around,
* this is not a valid configuration and we should forget about them.
@@ -1257,7 +1269,8 @@ static void lchan_fsm_established(struct osmo_fsm_inst *fi, uint32_t event, void
case LCHAN_EV_RLL_REL_IND:
case LCHAN_EV_RLL_REL_CONF:
handle_rll_rel_ind_or_conf(fi, event, data);
if (!lchan_active_sapis(lchan, 0))
/* Only release channel, if there is no SAPI and this channel is not a VGCS channel. */
if (!lchan_active_sapis(lchan, 0) && !lchan_is_asci(lchan))
lchan_fsm_state_chg(LCHAN_ST_WAIT_RLL_RTP_RELEASED);
return;