fixeria submitted this change.

View Change


Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved
msc_a_up_call_assignment_complete(): handle all CSD modes

Change-Id: I92f7ab11ebc2e53700b27c38e91679c2c6f72050
---
M src/libmsc/msc_a.c
1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index 38f05a6..4fb30c4 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -1465,12 +1465,18 @@
const struct codec_mapping *codec_assigned;

/* Check for unexpected codec with CSD */
- if (cc_trans->bearer_cap.transfer == GSM48_BCAP_ITCAP_UNR_DIG_INF &&
- codec_if_known->type != GSM0808_SCT_CSD) {
+ switch (cc_trans->bearer_cap.transfer) {
+ case GSM48_BCAP_ITCAP_FAX_G3:
+ case GSM48_BCAP_ITCAP_3k1_AUDIO:
+ case GSM48_BCAP_ITCAP_UNR_DIG_INF:
+ if (codec_if_known->type == GSM0808_SCT_CSD)
+ break; /* we're good */
LOG_TRANS(cc_trans, LOGL_ERROR, "Unexpected codec in Assignment Complete for CSD: %s\n",
gsm0808_speech_codec_type_name(codec_if_known->type));
call_leg_release(msc_a->cc.call_leg);
return;
+ default:
+ break;
}

/* For 2G:

To view, visit change 35881. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I92f7ab11ebc2e53700b27c38e91679c2c6f72050
Gerrit-Change-Number: 35881
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged