- gerrit-log - lists.osmocom.org

[L] Change in ...osmo-epdg[master]: Handle GSUP EPDG_Tunnel through GTPv2C CreateSession Req+Resp
by pespin 23 Oct '23

23 Oct '23

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804?usp=email ) Change subject: Handle GSUP EPDG_Tunnel through GTPv2C CreateSession Req+Resp ...................................................................... Patch Set 4: (3 comments) Patchset: PS4: > Isn't there a GTPv2 ping/pong or keepalive? […] It's not yet there. For now I'm focusing on adding the barebones of each interface to have 1 test case passing, so that it's easier then to incrementally add features in parallel by several people. File src/epdg_gtpc_s2b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804/comment/00151048_4754… PS4, Line 10: % This program is free software; you can redistribute it and/or modify > In general on this project: We should have a separate discussion about the license. […] Ack, I'm simply extending whatever code I found there. https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804/comment/9bb889b9_8b7d… PS4, Line 60: %% TODO: make APN configurable? get it from HSS? > The UE sends the APN when connecting to the ePDG within the IKEv2. […] But I think it is not yet defined how we pass that to osmo-epdg through the CEAI GSUP interface. We can add those missing bits as a follow-up. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I6f00b7fce2d5fcdc484bfd45629b9141f16bc579 Gerrit-Change-Number: 34804 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 23 Oct 2023 14:35:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: Makefile: run 'rebar3 clean' upon make clean
by pespin 23 Oct '23

23 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34841?usp=email ) Change subject: Makefile: run 'rebar3 clean' upon make clean ...................................................................... Makefile: run 'rebar3 clean' upon make clean Otherwise the diameter files generated during compile in include/ and src/ are not removed. Change-Id: I771860f965499bb754c13385819845ef23f33553 --- M Makefile 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: lynxis lazus: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index b2fe66f..0470458 100644 --- a/Makefile +++ b/Makefile @@ -14,4 +14,12 @@ rebar3 eunit clean: +# Avoid running rebar3 clean if _build doesn't exist, since it would try +# to fetch deps from the Internet and that may not be avaialble when in +# OBS build. +ifneq ("$(wildcard _build/.*)", "") + rebar3 clean rm -rf _build/ +else + rm -f src/diameter_*.erl +endif -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I771860f965499bb754c13385819845ef23f33553 Gerrit-Change-Number: 34841 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: Makefile: run 'rebar3 clean' upon make clean
by pespin 23 Oct '23

23 Oct '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34841?usp=email ) Change subject: Makefile: run 'rebar3 clean' upon make clean ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I771860f965499bb754c13385819845ef23f33553 Gerrit-Change-Number: 34841 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Oct 2023 14:33:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: ASCI: Correctly set and store 'uplink-release-local' flag
by fixeria 23 Oct '23

23 Oct '23

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34867?usp=email ) Change subject: ASCI: Correctly set and store 'uplink-release-local' flag ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34867?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6af44f0dd7ff842de633587fb0dcbe78126d30e1 Gerrit-Change-Number: 34867 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 23 Oct 2023 13:15:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: ASCI: Add option to join voice group/broadcast calls without valid SIM
by fixeria 23 Oct '23

23 Oct '23

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34866?usp=email ) Change subject: ASCI: Add option to join voice group/broadcast calls without valid SIM ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6ea851a8cb015ff685b985335968c6184beca816 Gerrit-Change-Number: 34866 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 23 Oct 2023 13:14:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: ASCI: Use correct mobile identiy in TALKER INDICATION message
by fixeria 23 Oct '23

23 Oct '23

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34865?usp=email ) Change subject: ASCI: Use correct mobile identiy in TALKER INDICATION message ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34865?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I299604a0e12d91e9133b70757826ac9637da0e3e Gerrit-Change-Number: 34865 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 23 Oct 2023 13:12:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: ASCI: Handle rejection of voice group/broadcast call correctly
by fixeria 23 Oct '23

23 Oct '23

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email ) Change subject: ASCI: Handle rejection of voice group/broadcast call correctly ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File src/host/layer23/src/mobile/gsm44068_gcc_bcc.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34864/comment/facb702f_f37df590 PS1, Line 1228: NULL state copy-paste? https://gerrit.osmocom.org/c/osmocom-bb/+/34864/comment/88f58a78_ced4f0a7 PS1, Line 1231: %d) `0x%02x` -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Gerrit-Change-Number: 34864 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 23 Oct 2023 13:10:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in ...osmo-epdg[master]: Initial S6b support
by lynxis lazus 23 Oct '23

23 Oct '23

Attention is currently required from: pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858?usp=email ) Change subject: Initial S6b support ...................................................................... Patch Set 2: (2 comments) File src/aaa_diameter_s6b.erl: https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858/comment/8b82f6f8_c96a… PS2, Line 138: % APN is optional and should be [] old code? https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858/comment/422af289_dd60… PS2, Line 148: SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)). It looks you're missing something here. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia2b138317cb291a95882853f5403949c5e6a5a1b Gerrit-Change-Number: 34858 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Oct 2023 13:07:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: ASCI: Handle rejection of voice group/broadcast call correctly
by jolly 23 Oct '23

23 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email ) Change subject: ASCI: Handle rejection of voice group/broadcast call correctly ...................................................................... ASCI: Handle rejection of voice group/broadcast call correctly If joining a call gets rejected, the call must not be released, instead it must return to U3 state (incoming call), because the call still exists in the cell and it might possible to join it later. If a call notification is gone, a new event is used in the state machine to release incoming call. Change-Id: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Related: OS#5364 --- M src/host/layer23/src/mobile/gsm44068_gcc_bcc.c 1 file changed, 43 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/34864/1 diff --git a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c index 0cef1c3..a061cf0 100644 --- a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c +++ b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c @@ -138,10 +138,11 @@ VGCS_GCC_EV_DI_CONNECT, /* network indicates connect */ VGCS_GCC_EV_TIMEOUT, /* several timeout events */ VGCS_GCC_EV_SETUP_IND, /* notification of ongoing call received */ + VGCS_GCC_EV_REL_IND, /* notification of call being gone */ VGCS_GCC_EV_JOIN_GC_REQ, /* user wants to join ongoing call */ VGCS_GCC_EV_JOIN_GC_CNF, /* MM confirms joining ongoing call */ VGCS_GCC_EV_ABORT_REQ, /* user rejects or leaves call */ - VGCS_GCC_EV_ABORT_IND, /* MM indicates call gone / channel released or failed */ + VGCS_GCC_EV_ABORT_IND, /* MM indicates channel released or failed */ VGCS_GCC_EV_TALK_REQ, /* user wants to talk */ VGCS_GCC_EV_TALK_CNF, /* MM confirms talk */ VGCS_GCC_EV_TALK_REJ, /* MM rejects talk */ @@ -162,6 +163,7 @@ OSMO_VALUE_STRING(VGCS_GCC_EV_DI_CONNECT), OSMO_VALUE_STRING(VGCS_GCC_EV_TIMEOUT), OSMO_VALUE_STRING(VGCS_GCC_EV_SETUP_IND), + OSMO_VALUE_STRING(VGCS_GCC_EV_REL_IND), OSMO_VALUE_STRING(VGCS_GCC_EV_JOIN_GC_REQ), OSMO_VALUE_STRING(VGCS_GCC_EV_JOIN_GC_CNF), OSMO_VALUE_STRING(VGCS_GCC_EV_ABORT_REQ), @@ -1104,7 +1106,7 @@ /* Change to GROUP CALL PRESENT state. */ osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U3_GROUP_CALL_PRESENT, 0, 0); break; - case VGCS_GCC_EV_ABORT_IND: + case VGCS_GCC_EV_REL_IND: /* The MM layer indicates that group channel is gone. */ LOG_GCC(trans, LOGL_INFO, "Group call notification is gone.\n"); /* Change to NULL state. */ @@ -1165,12 +1167,12 @@ /* Free transaction. */ trans_free(trans); break; - case VGCS_GCC_EV_ABORT_IND: + case VGCS_GCC_EV_REL_IND: /* The notified call is gone. */ LOG_GCC(trans, LOGL_INFO, "Received call from network is gone.\n"); /* Change to NULL state. */ osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U0_NULL, 0, 0); - /* Notify termination at VTY. (No cause, because notification is gone.) */ + /* Notify termination at VTY. */ vgcs_vty_notify(trans, "Released\n"); /* Free transaction. */ trans_free(trans); @@ -1193,6 +1195,7 @@ static void vgcs_gcc_fsm_u4_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_trans *trans = fi->priv; + uint8_t *cause = data; switch (event) { case VGCS_GCC_EV_JOIN_GC_CNF: @@ -1209,16 +1212,24 @@ /* Free transaction. */ trans_free(trans); break; - case VGCS_GCC_EV_ABORT_IND: + case VGCS_GCC_EV_REL_IND: /* The notified call is gone. */ LOG_GCC(trans, LOGL_INFO, "Received call from network is gone.\n"); /* Change to NULL state. */ osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U0_NULL, 0, 0); - /* Notify termination at VTY. (No cause, because notification is gone.) */ + /* Notify termination at VTY. */ vgcs_vty_notify(trans, "Released\n"); /* Free transaction. */ trans_free(trans); break; + case VGCS_GCC_EV_ABORT_IND: + /* The notified call is gone. */ + LOG_GCC(trans, LOGL_INFO, "Call rejected.\n"); + /* Change to NULL state. */ + osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U3_GROUP_CALL_PRESENT, 0, 0); + /* Notify termination at VTY. */ + vgcs_vty_notify(trans, "Released (cause %d)\n", *cause); + break; case VGCS_GCC_EV_TIMEOUT: /* Group channel timed out. */ LOG_GCC(trans, LOGL_INFO, "Timeout waiting for group channel.\n"); @@ -1417,7 +1428,7 @@ .in_event_mask = S(VGCS_GCC_EV_SETUP_IND) | S(VGCS_GCC_EV_TERM_REQ) | S(VGCS_GCC_EV_ABORT_REQ) | - S(VGCS_GCC_EV_ABORT_IND) | + S(VGCS_GCC_EV_REL_IND) | S(VGCS_GCC_EV_TIMEOUT), .out_state_mask = S(VGCS_GCC_ST_U2r_U6_GROUP_CALL_ACTIVE) | S(VGCS_GCC_ST_U4_GROUP_CALL_CONN_REQUEST) | @@ -1430,7 +1441,7 @@ .name = "GROUP CALL PRESENT (U3)", .in_event_mask = S(VGCS_GCC_EV_JOIN_GC_REQ) | S(VGCS_GCC_EV_ABORT_REQ) | - S(VGCS_GCC_EV_ABORT_IND), + S(VGCS_GCC_EV_REL_IND), .out_state_mask = S(VGCS_GCC_ST_U0_NULL) | S(VGCS_GCC_ST_U4_GROUP_CALL_CONN_REQUEST) | S(VGCS_GCC_ST_U2nc_GROUP_CALL_ACTIVE), @@ -1441,9 +1452,11 @@ .name = "GROUP CALL CONNECTION REQUEST (U4)", .in_event_mask = S(VGCS_GCC_EV_JOIN_GC_CNF) | S(VGCS_GCC_EV_ABORT_REQ) | + S(VGCS_GCC_EV_REL_IND) | S(VGCS_GCC_EV_ABORT_IND) | S(VGCS_GCC_EV_TIMEOUT), .out_state_mask = S(VGCS_GCC_ST_U2r_U6_GROUP_CALL_ACTIVE) | + S(VGCS_GCC_ST_U3_GROUP_CALL_PRESENT) | S(VGCS_GCC_ST_U0_NULL), .onenter = vgcs_gcc_fsm_u4_onenter, .action = vgcs_gcc_fsm_u4_action, @@ -1610,7 +1623,6 @@ uint8_t pdisc; struct gsm_trans *trans; int rc = 0; - uint8_t cause; /* Check for message class and get protocol type. */ switch ((msg_type & GSM48_MMXX_MASK)) { @@ -1684,6 +1696,9 @@ case GSM48_MMBCC_ERR_IND: case GSM48_MMGCC_REL_IND: case GSM48_MMBCC_REL_IND: + /* Ignore release confirm or release collision. */ + if (trans->gcc.fi->state == VGCS_GCC_ST_U3_GROUP_CALL_PRESENT) + break; /* If MM fails or is rejected during U0.p state, this is a MM-EST-REJ. */ if (trans->gcc.fi->state == VGCS_GCC_ST_U0p_MM_CONNECTION_PENDING) osmo_fsm_inst_dispatch(trans->gcc.fi, VGCS_GCC_EV_MM_EST_REJ, &mmh->cause); @@ -1713,9 +1728,8 @@ if (trans->gcc.fi->state == VGCS_GCC_ST_U3_GROUP_CALL_PRESENT || trans->gcc.fi->state == VGCS_GCC_ST_U4_GROUP_CALL_CONN_REQUEST || trans->gcc.fi->state == VGCS_GCC_ST_U2nc_GROUP_CALL_ACTIVE) { - /* If notification is gone, abort pending received call. */ - cause = GSM48_CC_CAUSE_NORM_CALL_CLEAR; - osmo_fsm_inst_dispatch(trans->gcc.fi, VGCS_GCC_EV_ABORT_IND, &cause); + /* If notification is gone, release pending received call. */ + osmo_fsm_inst_dispatch(trans->gcc.fi, VGCS_GCC_EV_REL_IND, NULL); } break; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Gerrit-Change-Number: 34864 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[M] Change in osmocom-bb[master]: ASCI: Add option to join voice group/broadcast calls without valid SIM
by jolly 23 Oct '23

23 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34866?usp=email ) Change subject: ASCI: Add option to join voice group/broadcast calls without valid SIM ...................................................................... ASCI: Add option to join voice group/broadcast calls without valid SIM This option must be enabled in the VTY and is disabled by default. Calls can be joined when service is limited or normal. With that option enabled, calls can be joined even with invalid SIM. Talking is allowed when service is normal. With that option enabled, talking is always allowed. It depends on the network, if it accepts the talker. Change-Id: I6ea851a8cb015ff685b985335968c6184beca816 Related: OS#5364 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 75 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/66/34866/1 diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 884578b..3b9473f 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -191,6 +191,7 @@ /* ASCI settings */ bool uplink_release_local; + bool asci_allow_any; }; struct gsm_settings_abbrev { diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 5e02659..378cd2d 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -61,7 +61,9 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg); static int gsm48_mm_loc_upd_periodic(struct osmocom_ms *ms, struct msgb *msg); static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg); +static int gsm48_mm_group_reject(struct osmocom_ms *ms, struct msgb *msg); static int gsm48_mm_group_rel_req(struct osmocom_ms *ms, struct msgb *msg); +static int gsm48_mm_uplink_reject(struct osmocom_ms *ms, struct msgb *msg); /* * notes @@ -3805,9 +3807,13 @@ static int gsm48_mm_group_req(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm_settings *set = &ms->settings; struct gsm48_mmxx_hdr *mmh = (struct gsm48_mmxx_hdr *)msg->data; struct msgb *nmsg; + if (mm->substate == GSM48_MM_SST_NO_IMSI && !set->asci_allow_any) + return gsm48_mm_group_reject(ms, msg); + LOGP(DMM, LOGL_INFO, "Request for joining a group call, trying to establish group receive mode.\n"); /* Store infos about group/broadcast call. */ @@ -3881,6 +3887,7 @@ static int gsm48_mm_group_rel_ind(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm_subscriber *subscr = &ms->subscr; struct gsm48_rr_hdr *rrh = (struct gsm48_rr_hdr *)msg->data; uint16_t msg_type; struct msgb *nmsg; @@ -3892,8 +3899,10 @@ mm->vgcs.enabled = false; /* Change mode back to normal or limited service. */ - if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) - new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); + if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) { + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (subscr->sim_valid) ? GSM48_MM_SST_LIMITED_SERVICE + : GSM48_MM_SST_NO_IMSI); + } if (mm->substate == GSM48_MM_SST_RX_VGCS_NORMAL) new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); @@ -3932,6 +3941,7 @@ static int gsm48_mm_group_rel_req(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm_subscriber *subscr = &ms->subscr; struct msgb *nmsg; LOGP(DMM, LOGL_INFO, "Request to release group call in receive or transmit mode.\n"); @@ -3940,8 +3950,10 @@ mm->vgcs.enabled = false; /* Change mode back to normal or limited service. */ - if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) - new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); + if (mm->substate == GSM48_MM_SST_RX_VGCS_LIMITED) { + new_mm_state(mm, GSM48_MM_ST_MM_IDLE, (subscr->sim_valid) ? GSM48_MM_SST_LIMITED_SERVICE + : GSM48_MM_SST_NO_IMSI); + } if (mm->substate == GSM48_MM_SST_RX_VGCS_NORMAL) new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); @@ -3960,8 +3972,12 @@ static int gsm48_mm_uplink_req(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; + struct gsm_settings *set = &ms->settings; struct msgb *nmsg; + if (mm->substate != GSM48_MM_SST_RX_VGCS_NORMAL && !set->asci_allow_any) + return gsm48_mm_uplink_reject(ms, msg); + LOGP(DMM, LOGL_INFO, "Request for uplink, trying to establish group transmit mode.\n"); /* Go into uplink pending state. */ @@ -4201,6 +4217,12 @@ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_NO_IMSI), GSM48_MMCC_EST_REQ, gsm48_mm_init_mm_no_rr}, + {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_NO_IMSI), + GSM48_MMBCC_GROUP_REQ, gsm48_mm_group_req}, + + {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_NO_IMSI), + GSM48_MMGCC_GROUP_REQ, gsm48_mm_group_req}, + /* 4.2.2.5 PLMN search, normal service */ {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_PLMN_SEARCH_NORMAL), GSM48_MMCC_EST_REQ, gsm48_mm_init_mm_no_rr}, @@ -4254,10 +4276,10 @@ GSM48_MMBCC_REL_REQ, gsm48_mm_group_rel_req}, {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_RX_VGCS_LIMITED), - GSM48_MMGCC_UPLINK_REQ, gsm48_mm_uplink_reject}, + GSM48_MMGCC_UPLINK_REQ, gsm48_mm_uplink_req}, {SBIT(GSM48_MM_ST_MM_IDLE), SBIT(GSM48_MM_SST_RX_VGCS_LIMITED), - GSM48_MMBCC_UPLINK_REQ, gsm48_mm_uplink_reject}, + GSM48_MMBCC_UPLINK_REQ, gsm48_mm_uplink_req}, /* 4.5.1.1 MM Connection (EST) */ {SBIT(GSM48_MM_ST_RR_CONN_RELEASE_NA), ALL_STATES, diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 1766071..7611c0f 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1327,6 +1327,9 @@ if (!l23_vty_hide_default || !set->uplink_release_local) vty_out(vty, " %suplink-release-local%s", (set->uplink_release_local) ? "no " : "", VTY_NEWLINE); + if (!l23_vty_hide_default || set->asci_allow_any) + vty_out(vty, " %sasci-allow-any%s", + (set->asci_allow_any) ? "" : "no ", VTY_NEWLINE); vty_out(vty, " audio%s", VTY_NEWLINE); vty_out(vty, " io-handler %s%s", @@ -1997,6 +2000,28 @@ return CMD_SUCCESS; } +DEFUN(cfg_ms_asci_allow_any, cfg_ms_asci_allow_any_cmd, "asci-allow-any", + "Allow any ASCI related call feature, even if service is limited or SIM invalid.") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->asci_allow_any = true; + + return CMD_SUCCESS; +} + +DEFUN(cfg_ms_no_asci_allow_any, cfg_ms_no_asci_allow_any_cmd, "no asci-allow-any", + NO_STR "Do not allow any ASCI related call feature, if service is not normal.") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->asci_allow_any = false; + + return CMD_SUCCESS; +} + static int config_write_dummy(struct vty *vty) { return CMD_SUCCESS; @@ -2586,6 +2611,8 @@ install_element(MS_NODE, &cfg_ms_no_sms_store_cmd); install_element(MS_NODE, &cfg_ms_uplink_release_local_cmd); install_element(MS_NODE, &cfg_ms_no_uplink_release_local_cmd); + install_element(MS_NODE, &cfg_ms_asci_allow_any_cmd); + install_element(MS_NODE, &cfg_ms_no_asci_allow_any_cmd); install_element(MS_NODE, &cfg_ms_support_cmd); install_node(&support_node, config_write_dummy); install_element(SUPPORT_NODE, &cfg_ms_set_en_cc_dtmf_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34866?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6ea851a8cb015ff685b985335968c6184beca816 Gerrit-Change-Number: 34866 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log