From 878954a1b302b0b8dee3cdb3ed863aecc0b07073 Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Fri, 21 Sep 2018 14:16:14 +0200 Subject: assignment_fsm: only include speech codec (choosen) on AoIP networks The field speech codec (choosen) in the ASSIGNMENT COMPLETE message has been specified with AoIP. Since sccp-lite has been specified before AoIP, we should not include the speech codec (choosen) field in the ASSIGNMENT COMPLETE, when osmo-bsc is connected to an sccp-lite based network. - make sure speech codec (choosen) is only included on AoIP based networks Change-Id: Ic7f28aacc953d96ebf3aa04f3e1810475458c1a8 --- src/osmo-bsc/assignment_fsm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 63776f03f..5304d6c88 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -165,10 +165,14 @@ static void send_assignment_complete(struct gsm_subscriber_connection *conn, str addr_local_p = &addr_local; } - /* Extrapolate speech codec from speech mode */ - /* FIXME: AMR codec configuration must be derived from lchan1! */ - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - sc_ptr = ≻ + /* Only AoIP networks include a speech codec (choosen) in the + * assignment complete message. */ + if (gscon_is_aoip(conn)) { + /* Extrapolate speech codec from speech mode */ + /* FIXME: AMR codec configuration must be derived from lchan1! */ + gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc_ptr = ≻ + } } resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause, -- cgit v1.2.3