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

[S] Change in osmo-msc[master]: ASCI: Add function to receive VGCS/VBS messages from BSS
by laforge 19 Jul '23

19 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33504 ) Change subject: ASCI: Add function to receive VGCS/VBS messages from BSS ...................................................................... ASCI: Add function to receive VGCS/VBS messages from BSS A voice group/broadcast call has no SCCP connection that is related 1:1 to a calling or called subscriber. Instead there are multiple connections between MSC and BSS. Some of them control the uplink for each BSS and some of them assign the channels for each BTS. SCCP connections are maintained by the VGCS call control. Message from the RAN are directly forwarded to the VGCS call control. Change-Id: Ie4a2f19ba75140a6f2de02b709597239c01f02a2 Related: OS#4854 --- M include/osmocom/msc/msc_a.h M src/libmsc/ran_peer.c 2 files changed, 38 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/msc_a.h b/include/osmocom/msc/msc_a.h index 5256744..bef7417 100644 --- a/include/osmocom/msc/msc_a.h +++ b/include/osmocom/msc/msc_a.h @@ -37,6 +37,8 @@ #include <osmocom/msc/neighbor_ident.h> struct ran_infra; +struct vgcs_bss; +struct vgcs_bss_cell; #define MSC_A_USE_LOCATION_UPDATING "lu" #define MSC_A_USE_CM_SERVICE_CC "cm_service_cc" @@ -220,6 +222,9 @@ void msc_a_release_cn(struct msc_a *msc_a); void msc_a_release_mo(struct msc_a *msc_a, enum gsm48_gsm_cause gsm_cause); +int msc_a_rx_vgcs_bss(struct vgcs_bss *bss, struct ran_conn *from_conn, struct msgb *msg); +int msc_a_rx_vgcs_cell(struct vgcs_bss_cell *cell, struct ran_conn *from_conn, struct msgb *msg); + int msc_a_ran_decode_cb(struct osmo_fsm_inst *msc_a_fi, void *data, const struct ran_msg *msg); int msc_a_vlr_set_cipher_mode(void *_msc_a, bool umts_aka, bool retrieve_imeisv); diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 038ef44..880619d 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -33,6 +33,7 @@ #include <osmocom/msc/vlr.h> #include <osmocom/msc/ran_conn.h> #include <osmocom/msc/cell_id_list.h> +#include <osmocom/msc/msc_vgcs.h> static struct osmo_fsm ran_peer_fsm; @@ -393,18 +394,22 @@ OSMO_ASSERT(ctx->conn); OSMO_ASSERT(ctx->msg); - if (!ctx->conn->msc_role) { + if (ctx->conn->msc_role) { + /* "normal" A connection, dispatch to MSC-I or MSC-T */ + an_apdu = (struct an_apdu){ + .an_proto = rp->sri->ran->an_proto, + .msg = ctx->msg, + }; + osmo_fsm_inst_dispatch(ctx->conn->msc_role, MSC_EV_FROM_RAN_UP_L2, &an_apdu); + } else if (ctx->conn->vgcs.bss) { + /* VGCS call related */ + msc_a_rx_vgcs_bss(ctx->conn->vgcs.bss, ctx->conn, ctx->msg); + } else if (ctx->conn->vgcs.cell) { + /* VGCS channel related */ + msc_a_rx_vgcs_cell(ctx->conn->vgcs.cell, ctx->conn, ctx->msg); + } else LOG_RAN_PEER(rp, LOGL_ERROR, "Rx CO message on conn that is not associated with any MSC role\n"); - return; - } - - an_apdu = (struct an_apdu){ - .an_proto = rp->sri->ran->an_proto, - .msg = ctx->msg, - }; - - osmo_fsm_inst_dispatch(ctx->conn->msc_role, MSC_EV_FROM_RAN_UP_L2, &an_apdu); return; case RAN_PEER_EV_MSG_DOWN_CO_INITIAL: -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4a2f19ba75140a6f2de02b709597239c01f02a2 Gerrit-Change-Number: 33504 Gerrit-PatchSet: 19 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: ASCI: Add option to switch on or off ASCI support
by laforge 19 Jul '23

19 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33674 ) Change subject: ASCI: Add option to switch on or off ASCI support ...................................................................... ASCI: Add option to switch on or off ASCI support Switching ASCI support is controled via VTY. This added in a later patch. (Chg-Id: I5bd034a62fc8b483f550d29103c2f7587198f590) Change-Id: Id68deb69f7395f0f8f50b3820e9d51052a34f753 Related: OS#4854 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/msc_a.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c 4 files changed, 29 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 6c0dac9..119f093 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -272,6 +272,7 @@ /* ASCI feature support */ struct { + bool enable; struct llist_head gcr_lists; } asci; }; diff --git a/include/osmocom/msc/msc_a.h b/include/osmocom/msc/msc_a.h index bef7417..0276d62 100644 --- a/include/osmocom/msc/msc_a.h +++ b/include/osmocom/msc/msc_a.h @@ -217,7 +217,7 @@ int msc_a_ensure_cn_local_rtp(struct msc_a *msc_a, struct gsm_trans *cc_trans); int msc_a_try_call_assignment(struct gsm_trans *cc_trans); -const char *msc_a_cm_service_type_to_use(enum osmo_cm_service_type cm_service_type); +const char *msc_a_cm_service_type_to_use(struct msc_a *msc_a, enum osmo_cm_service_type cm_service_type); void msc_a_release_cn(struct msc_a *msc_a); void msc_a_release_mo(struct msc_a *msc_a, enum gsm48_gsm_cause gsm_cause); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index bd7cfe0..10c4a57 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -798,13 +798,13 @@ return msc_gsm48_tx_mm_serv_rej(msc_a, GSM48_REJECT_INCORRECT_MESSAGE); } - if (!msc_a_cm_service_type_to_use(req->cm_service_type)) + if (!msc_a_cm_service_type_to_use(msc_a, req->cm_service_type)) return msc_gsm48_tx_mm_serv_rej(msc_a, GSM48_REJECT_SRV_OPT_NOT_SUPPORTED); /* At this point, the CM Service Request message is being accepted. * Increment the matching use token, and from here on use msc_vlr_tx_cm_serv_rej() to respond in case of * failure. */ - msc_a_get(msc_a, msc_a_cm_service_type_to_use(req->cm_service_type)); + msc_a_get(msc_a, msc_a_cm_service_type_to_use(msc_a, req->cm_service_type)); if (msc_a_is_accepted(msc_a)) return cm_serv_reuse_conn(msc_a, &mi, req->cm_service_type); @@ -1531,7 +1531,7 @@ { struct msc_a *msc_a = msc_conn_ref; msc_gsm48_tx_mm_serv_rej(msc_a, cause); - msc_a_put(msc_a, msc_a_cm_service_type_to_use(cm_service_type)); + msc_a_put(msc_a, msc_a_cm_service_type_to_use(msc_a, cm_service_type)); return 0; } diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 7013176..9f2420e 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -2085,8 +2085,10 @@ * Given a CM Service type, return a matching token intended for osmo_use_count. * For unknown service type, return NULL. */ -const char *msc_a_cm_service_type_to_use(enum osmo_cm_service_type cm_service_type) +const char *msc_a_cm_service_type_to_use(struct msc_a *msc_a, enum osmo_cm_service_type cm_service_type) { + struct gsm_network *net = msc_a_net(msc_a); + switch (cm_service_type) { case GSM48_CMSERV_MO_CALL_PACKET: case GSM48_CMSERV_EMERGENCY: @@ -2099,10 +2101,16 @@ return MSC_A_USE_CM_SERVICE_SS; case GSM48_CMSERV_VGCS: - return MSC_A_USE_CM_SERVICE_GCC; + if (net->asci.enable) + return MSC_A_USE_CM_SERVICE_GCC; + else + return NULL; case GSM48_CMSERV_VBS: - return MSC_A_USE_CM_SERVICE_BCC; + if (net->asci.enable) + return MSC_A_USE_CM_SERVICE_BCC; + else + return NULL; default: return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id68deb69f7395f0f8f50b3820e9d51052a34f753 Gerrit-Change-Number: 33674 Gerrit-PatchSet: 7 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: ASCI: Add function to receive VGCS/VBS messages from BSS
by laforge 19 Jul '23

19 Jul '23

Attention is currently required from: jolly, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33504 ) Change subject: ASCI: Add function to receive VGCS/VBS messages from BSS ...................................................................... Patch Set 18: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4a2f19ba75140a6f2de02b709597239c01f02a2 Gerrit-Change-Number: 33504 Gerrit-PatchSet: 18 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Jul 2023 08:23:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_PCH_DT
by laforge 19 Jul '23

19 Jul '23

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33795 ) Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_PCH_DT ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibaa6d170ef0f1f61b708a872a3c2364585063503 Gerrit-Change-Number: 33795 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Jul 2023 08:22:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: ASCI: Fix wrong check for Null pointer in vgcs_cell_fsm_null()
by jolly 19 Jul '23

19 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33823 ) Change subject: ASCI: Fix wrong check for Null pointer in vgcs_cell_fsm_null() ...................................................................... ASCI: Fix wrong check for Null pointer in vgcs_cell_fsm_null() Fixes: CID#322145, CID#322141 Change-Id: Iec0820f612450cde772076131b07fe7819d35790 --- M src/libmsc/msc_vgcs.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/23/33823/1 diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index 8edda6b..1ebfeec 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -2352,12 +2352,12 @@ /* Set initial mode. */ rtp_stream_set_mode(cell->rtps, MGCP_CONN_RECV_ONLY); /* Commit RTP stream. */ - if (!cell->bss && !cell->bss->trans) { - LOG_CELL(cell, LOGL_DEBUG, "No transaction, cannot continue.\n"); + if (!cell->bss || !cell->bss->trans) { + LOG_CELL(cell, LOGL_DEBUG, "No BSS/transaction, cannot continue.\n"); cell_clear(cell, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); break; } - if (!cell->mgw && !cell->mgw->mgw_ep) { + if (!cell->mgw || !cell->mgw->mgw_ep) { LOG_CELL(cell, LOGL_DEBUG, "No MGW endpoint, cannot continue.\n"); cell_clear(cell, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iec0820f612450cde772076131b07fe7819d35790 Gerrit-Change-Number: 33823 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: ASCI: Check return code of osmo_mobile_identity_decode()
by jolly 19 Jul '23

19 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33822 ) Change subject: ASCI: Check return code of osmo_mobile_identity_decode() ...................................................................... ASCI: Check return code of osmo_mobile_identity_decode() Fixes: CID#322146 Change-Id: I15a6cf97a901cbb6c99ec2269051a351b504d338 --- M src/libmsc/ran_msg_a.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/33822/1 diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index 2533045..d2ab09f 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -976,7 +976,8 @@ /* Mobile Identity, 3.2.2.41 */ if (ie_mi) { - if (osmo_mobile_identity_decode(&r->mi, ie_mi->val, ie_mi->len, false)) { + rc = osmo_mobile_identity_decode(&r->mi, ie_mi->val, ie_mi->len, false); + if (rc < 0) { LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Decoding Mobile Identity gave rc=%d\n", rc); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15a6cf97a901cbb6c99ec2269051a351b504d338 Gerrit-Change-Number: 33822 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: ASCI: Remove check for trans->msc_a to be set in _assign_complete()
by jolly 19 Jul '23

19 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33824 ) Change subject: ASCI: Remove check for trans->msc_a to be set in _assign_complete() ...................................................................... ASCI: Remove check for trans->msc_a to be set in _assign_complete() trans->msc_a is always set when ASSIGNMENT COMPLETE is received. Fixes: CID#322144 Change-Id: I0fe16e59959b48d08d95aefa6d4415f78dcf1eb4 --- M src/libmsc/msc_vgcs.c 1 file changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/24/33824/1 diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index 1ebfeec..c6f5e16 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -967,13 +967,12 @@ { uint16_t cell_id; + OSMO_ASSERT(trans->msc_a); + /* Change state. */ osmo_fsm_inst_state_chg(trans->gcc.fi, VGCS_GCC_ST_N2_CALL_ACTIVE, 0, 0); /* Get cell ID. */ - if (trans->msc_a) - cell_id = trans->msc_a->via_cell.cell_identity; - else - LOG_GCC(trans, LOGL_ERROR, "Missing msc_a, please fix!\n"); + cell_id = trans->msc_a->via_cell.cell_identity; /* Releasing dedicated channel. */ release_msc_a(trans); /* Send CONNECT to the calling subscriber. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0fe16e59959b48d08d95aefa6d4415f78dcf1eb4 Gerrit-Change-Number: 33824 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: ASCI: Null pointer bug fix in trans_create_bcc_gcc
by jolly 19 Jul '23

19 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33821 ) Change subject: ASCI: Null pointer bug fix in trans_create_bcc_gcc ...................................................................... ASCI: Null pointer bug fix in trans_create_bcc_gcc Fixes: CID#322147 Change-Id: I1676d3cbf844930a6a433253f055a3f8fe3c210b --- M src/libmsc/msc_vgcs.c 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/33821/1 diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index 1af9aae..8edda6b 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -1321,8 +1321,8 @@ static struct gsm_trans *trans_create_bcc_gcc(struct msc_a *msc_a, enum trans_type trans_type, uint8_t transaction_id, uint8_t pdisc, uint8_t msg_type, uint32_t callref) { - struct gsm_network *net = msc_a_net(msc_a); - struct vlr_subscr *vsub = msc_a_vsub(msc_a); + struct gsm_network *net; + struct vlr_subscr *vsub; struct gsm_trans *trans = NULL; struct gcr *gcr; int rc; @@ -1331,6 +1331,9 @@ LOG_GCC(trans, LOGL_ERROR, "Invalid conn: no msc_a\n"); return NULL; } + net = msc_a_net(msc_a); + vsub = msc_a_vsub(msc_a); + if (!vsub) { LOG_GCC(trans, LOGL_ERROR, "Invalid conn: no subscriber\n"); return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1676d3cbf844930a6a433253f055a3f8fe3c210b Gerrit-Change-Number: 33821 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: ASCI: Fix Null pointer dereference bug in gsm44068_bcc_gcc_trans_free()
by jolly 19 Jul '23

19 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33826 ) Change subject: ASCI: Fix Null pointer dereference bug in gsm44068_bcc_gcc_trans_free() ...................................................................... ASCI: Fix Null pointer dereference bug in gsm44068_bcc_gcc_trans_free() Fixes: CID#322142 Change-Id: Iab0b66dfcfdb870eaec4611720ce3a5f2089bd21 --- M src/libmsc/msc_vgcs.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/33826/1 diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index ca1fa97..3970308 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -1531,12 +1531,11 @@ { struct vgcs_bss *bss, *bss2; - /* Change state. */ - osmo_fsm_inst_state_chg(trans->gcc.fi, VGCS_GCC_ST_N0_NULL, 0, 0); - /* Free FSM. */ - if (trans->gcc.fi) + if (trans->gcc.fi) { + osmo_fsm_inst_state_chg(trans->gcc.fi, VGCS_GCC_ST_N0_NULL, 0, 0); osmo_fsm_inst_term(trans->gcc.fi, OSMO_FSM_TERM_REGULAR, NULL); + } /* Remove relations to cells. * We must loop safe, because bss_clear() will detach every call control instance from list. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iab0b66dfcfdb870eaec4611720ce3a5f2089bd21 Gerrit-Change-Number: 33826 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: ASCI: Check if codec mapping exists for given codec
by jolly 19 Jul '23

19 Jul '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33825 ) Change subject: ASCI: Check if codec mapping exists for given codec ...................................................................... ASCI: Check if codec mapping exists for given codec Fixes: CID#322143 Change-Id: I65cdf2b7feaa72167c8002cd4d47183f99cab761 --- M src/libmsc/msc_vgcs.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/25/33825/1 diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index c6f5e16..ca1fa97 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -2347,6 +2347,11 @@ } /* Hard coded codec: GSM V1 */ cm = codec_mapping_by_gsm0808_speech_codec_type(GSM0808_SCT_FR1); + if (!cm) { + LOG_CELL(cell, LOGL_DEBUG, "Selected codec not supported, cannot continue.\n"); + cell_clear(cell, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC); + break; + } rtp_stream_set_one_codec(cell->rtps, &cm->sdp); /* Set initial mode. */ rtp_stream_set_mode(cell->rtps, MGCP_CONN_RECV_ONLY); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I65cdf2b7feaa72167c8002cd4d47183f99cab761 Gerrit-Change-Number: 33825 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0