<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19528">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan_rtp_fsm: use E1 endpoints if the BTS is not ipaccess type<br><br>When the BTS is is not an ipaccess BTS, the BTS can only be an E1 bts.<br>In that case E1 endpoints must be used and there will be no RTP stream<br>setup towards the BTS.<br><br>Change-Id: I4f1f39bf90b0a7c9ea448dab255daf99cd36bb4a<br>Related: OS#2547<br>---<br>M include/osmocom/bsc/bsc_subscr_conn_fsm.h<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>3 files changed, 32 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>index 1a827d9..7893735 100644</span><br><span>--- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>+++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>@@ -65,7 +65,7 @@</span><br><span> int gscon_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg);</span><br><span> </span><br><span> struct osmo_mgcpc_ep *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t msc_assigned_cic);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t msc_assigned_cic, struct gsm_lchan *for_lchan);</span><br><span> bool gscon_connect_mgw_to_msc(struct gsm_subscriber_connection *conn,</span><br><span> struct gsm_lchan *for_lchan,</span><br><span> const char *addr, uint16_t port,</span><br><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index 9b1fb3f..0faf3b2 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -471,8 +471,10 @@</span><br><span> * SCCPlite, pass in msc_assigned_cic the CIC received upon BSSMAP Assignment Command or BSSMAP Handover</span><br><span> * Request form the MSC (which is only stored in conn->user_plane after success). Ignored for AoIP. */</span><br><span> struct osmo_mgcpc_ep *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t msc_assigned_cic)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t msc_assigned_cic, struct gsm_lchan *for_lchan)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *epname;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (conn->user_plane.mgw_endpoint)</span><br><span> return conn->user_plane.mgw_endpoint;</span><br><span> </span><br><span>@@ -489,13 +491,19 @@</span><br><span> msc_assigned_cic, osmo_mgcpc_ep_name(conn->user_plane.mgw_endpoint));</span><br><span> </span><br><span> } else if (gscon_is_aoip(conn)) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* use dynamic RTPBRIDGE endpoint allocation in MGW */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_ipaccess_bts(for_lchan->ts->trx->bts))</span><br><span style="color: hsl(120, 100%, 40%);">+ /* use dynamic RTPBRIDGE endpoint allocation in MGW */</span><br><span style="color: hsl(120, 100%, 40%);">+ epname = mgcp_client_rtpbridge_wildcard(conn->network->mgw.client);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ epname = mgcp_client_e1_epname(conn, conn->network->mgw.client, 1, for_lchan->ts->e1_link.e1_ts, 16, for_lchan->ts->e1_link.e1_ts_ss*2);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> conn->user_plane.mgw_endpoint =</span><br><span> osmo_mgcpc_ep_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,</span><br><span> conn->network->mgw.client,</span><br><span> conn->network->mgw.tdefs,</span><br><span> conn->fi->id,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s", mgcp_client_rtpbridge_wildcard(conn->network->mgw.client));</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s", epname);</span><br><span> } else {</span><br><span> LOGPFSML(conn->fi, LOGL_ERROR, "Conn is neither SCCPlite nor AoIP!?\n");</span><br><span> return NULL;</span><br><span>@@ -570,7 +578,7 @@</span><br><span> } else</span><br><span> verb = MGCP_VERB_CRCX;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gscon_ensure_mgw_endpoint(conn, for_lchan->activate.info.msc_assigned_cic);</span><br><span style="color: hsl(120, 100%, 40%);">+ gscon_ensure_mgw_endpoint(conn, for_lchan->activate.info.msc_assigned_cic, for_lchan);</span><br><span> </span><br><span> if (!conn->user_plane.mgw_endpoint) {</span><br><span> LOGPFSML(conn->fi, LOGL_ERROR, "Unable to allocate endpoint info\n");</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index 24a7147..1fe5452 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -141,6 +141,12 @@</span><br><span> struct osmo_mgcpc_ep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan);</span><br><span> struct mgcp_conn_peer crcx_info = {};</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!is_ipaccess_bts(lchan->ts->trx->bts)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Audio link to-BTS via E1, skipping IPACC\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_LCHAN_READY);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (use_mgwep_ci) {</span><br><span> LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "MGW endpoint already available: %s\n",</span><br><span> osmo_mgcpc_ep_ci_name(use_mgwep_ci));</span><br><span>@@ -148,7 +154,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgwep = gscon_ensure_mgw_endpoint(lchan->conn, lchan->activate.info.msc_assigned_cic);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgwep = gscon_ensure_mgw_endpoint(lchan->conn, lchan->activate.info.msc_assigned_cic, lchan);</span><br><span> if (!mgwep) {</span><br><span> lchan_rtp_fail("Internal error: cannot obtain MGW endpoint handle for conn");</span><br><span> return;</span><br><span>@@ -248,7 +254,7 @@</span><br><span> if (is_ipaccess_bts(lchan->ts->trx->bts))</span><br><span> lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_IPACC_CRCX_ACK);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_rtp_fsm_switch_rtp(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_WAIT_MGW_ENDPOINT_CONFIGURED);</span><br><span> }</span><br><span> </span><br><span> static void lchan_rtp_fsm_wait_ipacc_crcx_ack_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span>@@ -445,6 +451,12 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!is_ipaccess_bts(lchan->ts->trx->bts)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LCHAN_RTP(lchan, LOGL_DEBUG, "Audio link to-BTS via E1, skipping IPACC\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_READY);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* At this point, we are taking over an old lchan's MGW endpoint (if any). */</span><br><span> if (!lchan->mgw_endpoint_ci_bts && old_lchan) {</span><br><span> /* The old lchan shall forget the endpoint now. We might put it back upon ROLLBACK */</span><br><span>@@ -521,7 +533,11 @@</span><br><span> osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, 0);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- connect_mgw_endpoint_to_lchan(fi, lchan->mgw_endpoint_ci_bts, old_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_ipaccess_bts(lchan->ts->trx->bts))</span><br><span style="color: hsl(120, 100%, 40%);">+ connect_mgw_endpoint_to_lchan(fi, lchan->mgw_endpoint_ci_bts, old_lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, LCHAN_RTP_EV_MGW_ENDPOINT_CONFIGURED, 0);</span><br><span> }</span><br><span> </span><br><span> static void lchan_rtp_fsm_rollback(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19528">change 19528</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/c/osmo-bsc/+/19528"/><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-Change-Id: I4f1f39bf90b0a7c9ea448dab255daf99cd36bb4a </div>
<div style="display:none"> Gerrit-Change-Number: 19528 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>