From a60f344212855dc8c9b3efe8b6a8ccdb3045e5ee Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 12 Feb 2018 16:44:32 +0100 Subject: HO: store speech codec list from BSSMAP Assignment in conn On BSSMAP Assignment Request received from the MSC, store the Speech Codec List in the subscr conn, so that we may evaluate available codecs during handover decision. (Will be used, e.g., by handover_decision_2.) Change-Id: I8222d73085eb777696e365c94214c05d56e6d129 --- include/osmocom/bsc/gsm_data.h | 10 ++++++++++ src/osmo-bsc/osmo_bsc_bssap.c | 8 +++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index b8f8f81f8..c730d9641 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -12,6 +12,7 @@ #include #include #include +#include #include @@ -111,6 +112,15 @@ struct gsm_subscriber_connection { unsigned int ho_dtap_cache_len; struct penalty_timers *ho_penalty_timers; + + /* "Codec List (MSC Preferred)" as received by the BSSAP Assignment Request. 3GPP 48.008 + * 3.2.2.103 says: + * The "Codec List (MSC Preferred)" shall not include codecs + * that are not supported by the MS. + * i.e. by heeding the "Codec list (MSC Preferred)", we inherently heed the MS bearer + * capabilities, which the MSC is required to translate into the codec list. */ + struct gsm0808_speech_codec_list codec_list; + bool codec_list_present; }; diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 9bd3fe9a1..0adc001be 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -741,7 +741,6 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn, bool aoip = false; struct sockaddr_storage rtp_addr; struct gsm0808_channel_type ct; - struct gsm0808_speech_codec_list scl; struct gsm0808_speech_codec_list *scl_ptr = NULL; int rc; @@ -800,6 +799,7 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn, } /* Decode speech codec list (AoIP) */ + conn->conn->codec_list_present = false; if (aoip) { /* Check for speech codec list element */ if (!TLVP_PRESENT(&tp, GSM0808_IE_SPEECH_CODEC_LIST)) { @@ -809,14 +809,16 @@ static int bssmap_handle_assignm_req(struct osmo_bsc_sccp_con *conn, } /* Decode Speech Codec list */ - rc = gsm0808_dec_speech_codec_list(&scl, TLVP_VAL(&tp, GSM0808_IE_SPEECH_CODEC_LIST), + rc = gsm0808_dec_speech_codec_list(&conn->conn->codec_list, + TLVP_VAL(&tp, GSM0808_IE_SPEECH_CODEC_LIST), TLVP_LEN(&tp, GSM0808_IE_SPEECH_CODEC_LIST)); if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "Unable to decode speech codec list\n"); goto reject; } - scl_ptr = &scl; + conn->conn->codec_list_present = true; + scl_ptr = &conn->conn->codec_list; } /* Match codec information from the assignment command against the -- cgit v1.2.3