<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9321">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite<br><br>Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7<br>---<br>M src/libbsc/bsc_subscr_conn_fsm.c<br>1 file changed, 12 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>index 63d99a9..66d1ab9 100644</span><br><span>--- a/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -239,14 +239,20 @@</span><br><span> </span><br><span>    /* Generate voice related fields */</span><br><span>  if (voice) {</span><br><span style="color: hsl(0, 100%, 40%);">-            OSMO_ASSERT(lchan->abis_ip.ass_compl.valid);</span><br><span>              perm_spch = bssap_speech_from_lchan(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-             addr_local = &conn->user_plane.aoip_rtp_addr_local;</span><br><span style="color: hsl(120, 100%, 40%);">+            switch (conn->sccp.msc->a.asp_proto) {</span><br><span style="color: hsl(120, 100%, 40%);">+          case OSMO_SS7_ASP_PROT_IPA:</span><br><span style="color: hsl(120, 100%, 40%);">+                   /* don't add any AoIP specific fields. CIC allocated by MSC */</span><br><span style="color: hsl(120, 100%, 40%);">+                    break;</span><br><span style="color: hsl(120, 100%, 40%);">+                default:</span><br><span style="color: hsl(120, 100%, 40%);">+                      OSMO_ASSERT(lchan->abis_ip.ass_compl.valid);</span><br><span style="color: hsl(120, 100%, 40%);">+                       addr_local = &conn->user_plane.aoip_rtp_addr_local;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-          /* Extrapolate speech codec from speech mode */</span><br><span style="color: hsl(0, 100%, 40%);">-         gsm0808_speech_codec_from_chan_type(&sc, perm_spch);</span><br><span style="color: hsl(0, 100%, 40%);">-                sc_ptr = &sc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+                     /* Extrapolate speech codec from speech mode */</span><br><span style="color: hsl(120, 100%, 40%);">+                       gsm0808_speech_codec_from_chan_type(&sc, perm_spch);</span><br><span style="color: hsl(120, 100%, 40%);">+                      sc_ptr = &sc;</span><br><span style="color: hsl(120, 100%, 40%);">+                     break;</span><br><span style="color: hsl(120, 100%, 40%);">+                }</span><br><span>            /* FIXME: AMR codec configuration must be derived from lchan1! */</span><br><span>    }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9321">change 9321</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9321"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7 </div>
<div style="display:none"> Gerrit-Change-Number: 9321 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>