Change in osmo-bsc[master]: bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9321 )

Change subject: bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite
......................................................................

bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite

Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7
---
M src/libbsc/bsc_subscr_conn_fsm.c
1 file changed, 12 insertions(+), 6 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c
index 63d99a9..66d1ab9 100644
--- a/src/libbsc/bsc_subscr_conn_fsm.c
+++ b/src/libbsc/bsc_subscr_conn_fsm.c
@@ -239,14 +239,20 @@
 
 	/* 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;
+		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 = ≻
-
+			/* Extrapolate speech codec from speech mode */
+			gsm0808_speech_codec_from_chan_type(&sc, perm_spch);
+			sc_ptr = ≻
+			break;
+		}
 		/* FIXME: AMR codec configuration must be derived from lchan1! */
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/9321
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7
Gerrit-Change-Number: 9321
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180525/999b9bf7/attachment.htm>