July 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: ASCI: Add selection reason for VGCS/VBS channels

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33600 ) Change subject: ASCI: Add selection reason for VGCS/VBS channels ...................................................................... ASCI: Add selection reason for VGCS/VBS channels "enum lchan_select_reason" gets a new selection reason: "SELECT_FOR_VGCS" The selection "direction" can also be changed via VTY. Change-Id: I6b96d0a1df68efa5858b98297ebe0944b1473aaf Related: OS#4852 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan_select.h M src/osmo-bsc/bts_vty.c M src/osmo-bsc/lchan_select.c 4 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/33600/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index a2b84c6..3f7958c 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -523,6 +523,7 @@ bool chan_alloc_chan_req_reverse; bool chan_alloc_assignment_reverse; bool chan_alloc_handover_reverse; + bool chan_alloc_vgcs_reverse; /* Whether to use dynamic allocation mode for assignment */ bool chan_alloc_assignment_dynamic; diff --git a/include/osmocom/bsc/lchan_select.h b/include/osmocom/bsc/lchan_select.h index 8f1dc62..d6a1b20 100644 --- a/include/osmocom/bsc/lchan_select.h +++ b/include/osmocom/bsc/lchan_select.h @@ -5,6 +5,7 @@ SELECT_FOR_MS_CHAN_REQ, SELECT_FOR_ASSIGNMENT, SELECT_FOR_HANDOVER, + SELECT_FOR_VGCS, }; extern const struct value_string lchan_select_reason_names[]; diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 657d03e..8a34d9f 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -549,6 +549,7 @@ bts->chan_alloc_chan_req_reverse = reverse; bts->chan_alloc_assignment_reverse = reverse; bts->chan_alloc_handover_reverse = reverse; + bts->chan_alloc_vgcs_reverse = reverse; bts->chan_alloc_assignment_dynamic = false; return CMD_SUCCESS; @@ -557,7 +558,7 @@ DEFUN_ATTR(cfg_bts_challoc_mode, cfg_bts_challoc_mode_cmd, CHAN_ALLOC_CMD - " mode (set-all|chan-req|assignment|handover) " + " mode (set-all|chan-req|assignment|handover|vgcs-vbs) " CHAN_ALLOC_ASC_DSC, CHAN_ALLOC_DESC "Channel allocation mode\n" @@ -565,6 +566,7 @@ "Channel allocation for CHANNEL REQUEST (RACH)\n" "Channel allocation for assignment\n" "Channel allocation for handover\n" + "Channel allocation for VGCS/VBS\n" CHAN_ALLOC_ASC_DSC_DESC, CMD_ATTR_IMMEDIATE) { @@ -580,6 +582,8 @@ } if (set_all || !strcmp(argv[0], "handover")) bts->chan_alloc_handover_reverse = reverse; + if (set_all || !strcmp(argv[0], "vgcs-vbs")) + bts->chan_alloc_vgcs_reverse = reverse; return CMD_SUCCESS; } @@ -4424,6 +4428,9 @@ vty_out(vty, " channel allocator mode handover %s%s", bts->chan_alloc_handover_reverse ? "descending" : "ascending", VTY_NEWLINE); + vty_out(vty, " channel allocator mode vgcs-vbs %s%s", + bts->chan_alloc_vgcs_reverse ? "descending" : "ascending", + VTY_NEWLINE); if (bts->chan_alloc_avoid_interf) vty_out(vty, " channel allocator avoid-interference 1%s", VTY_NEWLINE); if (bts->chan_alloc_tch_signalling_policy == BTS_TCH_SIGNALLING_NEVER) diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 1e12d96..b4bc664 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -41,6 +41,7 @@ OSMO_VALUE_STRING(SELECT_FOR_MS_CHAN_REQ), OSMO_VALUE_STRING(SELECT_FOR_ASSIGNMENT), OSMO_VALUE_STRING(SELECT_FOR_HANDOVER), + OSMO_VALUE_STRING(SELECT_FOR_VGCS), {0, NULL} }; @@ -349,6 +350,9 @@ case SELECT_FOR_HANDOVER: chan_alloc_reverse = bts->chan_alloc_handover_reverse; break; + case SELECT_FOR_VGCS: + chan_alloc_reverse = bts->chan_alloc_vgcs_reverse; + break; } /* Allocate an array with pointers to all timeslots of a BTS */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6b96d0a1df68efa5858b98297ebe0944b1473aaf Gerrit-Change-Number: 33600 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Add support for Group/Broadcast channel activation

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33599 ) Change subject: ASCI: Add support for Group/Broadcast channel activation ...................................................................... ASCI: Add support for Group/Broadcast channel activation "struct lchan_activate_info" is expanded to support flags for VGCS and VBS. These are used to send the correct Channel Mode to the BTS. "enum lchan_activate_for" is expanded to indicate and activation of VGCS/VBS calls. Change-Id: Ic0c0597d149d0758d6766937d99660fa02e0e139 Related: OS#4852 --- M include/osmocom/bsc/lchan.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/gsm_data.c 3 files changed, 40 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/33599/1 diff --git a/include/osmocom/bsc/lchan.h b/include/osmocom/bsc/lchan.h index 135a067..f46a3fd 100644 --- a/include/osmocom/bsc/lchan.h +++ b/include/osmocom/bsc/lchan.h @@ -101,6 +101,7 @@ ACTIVATE_FOR_MS_CHANNEL_REQUEST, ACTIVATE_FOR_ASSIGNMENT, ACTIVATE_FOR_HANDOVER, + ACTIVATE_FOR_VGCS_CHANNEL, ACTIVATE_FOR_VTY, ACTIVATE_FOR_MODE_MODIFY_RTP, }; @@ -140,6 +141,8 @@ bool vamos; + bool vgcs, vbs; + /* A copy of bts->imm_ass_time at the time where Channel Activation was requested. A change in the VTY * configuration has immediate effect on the value, so make sure we don't get mixed up when it gets changed * while a channel activation is in progress. */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 8abb675..f3ab8d6 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -405,7 +405,7 @@ static int channel_mode_from_lchan(struct rsl_ie_chan_mode *cm, struct gsm_lchan *lchan, const struct channel_mode_and_rate *ch_mode_rate, - bool vamos) + bool vamos, bool vgcs, bool vbs) { int rc; memset(cm, 0, sizeof(*cm)); @@ -429,10 +429,24 @@ cm->chan_rt = RSL_CMOD_CRT_SDCCH; break; case GSM_LCHAN_TCH_F: - cm->chan_rt = vamos ? RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm : RSL_CMOD_CRT_TCH_Bm; + if (vamos) + cm->chan_rt = RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm; + else if (vgcs) + cm->chan_rt = RSL_CMOD_CRT_TCH_GROUP_Bm; + else if (vbs) + cm->chan_rt = RSL_CMOD_CRT_TCH_BCAST_Bm; + else + cm->chan_rt = RSL_CMOD_CRT_TCH_Bm; break; case GSM_LCHAN_TCH_H: - cm->chan_rt = vamos ? RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm : RSL_CMOD_CRT_TCH_Lm; + if (vamos) + cm->chan_rt = RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm; + else if (vgcs) + cm->chan_rt = RSL_CMOD_CRT_TCH_GROUP_Lm; + else if (vbs) + cm->chan_rt = RSL_CMOD_CRT_TCH_BCAST_Lm; + else + cm->chan_rt = RSL_CMOD_CRT_TCH_Lm; break; case GSM_LCHAN_NONE: case GSM_LCHAN_UNKNOWN: @@ -574,7 +588,8 @@ /* PDCH activation is a job for rsl_tx_dyn_ts_pdch_act_deact(); */ OSMO_ASSERT(act_type != RSL_ACT_OSMO_PDCH); - rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.ch_mode_rate, lchan->activate.info.vamos); + rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.ch_mode_rate, lchan->activate.info.vamos, + lchan->activate.info.vgcs, lchan->activate.info.vbs); if (rc < 0) { LOGP(DRSL, LOGL_ERROR, "%s Cannot find channel mode from lchan type\n", @@ -711,7 +726,7 @@ if (chan_nr < 0) return chan_nr; - rc = channel_mode_from_lchan(&cm, lchan, &lchan->modify.ch_mode_rate, lchan->modify.info.vamos); + rc = channel_mode_from_lchan(&cm, lchan, &lchan->modify.ch_mode_rate, lchan->modify.info.vamos, false, false); if (rc < 0) return rc; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 012149a..9a32e07 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -940,6 +940,7 @@ OSMO_VALUE_STRING(ACTIVATE_FOR_MS_CHANNEL_REQUEST), OSMO_VALUE_STRING(ACTIVATE_FOR_ASSIGNMENT), OSMO_VALUE_STRING(ACTIVATE_FOR_HANDOVER), + OSMO_VALUE_STRING(ACTIVATE_FOR_VGCS_CHANNEL), OSMO_VALUE_STRING(ACTIVATE_FOR_VTY), {} }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic0c0597d149d0758d6766937d99660fa02e0e139 Gerrit-Change-Number: 33599 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Add TX support for UPLINK RELEASE message

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33601 ) Change subject: ASCI: Add TX support for UPLINK RELEASE message ...................................................................... ASCI: Add TX support for UPLINK RELEASE message Change-Id: Ie3d8ad1ea8325c13759838d8083c6e47a0f54497 Related: OS#4852 --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/33601/1 diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 7d68fc8..c0f8d4b 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -33,6 +33,7 @@ int gsm48_send_rr_app_info(struct gsm_lchan *lchan, uint8_t apdu_id, uint8_t apdu_flags, const uint8_t *apdu_data, ssize_t apdu_data_len); int gsm48_lchan_modify(struct gsm_lchan *lchan, uint8_t mode); +int gsm48_send_uplink_release(struct gsm_lchan *lchan, uint8_t cause); int gsm48_rx_rr_modif_ack(struct msgb *msg); int gsm48_parse_meas_rep(struct gsm_meas_rep *rep, struct msgb *msg); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 8395dcf..ae54cf5 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -746,6 +746,21 @@ return gsm48_sendmsg(msg); } +/* TS 44.018 section 9.1.48 */ +int gsm48_send_uplink_release(struct gsm_lchan *lchan, uint8_t cause) +{ + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 UL RELEASE"); + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + + msg->lchan = lchan; + gh->proto_discr = GSM48_PDISC_RR; + gh->msg_type = GSM48_MT_RR_UPLINK_RELEASE; + + msgb_put_u8(msg, cause); + + return gsm48_sendmsg(msg); +} + int gsm48_rx_rr_modif_ack(struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3d8ad1ea8325c13759838d8083c6e47a0f54497 Gerrit-Change-Number: 33601 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Make function to add OSMUX IE public

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33602 ) Change subject: ASCI: Make function to add OSMUX IE public ...................................................................... ASCI: Make function to add OSMUX IE public Rename _gsm0808_ass_compl_extend_osmux() to gsm0808_extend_osmux(). This IE is also used for VGCS/VBS assignment command that is located in a different file. Change-Id: I1452cabb142f9e7a169f4ddfeac85908abaf8dfc Related: OS#4852 --- M include/osmocom/bsc/assignment_fsm.h M src/osmo-bsc/assignment_fsm.c 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/33602/1 diff --git a/include/osmocom/bsc/assignment_fsm.h b/include/osmocom/bsc/assignment_fsm.h index 70cb88c..88a2753 100644 --- a/include/osmocom/bsc/assignment_fsm.h +++ b/include/osmocom/bsc/assignment_fsm.h @@ -40,6 +40,8 @@ ASSIGNMENT_EV_CONN_RELEASING, }; +void gsm0808_extend_osmux(struct msgb *msg, uint8_t cid); + int reassignment_request_to_lchan(enum assign_for assign_for, struct gsm_lchan *lchan, struct gsm_lchan *to_lchan, int tsc_set, int tsc); int reassignment_request_to_chan_type(enum assign_for assign_for, struct gsm_lchan *lchan, diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 02ca29c..27180ef 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -164,7 +164,7 @@ } } -static void _gsm0808_ass_compl_extend_osmux(struct msgb *msg, uint8_t cid) +void gsm0808_extend_osmux(struct msgb *msg, uint8_t cid) { OSMO_ASSERT(msg->l3h[1] == msgb_l3len(msg) - 2); /*TL not in len */ msgb_tv_put(msg, GSM0808_IE_OSMO_OSMUX_CID, cid); @@ -245,7 +245,7 @@ if (gscon_is_aoip(conn) && bsc_chan_ind_requires_rtp_stream(conn->assignment.ch_indctr) && conn->assignment.req.use_osmux) - _gsm0808_ass_compl_extend_osmux(resp, osmux_cid); + gsm0808_extend_osmux(resp, osmux_cid); rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_COMPLETE)); rc = gscon_sigtran_send(conn, resp); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1452cabb142f9e7a169f4ddfeac85908abaf8dfc Gerrit-Change-Number: 33602 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Add new debug category "ASCI" for VGCS/VBS state machines

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33604 ) Change subject: ASCI: Add new debug category "ASCI" for VGCS/VBS state machines ...................................................................... ASCI: Add new debug category "ASCI" for VGCS/VBS state machines Change-Id: I4714fa4ff2b1327183a365223a3e3d89ae0357f7 Related: OS#4852 --- M include/osmocom/bsc/debug.h M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/04/33604/1 diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h index a3cad68..a61753d 100644 --- a/include/osmocom/bsc/debug.h +++ b/include/osmocom/bsc/debug.h @@ -28,6 +28,7 @@ DAS, DCBS, DLCS, + DASCI, DRESET, DLOOP, Debug_LastEntry, diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 0757da0..ec6ad5d 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -829,6 +829,12 @@ .description = "Location Services", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DASCI] = { + .name = "DASCI", + .description = "Advanced Speech Call Items", + .color = "\033[1;38m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, [DRESET] = { .name = "DRESET", .description = "RESET/ACK on A and Lb interfaces", -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4714fa4ff2b1327183a365223a3e3d89ae0357f7 Gerrit-Change-Number: 33604 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Make bssmap_handle_ass_req_ct_speech() publically available.

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33603 ) Change subject: ASCI: Make bssmap_handle_ass_req_ct_speech() publically available. ...................................................................... ASCI: Make bssmap_handle_ass_req_ct_speech() publically available. This function is also used by the VGCS/VBS call control. Change-Id: Ifc1e315d5282f01f8d1bd600d62476c2ae74eca9 Related: OS#4852 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 20 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/33603/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index d504ce6..c81ff0d 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -742,12 +742,13 @@ * find an alternate setting here, this one will be tried secondly if our * primary choice fails. */ static int select_codecs(struct assignment_request *req, const struct gsm0808_channel_type *ct, - struct gsm_subscriber_connection *conn) + struct gsm_subscriber_connection *conn, struct gsm_bts *bts) { int rc, i, nc = 0; struct bsc_msc_data *msc; - struct gsm_bts *bts = conn_get_bts(conn); + if (!bts) + bts = conn_get_bts(conn); if (!bts) { LOGP(DMSC, LOGL_ERROR, "No lchan, cannot select codecs\n"); return -EINVAL; @@ -1023,9 +1024,9 @@ return 0; } -static int bssmap_handle_ass_req_ct_speech(struct gsm_subscriber_connection *conn, struct tlv_parsed *tp, - struct gsm0808_channel_type *ct, struct assignment_request *req, - uint8_t *cause) +int bssmap_handle_ass_req_ct_speech(struct gsm_subscriber_connection *conn, struct gsm_bts *bts, + struct tlv_parsed *tp, struct gsm0808_channel_type *ct, + struct assignment_request *req, uint8_t *cause) { bool aoip = gscon_is_aoip(conn); int rc; @@ -1049,7 +1050,7 @@ /* Match codec information from the assignment command against the * local preferences of the BSC and BTS */ - rc = select_codecs(req, ct, conn); + rc = select_codecs(req, ct, conn, bts); if (rc < 0) { *cause = GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL; return -1; @@ -1129,7 +1130,7 @@ goto reject; break; case GSM0808_CHAN_SPEECH: - if (bssmap_handle_ass_req_ct_speech(conn, &tp, &ct, &req, &cause) < 0) + if (bssmap_handle_ass_req_ct_speech(conn, NULL, &tp, &ct, &req, &cause) < 0) goto reject; break; case GSM0808_CHAN_SIGN: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifc1e315d5282f01f8d1bd600d62476c2ae74eca9 Gerrit-Change-Number: 33603 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Do not release channel, if SAPI 0 is released

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33605 ) Change subject: ASCI: Do not release channel, if SAPI 0 is released ...................................................................... ASCI: Do not release channel, if SAPI 0 is released A VGCS channel must not release, if all SAPIs (including 0) are released. lchan FSM will ignore this. Change-Id: Ief1e1894362c4917f6e0092268690f68c8193750 Related: OS#4852 --- M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 29 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/33605/1 diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index b179a7f..cf9f20f 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -78,6 +78,8 @@ 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); diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 33ae6cf..8e9d698 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -69,6 +69,13 @@ } } +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,11 @@ /* 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 channel may have all SAPIs (including SAPI 0) released.. */ + 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 +1267,8 @@ 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; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ief1e1894362c4917f6e0092268690f68c8193750 Gerrit-Change-Number: 33605 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Do not wait for RLL establishment

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33606 ) Change subject: ASCI: Do not wait for RLL establishment ...................................................................... ASCI: Do not wait for RLL establishment A VGCS channel is established, even if there is no RLL establishmnt. RLL connection can be established or released by the talker, while the channel is kept in established state all the time. Change-Id: I96390924736029b92e54590157e38093be749dd9 Related: OS#4852 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/33606/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 8e9d698..816d4b5 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1040,9 +1040,10 @@ else if (requires_rtp_stream) lchan_rtp_fsm_start(lchan); - /* When activating a channel for VTY, skip waiting for activity from + /* When activating a channel for VTY or VGCS/VBS, skip waiting for activity from * lchan_rtp_fsm, but only if no rtp stream is required. */ - if (lchan->activate.info.activ_for == ACTIVATE_FOR_VTY && !requires_rtp_stream) { + if ((lchan->activate.info.activ_for == ACTIVATE_FOR_VTY + || lchan->activate.info.activ_for == ACTIVATE_FOR_VGCS_CHANNEL) && !requires_rtp_stream) { lchan_fsm_state_chg(LCHAN_ST_ESTABLISHED); } } @@ -1065,7 +1066,8 @@ return; case LCHAN_EV_RTP_READY: - if (lchan->sapis[0] != LCHAN_SAPI_UNUSED) + /* If RLL was established or if it does not need to be establised, because of VGCS/VBS channel. */ + if (lchan->sapis[0] != LCHAN_SAPI_UNUSED || lchan->activate.info.activ_for == ACTIVATE_FOR_VGCS_CHANNEL) lchan_fsm_state_chg(LCHAN_ST_ESTABLISHED); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96390924736029b92e54590157e38093be749dd9 Gerrit-Change-Number: 33606 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Add support for sending RSL UNIT-DATA towards BTS

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33607 ) Change subject: ASCI: Add support for sending RSL UNIT-DATA towards BTS ...................................................................... ASCI: Add support for sending RSL UNIT-DATA towards BTS This is required to send UPLINK FREE and UPLINK BUSY messages to the BTS. Change-Id: I25e80f079989a4c7dede58c327c22b958784f3ff Related: OS#4852 --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/gsm_04_08_rr.c 3 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/33607/1 diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index 83e8f7d..3da0d6c 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -62,6 +62,7 @@ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, uint8_t power_command); int rsl_data_request(struct msgb *msg, uint8_t link_id); +int rsl_unit_data_request(struct msgb *msg, uint8_t link_id); int rsl_establish_request(struct gsm_lchan *lchan, uint8_t link_id); int rsl_relase_request(struct gsm_lchan *lchan, uint8_t link_id); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index f3ab8d6..1b02450 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1157,6 +1157,31 @@ return abis_rsl_sendmsg(msg); } +/* Send "UNIT DATA REQUEST" message with given L3 Info payload */ +/* Chapter 8.3.11 */ +int rsl_unit_data_request(struct msgb *msg, uint8_t link_id) +{ + int chan_nr; + + if (msg->lchan == NULL) { + LOGP(DRSL, LOGL_ERROR, "cannot send UNIT DATA REQUEST to unknown lchan\n"); + msgb_free(msg); + return -EINVAL; + } + + chan_nr = gsm_lchan2chan_nr(msg->lchan, true); + if (chan_nr < 0) { + msgb_free(msg); + return chan_nr; + } + + rsl_rll_push_l3(msg, RSL_MT_UNIT_DATA_REQ, chan_nr, link_id, 1); + + msg->dst = rsl_chan_link(msg->lchan); + + return abis_rsl_sendmsg(msg); +} + /* Send "ESTABLISH REQUEST" message with given L3 Info payload */ /* Chapter 8.3.1 */ int rsl_establish_request(struct gsm_lchan *lchan, uint8_t link_id) diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index ae54cf5..5c2b0f8 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -57,6 +57,15 @@ return rsl_data_request(msg, 0); } +int gsm48_sendmsg_unit(struct msgb *msg) +{ + if (msg->lchan) + msg->dst = rsl_chan_link(msg->lchan); + + msg->l3h = msg->data; + return rsl_unit_data_request(msg, 0); +} + /* Section 9.1.8 / Table 9.9 */ struct chreq { uint8_t val; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I25e80f079989a4c7dede58c327c22b958784f3ff Gerrit-Change-Number: 33607 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Send UPLINK RELEASE on dedicated channel to MSC

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33609 ) Change subject: ASCI: Send UPLINK RELEASE on dedicated channel to MSC ...................................................................... ASCI: Send UPLINK RELEASE on dedicated channel to MSC If the phone is (still) on a dedicated channel, it may release the uplink in case of a voice group call. It depends on the MSC how to handle the situation. Currently it releases the call. Generally the phone is assigned to the VGCS/VBS channel before it releases the uplink. Change-Id: Ib91c282ed36e82b38c0e738533e3a421de81a9a8 Related: OS#4852 --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/33609/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 6d74e43..78a4f45 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -1170,6 +1170,12 @@ * according to spec */ bsc_dtap(conn, link_id, msg); break; + case GSM48_MT_RR_UPLINK_RELEASE: + /* When the calling phone releases the uplink before it has been assigned to the group + * channel, it will send an UPLINK RELEASE message on the dedicated channel. The MSC + * has to take care of it. (assigning the phone to the group channel) */ + bsc_dtap(conn, link_id, msg); + break; default: /* Drop unknown RR message */ LOG_LCHAN(msg->lchan, LOGL_NOTICE, "Unknown RR message: %s\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib91c282ed36e82b38c0e738533e3a421de81a9a8 Gerrit-Change-Number: 33609 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2023