diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2023-10-17 14:30:37 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2023-10-18 08:08:14 +0200 |
| commit | e45abc96ec016451d99b9daf7eff3ad11080fbc3 (patch) | |
| tree | 898adfb62e43203df14306105dd4a78b85b205d8 | |
| parent | 2c0f71ac43d2f7fb20e4b9ac610aab706e2f00ac (diff) | |
ASCI: Ignore cell selection event during group receive mode
Cell selection is not supported during group receive mode. If it
happens anyway, give an error message and select correct sub-state.
This fixes I05957182a57423ad947ab200b52f65fde859e110.
Related: OS#5364 and OS#6214
Change-Id: Iea6fe623956003130000c59ec0e1b24b3177052d
| -rw-r--r-- | src/host/layer23/src/mobile/gsm48_mm.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 0cf1feee..afc83f74 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1358,7 +1358,13 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) struct gsm322_cellsel *cs = &ms->cellsel; struct gsm48_sysinfo *s = &cs->sel_si; struct gsm_settings *set = &ms->settings; - bool vgcs = mm->vgcs.enabled; + + if (mm->vgcs.enabled) { + LOGP(DMM, LOGL_ERROR, "Cell selection in group receive mode, this should not happen.\n"); + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (mm->vgcs.normal_service) ? GSM48_MM_SST_RX_VGCS_NORMAL + : GSM48_MM_SST_RX_VGCS_LIMITED); + return 0; + } /* no SIM is inserted */ if (!subscr->sim_valid) { @@ -1377,9 +1383,7 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) struct msgb *nmsg; LOGP(DMM, LOGL_INFO, "Valid in location area.\n"); - new_mm_state(mm, GSM48_MM_ST_MM_IDLE, - (vgcs) ? GSM48_MM_SST_RX_VGCS_NORMAL - : GSM48_MM_SST_NORMAL_SERVICE); + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); @@ -1393,9 +1397,7 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) struct msgb *nmsg; LOGP(DMM, LOGL_INFO, "Attachment not required.\n"); - new_mm_state(mm, GSM48_MM_ST_MM_IDLE, - (vgcs) ? GSM48_MM_SST_RX_VGCS_NORMAL - : GSM48_MM_SST_NORMAL_SERVICE); + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); @@ -1416,9 +1418,7 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) struct msgb *nmsg; LOGP(DMM, LOGL_INFO, "Selected cell is forbidden.\n"); - new_mm_state(mm, GSM48_MM_ST_MM_IDLE, - (vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED - : GSM48_MM_SST_LIMITED_SERVICE); + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED); @@ -1438,9 +1438,7 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) struct msgb *nmsg; LOGP(DMM, LOGL_INFO, "Selected cell not found.\n"); - new_mm_state(mm, GSM48_MM_ST_MM_IDLE, - (vgcs) ? GSM48_MM_SST_RX_VGCS_LIMITED - : GSM48_MM_SST_LIMITED_SERVICE); + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED); |