osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/33590 ) Change subject: gsm48_cc_tx_setup: use MNCC bcaps for CSD ...................................................................... gsm48_cc_tx_setup: use MNCC bcaps for CSD Use the MNCC bearer capabilities in CC setup for CSD, if available. Note that in the MNCC_F_BEARER_CAP code path sdp_audio_codecs_set_csd() also gets called by trans_cc_set_remote_from_bc(). Related: OS#4394 Change-Id: I56e49ebc41696912a81b8f4f63fbc36d0b605e9e --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/90/33590/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 5664f4c..8773db7 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -826,7 +826,16 @@ "Got no information of remote audio codecs: neither SDP nor Bearer Capability. Trying anyway.\n"); break; case GSM48_BCAP_ITCAP_UNR_DIG_INF: - sdp_audio_codecs_set_csd(&trans->cc.codecs.ms); + if (setup->fields & MNCC_F_BEARER_CAP) { + trans->cc.remote = (struct sdp_msg){}; + trans_cc_set_remote_from_bc(trans, &setup->bearer_cap); + LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s Bearer Cap: remote=%s\n", + get_mncc_name(setup->msg_type), sdp_msg_to_str(&trans->cc.remote)); + } else { + LOG_TRANS(trans, LOGL_INFO, + "Got no information of remote Bearer Capability. Trying anyway.\n"); + sdp_audio_codecs_set_csd(&trans->cc.codecs.ms); + } break; default: LOG_TRANS(trans, LOGL_ERROR, "Handling of information transfer capability %d not implemented\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I56e49ebc41696912a81b8f4f63fbc36d0b605e9e Gerrit-Change-Number: 33590 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de> Gerrit-MessageType: newchange