aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-05-25 17:53:39 +0200
committerHarald Welte <laforge@gnumonks.org>2018-05-25 18:58:16 +0000
commit200a0e2d0a56312540270ba804c2327f45709c06 (patch)
treef145965cd1140a15a37d7349c7e6e50ab442dd2e
parentf6029bac5e8f109f9c81fe0b4f5465bffff9b9f3 (diff)
bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite
-rw-r--r--src/libbsc/bsc_subscr_conn_fsm.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c
index 63d99a9d7..66d1ab95a 100644
--- a/src/libbsc/bsc_subscr_conn_fsm.c
+++ b/src/libbsc/bsc_subscr_conn_fsm.c
@@ -239,14 +239,20 @@ static void send_ass_compl(struct gsm_lchan *lchan, struct osmo_fsm_inst *fi, bo
/* Generate voice related fields */
if (voice) {
- OSMO_ASSERT(lchan->abis_ip.ass_compl.valid);
perm_spch = bssap_speech_from_lchan(lchan);
- addr_local = &conn->user_plane.aoip_rtp_addr_local;
-
- /* Extrapolate speech codec from speech mode */
- gsm0808_speech_codec_from_chan_type(&sc, perm_spch);
- sc_ptr = &sc;
+ switch (conn->sccp.msc->a.asp_proto) {
+ case OSMO_SS7_ASP_PROT_IPA:
+ /* don't add any AoIP specific fields. CIC allocated by MSC */
+ break;
+ default:
+ OSMO_ASSERT(lchan->abis_ip.ass_compl.valid);
+ addr_local = &conn->user_plane.aoip_rtp_addr_local;
+ /* Extrapolate speech codec from speech mode */
+ gsm0808_speech_codec_from_chan_type(&sc, perm_spch);
+ sc_ptr = &sc;
+ break;
+ }
/* FIXME: AMR codec configuration must be derived from lchan1! */
}