September 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-msc[master]: gsm48_cc_tx_setup_set_bearer_cap: split out

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/41040?usp=email ) Change subject: gsm48_cc_tx_setup_set_bearer_cap: split out ...................................................................... gsm48_cc_tx_setup_set_bearer_cap: split out Change-Id: I3fe6bb2af90d729bb32cae8f5a1a38dcf8f87eb9 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 76 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/40/41040/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 677776f..46f72dc 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -911,6 +911,79 @@ return 0; } +/* Compose Bearer Capability information that reflects only the codecs (Speech + * Versions) / CSD bearer services remaining after intersecting MS, BSS and + * remote call leg restrictions. To store in trans for later use, and to + * include in the outgoing CC Setup message. */ +static int gsm48_cc_tx_setup_set_bearer_cap(struct gsm_trans *trans, const struct gsm_mncc *setup, + struct gsm_mncc_bearer_cap *bearer_cap) +{ + int rc; + + switch (trans->bearer_cap.transfer) { + case GSM48_BCAP_ITCAP_SPEECH: + *bearer_cap = (struct gsm_mncc_bearer_cap){ + .speech_ver = { -1 }, + }; + sdp_audio_codecs_to_bearer_cap(bearer_cap, &trans->cc.local.audio_codecs); + rc = bearer_cap_set_radio(bearer_cap); + if (rc) { + LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n"); + return -1; + } + /* If no resulting codecs remain, error out. We cannot find a + * codec that matches both call legs. If the MGW were able to + * transcode, we could use non-identical codecs on each conn of + * the MGW endpoint, but we are aiming for finding a matching + * codec. */ + if (bearer_cap->speech_ver[0] == -1) { + LOG_TRANS(trans, LOGL_ERROR, "%s: no codec match possible: %s\n", + get_mncc_name(setup->msg_type), + codec_filter_to_str(&trans->cc.codecs, &trans->cc.local, &trans->cc.remote)); + + /* incompatible codecs */ + rc = mncc_release_ind(trans->net, trans, trans->callref, + GSM48_CAUSE_LOC_PRN_S_LU, + GSM48_CC_CAUSE_INCOMPAT_DEST /* TODO: correct cause code? */); + trans->callref = 0; + return -1; + } + rc = bearer_cap_filter_rev_lev(bearer_cap, trans->vsub->classmark.classmark1.rev_lev); + if (rc) { + LOG_TRANS(trans, LOGL_ERROR, "No codec offered is supported by phase 1 mobile.\n"); + return -1; + } + break; + case GSM48_BCAP_ITCAP_3k1_AUDIO: + case GSM48_BCAP_ITCAP_FAX_G3: + case GSM48_BCAP_ITCAP_UNR_DIG_INF: + *bearer_cap = (struct gsm_mncc_bearer_cap){ + .transfer = trans->bearer_cap.transfer, + .mode = GSM48_BCAP_TMOD_CIRCUIT, + .coding = GSM48_BCAP_CODING_GSM_STD, + .radio = GSM48_BCAP_RRQ_FR_ONLY, + }; + + if (csd_bs_list_to_bearer_cap(bearer_cap, &trans->cc.local.bearer_services) == 0) { + LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n"); + + /* incompatible codecs */ + rc = mncc_release_ind(trans->net, trans, trans->callref, + GSM48_CAUSE_LOC_PRN_S_LU, + GSM48_CC_CAUSE_INCOMPAT_DEST /* TODO: correct cause code? */); + trans->callref = 0; + return -1; + } + break; + } + + /* Create a copy of the bearer capability in the transaction struct, so + * we can use this information later */ + trans->bearer_cap = *bearer_cap; + + return 0; +} + static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg) { struct msgb *msg; @@ -932,66 +1005,9 @@ if (rc < 0) goto error; - /* Compose Bearer Capability information that reflects only the codecs (Speech Versions) / CSD bearer services - * remaining after intersecting MS, BSS and remote call leg restrictions. To store in trans for later use, and - * to include in the outgoing CC Setup message. */ - switch (trans->bearer_cap.transfer) { - case GSM48_BCAP_ITCAP_SPEECH: - bearer_cap = (struct gsm_mncc_bearer_cap){ - .speech_ver = { -1 }, - }; - sdp_audio_codecs_to_bearer_cap(&bearer_cap, &trans->cc.local.audio_codecs); - rc = bearer_cap_set_radio(&bearer_cap); - if (rc) { - LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n"); - goto error; - } - /* If no resulting codecs remain, error out. We cannot find a codec that matches both call legs. If the MGW were - * able to transcode, we could use non-identical codecs on each conn of the MGW endpoint, but we are aiming for - * finding a matching codec. */ - if (bearer_cap.speech_ver[0] == -1) { - LOG_TRANS(trans, LOGL_ERROR, "%s: no codec match possible: %s\n", - get_mncc_name(setup->msg_type), - codec_filter_to_str(&trans->cc.codecs, &trans->cc.local, &trans->cc.remote)); - - /* incompatible codecs */ - rc = mncc_release_ind(trans->net, trans, trans->callref, - GSM48_CAUSE_LOC_PRN_S_LU, - GSM48_CC_CAUSE_INCOMPAT_DEST /* TODO: correct cause code? */); - trans->callref = 0; - goto error; - } - rc = bearer_cap_filter_rev_lev(&bearer_cap, trans->vsub->classmark.classmark1.rev_lev); - if (rc) { - LOG_TRANS(trans, LOGL_ERROR, "No codec offered is supported by phase 1 mobile.\n"); - goto error; - } - break; - case GSM48_BCAP_ITCAP_3k1_AUDIO: - case GSM48_BCAP_ITCAP_FAX_G3: - case GSM48_BCAP_ITCAP_UNR_DIG_INF: - bearer_cap = (struct gsm_mncc_bearer_cap){ - .transfer = trans->bearer_cap.transfer, - .mode = GSM48_BCAP_TMOD_CIRCUIT, - .coding = GSM48_BCAP_CODING_GSM_STD, - .radio = GSM48_BCAP_RRQ_FR_ONLY, - }; - - if (csd_bs_list_to_bearer_cap(&bearer_cap, &trans->cc.local.bearer_services) == 0) { - LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n"); - - /* incompatible codecs */ - rc = mncc_release_ind(trans->net, trans, trans->callref, - GSM48_CAUSE_LOC_PRN_S_LU, - GSM48_CC_CAUSE_INCOMPAT_DEST /* TODO: correct cause code? */); - trans->callref = 0; - goto error; - } - break; - } - - /* Create a copy of the bearer capability in the transaction struct, so we can use this information later */ - trans->bearer_cap = bearer_cap; + rc = gsm48_cc_tx_setup_set_bearer_cap(trans, setup, &bearer_cap); + if (rc < 0) + goto error; msg = gsm48_msgb_alloc_name("GSM 04.08 CC SETUP"); gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41040?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3fe6bb2af90d729bb32cae8f5a1a38dcf8f87eb9 Gerrit-Change-Number: 41040 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[M] Change in osmo-msc[master]: gsm48_cc_tx_setup_select_codecs: split out

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/41039?usp=email ) Change subject: gsm48_cc_tx_setup_select_codecs: split out ...................................................................... gsm48_cc_tx_setup_select_codecs: split out Change-Id: Ic502f9ed77ea57de4cf6d362c0e7070d9147d6f3 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 34 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/41039/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 8051dfe..677776f 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -867,35 +867,22 @@ return 0; } - -static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg) +/* MT call leg is starting. Gather all codecs information so far known. + * (Usually) paging has succeeded, and now we're processing the MNCC Setup from + * the remote MO call leg. Initialize the codecs filter with this side's BSS' + * codec list, received at Complete Layer 3. We haven't received the MT MS's + * Bearer Capabilities yet; the Bearer Capabilities handled here are actually + * the remote call leg's Bearer Capabilities. */ +static int gsm48_cc_tx_setup_select_codecs(struct gsm_trans *trans, const struct gsm_mncc *setup) { - struct msgb *msg; - struct gsm48_hdr *gh; - struct gsm_mncc *setup = arg; - int rc; - struct gsm_mncc_bearer_cap bearer_cap; - - rc = gsm48_cc_tx_setup_set_transaction_id(trans); - if (rc < 0) - goto error; - - gsm48_start_cc_timer(trans, 0x303, GSM48_T303); - - /* MT call leg is starting. Gather all codecs information so far known. - * (Usually) paging has succeeded, and now we're processing the MNCC Setup from the remote MO call leg. - * Initialize the codecs filter with this side's BSS' codec list, received at Complete Layer 3. - * We haven't received the MT MS's Bearer Capabilities yet; the Bearer Capabilities handled here are - * actually the remote call leg's Bearer Capabilities. */ trans_cc_filter_init(trans); trans_cc_filter_set_ran(trans, trans->msc_a->c.ran->type); trans_cc_filter_set_bss(trans, trans->msc_a); - if (setup->fields & MNCC_F_BEARER_CAP) - trans->bearer_cap.transfer = setup->bearer_cap.transfer; switch (trans->bearer_cap.transfer) { case GSM48_BCAP_ITCAP_SPEECH: - /* if SDP is included in the MNCC, take that as definitive list of remote audio codecs. */ + /* if SDP is included in the MNCC, take that as definitive list + * of remote audio codecs. */ rx_mncc_sdp(trans, setup->msg_type, setup->sdp, (setup->fields & MNCC_F_BEARER_CAP) ? &setup->bearer_cap : NULL); /* rx_mncc_sdp() has called trans_cc_filter_run(trans); */ @@ -918,9 +905,33 @@ default: LOG_TRANS(trans, LOGL_ERROR, "Handling of information transfer capability %d not implemented\n", trans->bearer_cap.transfer); - break; + return -1; } + return 0; +} + +static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg) +{ + struct msgb *msg; + struct gsm48_hdr *gh; + struct gsm_mncc *setup = arg; + int rc; + struct gsm_mncc_bearer_cap bearer_cap; + + rc = gsm48_cc_tx_setup_set_transaction_id(trans); + if (rc < 0) + goto error; + + gsm48_start_cc_timer(trans, 0x303, GSM48_T303); + + if (setup->fields & MNCC_F_BEARER_CAP) + trans->bearer_cap.transfer = setup->bearer_cap.transfer; + + rc = gsm48_cc_tx_setup_select_codecs(trans, setup); + if (rc < 0) + goto error; + /* Compose Bearer Capability information that reflects only the codecs (Speech Versions) / CSD bearer services * remaining after intersecting MS, BSS and remote call leg restrictions. To store in trans for later use, and * to include in the outgoing CC Setup message. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41039?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic502f9ed77ea57de4cf6d362c0e7070d9147d6f3 Gerrit-Change-Number: 41039 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[M] Change in osmo-msc[master]: gsm48_cc_tx_setup_encode_msg: split out

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/41041?usp=email ) Change subject: gsm48_cc_tx_setup_encode_msg: split out ...................................................................... gsm48_cc_tx_setup_encode_msg: split out Change-Id: I443b4b54c6ad40d852e4c21c896c2d0da5fac239 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 42 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/41041/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 46f72dc..a429bc4 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -984,10 +984,50 @@ return 0; } +static struct msgb *gsm48_cc_tx_setup_encode_msg(const struct gsm_mncc *setup, + const struct gsm_mncc_bearer_cap *bearer_cap) +{ + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC SETUP"); + struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + + gh->msg_type = GSM48_MT_CC_SETUP; + + gsm48_encode_bearer_cap(msg, 0, bearer_cap); + + /* Facility */ + if (setup->fields & MNCC_F_FACILITY) + gsm48_encode_facility(msg, 0, &setup->facility); + /* Progress */ + if (setup->fields & MNCC_F_PROGRESS) + gsm48_encode_progress(msg, 0, &setup->progress); + /* Calling party BCD number */ + if (setup->fields & MNCC_F_CALLING) + gsm48_encode_calling(msg, &setup->calling); + /* Called party BCD number */ + if (setup->fields & MNCC_F_CALLED) + gsm48_encode_called(msg, &setup->called); + /* Low layer compatibility */ + if (setup->fields & MNCC_F_LOWL_COMPAT && setup->llc.len > 0 && setup->llc.len <= sizeof(setup->llc.compat)) + msgb_tlv_put(msg, GSM48_IE_LOWL_COMPAT, setup->llc.len, setup->llc.compat); + /* High layer compatibility */ + if (setup->fields & MNCC_F_HIGHL_COMPAT && setup->hlc.len > 0 && setup->hlc.len <= sizeof(setup->hlc.compat)) + msgb_tlv_put(msg, GSM48_IE_HIGHL_COMPAT, setup->hlc.len, setup->hlc.compat); + /* User-user */ + if (setup->fields & MNCC_F_USERUSER) + gsm48_encode_useruser(msg, 0, &setup->useruser); + /* Redirecting party BCD number */ + if (setup->fields & MNCC_F_REDIRECTING) + gsm48_encode_redirecting(msg, &setup->redirecting); + /* Signal */ + if (setup->fields & MNCC_F_SIGNAL) + gsm48_encode_signal(msg, setup->signal); + + return msg; +} + static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg) { struct msgb *msg; - struct gsm48_hdr *gh; struct gsm_mncc *setup = arg; int rc; struct gsm_mncc_bearer_cap bearer_cap; @@ -1009,39 +1049,7 @@ if (rc < 0) goto error; - msg = gsm48_msgb_alloc_name("GSM 04.08 CC SETUP"); - gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); - gh->msg_type = GSM48_MT_CC_SETUP; - - gsm48_encode_bearer_cap(msg, 0, &bearer_cap); - - /* facility */ - if (setup->fields & MNCC_F_FACILITY) - gsm48_encode_facility(msg, 0, &setup->facility); - /* progress */ - if (setup->fields & MNCC_F_PROGRESS) - gsm48_encode_progress(msg, 0, &setup->progress); - /* calling party BCD number */ - if (setup->fields & MNCC_F_CALLING) - gsm48_encode_calling(msg, &setup->calling); - /* called party BCD number */ - if (setup->fields & MNCC_F_CALLED) - gsm48_encode_called(msg, &setup->called); - /* low layer compatibility */ - if (setup->fields & MNCC_F_LOWL_COMPAT && setup->llc.len > 0 && setup->llc.len <= sizeof(setup->llc.compat)) - msgb_tlv_put(msg, GSM48_IE_LOWL_COMPAT, setup->llc.len, setup->llc.compat); - /* high layer compatibility */ - if (setup->fields & MNCC_F_HIGHL_COMPAT && setup->hlc.len > 0 && setup->hlc.len <= sizeof(setup->hlc.compat)) - msgb_tlv_put(msg, GSM48_IE_HIGHL_COMPAT, setup->hlc.len, setup->hlc.compat); - /* user-user */ - if (setup->fields & MNCC_F_USERUSER) - gsm48_encode_useruser(msg, 0, &setup->useruser); - /* redirecting party BCD number */ - if (setup->fields & MNCC_F_REDIRECTING) - gsm48_encode_redirecting(msg, &setup->redirecting); - /* signal */ - if (setup->fields & MNCC_F_SIGNAL) - gsm48_encode_signal(msg, setup->signal); + msg = gsm48_cc_tx_setup_encode_msg(setup, &bearer_cap); new_cc_state(trans, GSM_CSTATE_CALL_PRESENT); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41041?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I443b4b54c6ad40d852e4c21c896c2d0da5fac239 Gerrit-Change-Number: 41041 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-msc[master]: gsm48_cc_tx_setup: remove extra bearer_cap var

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/41042?usp=email ) Change subject: gsm48_cc_tx_setup: remove extra bearer_cap var ...................................................................... gsm48_cc_tx_setup: remove extra bearer_cap var Store the bearer capabilities directly in the transaction, instead of storing them in a separate variable first, then copying it to the transaction, then using both the separate variable and the copy in the transaction later on. The extra variable is not needed and only makes it more compilicated. Add an explicit '.transfer = GSM48_BCAP_ITCAP_SPEECH,' while at it in the speech case. This was already set implicitly because GSM48_BCAP_ITCAP_SPEECH is 0. Change-Id: I247ef10923c2875ca75e73046f4b8ed14190d4d2 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 11 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/41042/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a429bc4..63a9018 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -915,18 +915,18 @@ * Versions) / CSD bearer services remaining after intersecting MS, BSS and * remote call leg restrictions. To store in trans for later use, and to * include in the outgoing CC Setup message. */ -static int gsm48_cc_tx_setup_set_bearer_cap(struct gsm_trans *trans, const struct gsm_mncc *setup, - struct gsm_mncc_bearer_cap *bearer_cap) +static int gsm48_cc_tx_setup_set_bearer_cap(struct gsm_trans *trans, const struct gsm_mncc *setup) { int rc; switch (trans->bearer_cap.transfer) { case GSM48_BCAP_ITCAP_SPEECH: - *bearer_cap = (struct gsm_mncc_bearer_cap){ + trans->bearer_cap = (struct gsm_mncc_bearer_cap){ + .transfer = GSM48_BCAP_ITCAP_SPEECH, .speech_ver = { -1 }, }; - sdp_audio_codecs_to_bearer_cap(bearer_cap, &trans->cc.local.audio_codecs); - rc = bearer_cap_set_radio(bearer_cap); + sdp_audio_codecs_to_bearer_cap(&trans->bearer_cap, &trans->cc.local.audio_codecs); + rc = bearer_cap_set_radio(&trans->bearer_cap); if (rc) { LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n"); return -1; @@ -936,7 +936,7 @@ * transcode, we could use non-identical codecs on each conn of * the MGW endpoint, but we are aiming for finding a matching * codec. */ - if (bearer_cap->speech_ver[0] == -1) { + if (trans->bearer_cap.speech_ver[0] == -1) { LOG_TRANS(trans, LOGL_ERROR, "%s: no codec match possible: %s\n", get_mncc_name(setup->msg_type), codec_filter_to_str(&trans->cc.codecs, &trans->cc.local, &trans->cc.remote)); @@ -948,7 +948,7 @@ trans->callref = 0; return -1; } - rc = bearer_cap_filter_rev_lev(bearer_cap, trans->vsub->classmark.classmark1.rev_lev); + rc = bearer_cap_filter_rev_lev(&trans->bearer_cap, trans->vsub->classmark.classmark1.rev_lev); if (rc) { LOG_TRANS(trans, LOGL_ERROR, "No codec offered is supported by phase 1 mobile.\n"); return -1; @@ -957,14 +957,14 @@ case GSM48_BCAP_ITCAP_3k1_AUDIO: case GSM48_BCAP_ITCAP_FAX_G3: case GSM48_BCAP_ITCAP_UNR_DIG_INF: - *bearer_cap = (struct gsm_mncc_bearer_cap){ + trans->bearer_cap = (struct gsm_mncc_bearer_cap){ .transfer = trans->bearer_cap.transfer, .mode = GSM48_BCAP_TMOD_CIRCUIT, .coding = GSM48_BCAP_CODING_GSM_STD, .radio = GSM48_BCAP_RRQ_FR_ONLY, }; - if (csd_bs_list_to_bearer_cap(bearer_cap, &trans->cc.local.bearer_services) == 0) { + if (csd_bs_list_to_bearer_cap(&trans->bearer_cap, &trans->cc.local.bearer_services) == 0) { LOG_TRANS(trans, LOGL_ERROR, "Error composing Bearer Capability for CC Setup\n"); /* incompatible codecs */ @@ -977,10 +977,6 @@ break; } - /* Create a copy of the bearer capability in the transaction struct, so - * we can use this information later */ - trans->bearer_cap = *bearer_cap; - return 0; } @@ -1030,7 +1026,6 @@ struct msgb *msg; struct gsm_mncc *setup = arg; int rc; - struct gsm_mncc_bearer_cap bearer_cap; rc = gsm48_cc_tx_setup_set_transaction_id(trans); if (rc < 0) @@ -1045,11 +1040,11 @@ if (rc < 0) goto error; - rc = gsm48_cc_tx_setup_set_bearer_cap(trans, setup, &bearer_cap); + rc = gsm48_cc_tx_setup_set_bearer_cap(trans, setup); if (rc < 0) goto error; - msg = gsm48_cc_tx_setup_encode_msg(setup, &bearer_cap); + msg = gsm48_cc_tx_setup_encode_msg(setup, &trans->bearer_cap); new_cc_state(trans, GSM_CSTATE_CALL_PRESENT); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41042?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I247ef10923c2875ca75e73046f4b8ed14190d4d2 Gerrit-Change-Number: 41042 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-msc[master]: gsm48_cc_tx_setup: fix speech bearer capabilities

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/41043?usp=email ) Change subject: gsm48_cc_tx_setup: fix speech bearer capabilities ...................................................................... gsm48_cc_tx_setup: fix speech bearer capabilities Send the bearer capability IE from 3GPP TS 24.008 § D.1.2 for speech instead of the result from gsm48_cc_tx_setup_set_bearer_cap() for the network to MS direction. This is needed, because: - We shall send spares for radio (which happens to be the same as GSM48_BCAP_RRQ_FR_ONLY in the MS to network direction, see 3GPP TS 24.008 § D.1.1 and Table 10.5.102). - We could send a speech version list in theory that MS are then supposed to ignore (end of Table 10.5.103), but this causes bugs in some MS so it is better to not send it (OS#6656). Related: OS#6657, OS#6655, OS#6656 Related: osmo-ttcn3-hacks I8fd33cf2f7fb8a1c34851ecf54fccddd2efd0536 Change-Id: I7046e9244fd9d4301ee2c4df1147a619f753739c --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/41043/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 63a9018..198d9d5 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -913,8 +913,7 @@ /* Compose Bearer Capability information that reflects only the codecs (Speech * Versions) / CSD bearer services remaining after intersecting MS, BSS and - * remote call leg restrictions. To store in trans for later use, and to - * include in the outgoing CC Setup message. */ + * remote call leg restrictions. To store in trans for later use. */ static int gsm48_cc_tx_setup_set_bearer_cap(struct gsm_trans *trans, const struct gsm_mncc *setup) { int rc; @@ -981,14 +980,31 @@ } static struct msgb *gsm48_cc_tx_setup_encode_msg(const struct gsm_mncc *setup, - const struct gsm_mncc_bearer_cap *bearer_cap) + const struct gsm_mncc_bearer_cap *bearer_cap_orig) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC SETUP"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); + struct gsm_mncc_bearer_cap bearer_cap = *bearer_cap_orig; gh->msg_type = GSM48_MT_CC_SETUP; - gsm48_encode_bearer_cap(msg, 0, bearer_cap); + /* Send the bearer capability IE from 3GPP TS 24.008 § D.1.2 for speech + * instead of the result from gsm48_cc_tx_setup_set_bearer_cap() for + * the network to MS direction. This is needed, because: + * - We shall send spares for radio (which happens to be the same as + * GSM48_BCAP_RRQ_FR_ONLY in the MS to network direction, see 3GPP + * TS 24.008 § D.1.1 and Table 10.5.102). + * - We could send a speech version list in theory that MS are then + * supposed to ignore (end of Table 10.5.103), but this causes bugs + * in some MS so it is better to not send it (OS#6656). */ + if (bearer_cap.transfer == GSM48_BCAP_ITCAP_SPEECH) + bearer_cap = (struct gsm_mncc_bearer_cap){ + .transfer = GSM48_BCAP_ITCAP_SPEECH, + .radio = GSM48_BCAP_RRQ_FR_ONLY, /* spare */ + .speech_ver = { -1 }, + }; + + gsm48_encode_bearer_cap(msg, 0, &bearer_cap); /* Facility */ if (setup->fields & MNCC_F_FACILITY) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41043?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7046e9244fd9d4301ee2c4df1147a619f753739c Gerrit-Change-Number: 41043 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: sctp_proxy: return handler Pid in fetch_info/0

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40904?usp=email ) Change subject: sctp_proxy: return handler Pid in fetch_info/0 ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Fine, I'm just mentioning because afaics there are several patches adding functions, etc. […] I've updated the commit message. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40904?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I3911bfc107fea3ca572cf44f1d93b768b3c82b4f Gerrit-Change-Number: 40904 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Sep 2025 12:04:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1gw_metrics: export metric types

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40907?usp=email ) Change subject: s1gw_metrics: export metric types ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40907?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I57f0a8bbc83ec4732742ec16fe09abd2aea8127b Gerrit-Change-Number: 40907 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Sep 2025 12:03:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 4 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: add fetch_enb_info/1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41030?usp=email ) Change subject: s1ap_proxy: add fetch_enb_info/1 ...................................................................... s1ap_proxy: add fetch_enb_info/1 This is useful for introspection and the upcoming REST interface. Change-Id: I79fcb599274c78d8f58e6c774a4f8c64c2fb08b5 --- M src/s1ap_proxy.erl 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/30/41030/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index a08f61d..a55746f 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -44,6 +44,7 @@ process_pdu/2, fetch_erab/2, fetch_erab_list/1, + fetch_enb_info/1, shutdown/1]). -include_lib("kernel/include/logger.hrl"). @@ -87,7 +88,13 @@ -type proxy_state() :: #proxy_state{}. -type proxy_action() :: forward | reply | drop. --export_type([proxy_action/0]). +-type enb_info() :: #{enb_id => non_neg_integer(), + plmn_id => plmn_id(), + genb_id_str => string() + }. + +-export_type([proxy_action/0, + enb_info/0]). %% ------------------------------------------------------------------ @@ -119,6 +126,12 @@ gen_server:call(Pid, ?FUNCTION_NAME). +%% Fetch information about the eNB +-spec fetch_enb_info(pid()) -> enb_info(). +fetch_enb_info(Pid) -> + gen_server:call(Pid, ?FUNCTION_NAME). + + -spec shutdown(pid()) -> ok. shutdown(Pid) -> gen_server:stop(Pid). @@ -149,6 +162,17 @@ #proxy_state{erabs = ERABs} = S) -> {reply, dict:to_list(ERABs), S}; +handle_call(fetch_enb_info, _From, + #proxy_state{enb_id = EnbId, + plmn_id = PLMNId, + genb_id_str = GlobalENBId} = S) -> + Info = #{enb_id => EnbId, + plmn_id => PLMNId, + genb_id_str => GlobalENBId}, + %% omit fields with Value =:= undefined + Reply = maps:filter(fun(_K, V) -> V =/= undefined end, Info), + {reply, Reply, S}; + handle_call(Info, From, #proxy_state{} = S) -> ?LOG_ERROR("unknown ~p() from ~p: ~p", [?FUNCTION_NAME, From, Info]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41030?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I79fcb599274c78d8f58e6c774a4f8c64c2fb08b5 Gerrit-Change-Number: 41030 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: add type spec for the eNB-ID

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41031?usp=email ) Change subject: s1ap_proxy: add type spec for the eNB-ID ...................................................................... s1ap_proxy: add type spec for the eNB-ID Change-Id: Ieee55256f1b90a6cf498faedcf11f15da1423c4d --- M src/s1ap_proxy.erl 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/31/41031/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index a55746f..c60c45b 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -64,11 +64,11 @@ -type s1ap_ie_id() :: non_neg_integer(). -type s1ap_ie_val() :: tuple(). +-type enb_id() :: 0..16#fffffff. -type mme_ue_id() :: 0..16#ffffffff. -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. -type erab_uid() :: {mme_ue_id(), erab_id()}. - -type plmn_id() :: {MCC :: nonempty_string(), MNC :: nonempty_string()}. @@ -88,7 +88,7 @@ -type proxy_state() :: #proxy_state{}. -type proxy_action() :: forward | reply | drop. --type enb_info() :: #{enb_id => non_neg_integer(), +-type enb_info() :: #{enb_id => enb_id(), plmn_id => plmn_id(), genb_id_str => string() }. @@ -254,7 +254,7 @@ [?UNHEX(D1), ?UNHEX(D2), ?UNHEX(D3)]. --spec parse_enb_id(tuple()) -> non_neg_integer(). +-spec parse_enb_id(tuple()) -> enb_id(). parse_enb_id({'macroENB-ID', << ID:20 >>}) -> ID; parse_enb_id({'homeENB-ID', << ID:28 >>}) -> ID; parse_enb_id({'short-macroENB-ID', << ID:18 >>}) -> ID; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41031?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ieee55256f1b90a6cf498faedcf11f15da1423c4d Gerrit-Change-Number: 41031 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41032?usp=email ) Change subject: s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2 ...................................................................... s1ap_proxy_test: do more s1ap_proxy:fetch_erab/2 Just like we do in test_e_rab_setup[_dup], let's test fetching E-RAB info by UID in test_initial_context_setup[_dup] for the sake of completeness and consistency. Change-Id: I8e9ffc22be3bc352a8d3022b1c7b0c50699ff493 --- M test/s1ap_proxy_test.erl 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/32/41032/1 diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 60b09dc..9015934 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -375,6 +375,7 @@ ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), + ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {1, 5})), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. @@ -388,6 +389,7 @@ ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRspIn)), %% duplicate INITIAL CONTEXT SETUP REQUEST results in the PDU being dropped ?_assertEqual({drop, InitCtxSetupReqIn}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)), + ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {1, 5})), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41032?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8e9ffc22be3bc352a8d3022b1c7b0c50699ff493 Gerrit-Change-Number: 41032 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025