<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25700">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce gsm_lchan_release function helper<br><br>Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3<br>---<br>M include/osmo-bts/lchan.h<br>M src/common/lchan.c<br>M src/common/rsl.c<br>3 files changed, 77 insertions(+), 60 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/00/25700/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h</span><br><span>index 188b81b..1d0b2d8 100644</span><br><span>--- a/include/osmo-bts/lchan.h</span><br><span>+++ b/include/osmo-bts/lchan.h</span><br><span>@@ -398,6 +398,7 @@</span><br><span> </span><br><span> void gsm_lchan_name_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr);</span><br><span> void gsm_lchan_name_update(struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_act_kind);</span><br><span> const char *gsm_lchans_name(enum gsm_lchan_state s);</span><br><span> </span><br><span> static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)</span><br><span>diff --git a/src/common/lchan.c b/src/common/lchan.c</span><br><span>index e98984b..ec5347d 100644</span><br><span>--- a/src/common/lchan.c</span><br><span>+++ b/src/common/lchan.c</span><br><span>@@ -20,10 +20,16 @@</span><br><span> */</span><br><span> </span><br><span> #include <osmocom/core/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/trau/osmo_ortp.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmo-bts/logging.h></span><br><span> #include <osmo-bts/lchan.h></span><br><span> #include <osmo-bts/bts.h></span><br><span> #include <osmo-bts/rsl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/pcu_if.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/handover.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/l1sap.h></span><br><span> #include <errno.h></span><br><span> </span><br><span> static const struct value_string lchan_s_names[] = {</span><br><span>@@ -70,6 +76,75 @@</span><br><span> lchan->name = name;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int dyn_ts_pdch_release(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = lchan->ts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->dyn.pchan_is != ts->dyn.pchan_want) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DRSL, LOGL_ERROR, "%s: PDCH release requested but already"</span><br><span style="color: hsl(120, 100%, 40%);">+ " in switchover\n", gsm_ts_and_pchan_name(ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Indicate PDCH Disconnect in dyn_pdch.want, let pcu_tx_info_ind()</span><br><span style="color: hsl(120, 100%, 40%);">+ * pick it up and wait for PCU to disable the channel.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->dyn.pchan_want = GSM_PCHAN_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pcu_connected()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* PCU not connected yet. Just record the new type and done,</span><br><span style="color: hsl(120, 100%, 40%);">+ * the PCU will pick it up once connected. */</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->dyn.pchan_is = GSM_PCHAN_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return pcu_tx_info_ind();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_act_kind)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->abis_ip.rtp_socket) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Closing RTP socket on Channel Release ");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_rtp_socket_free(lchan->abis_ip.rtp_socket);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->abis_ip.rtp_socket = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_queue_flush(&lchan->dl_tch_queue);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: right now we allow creating the rtp_socket even if chan is not</span><br><span style="color: hsl(120, 100%, 40%);">+ * activated... Once we check for that, we can move this check at the</span><br><span style="color: hsl(120, 100%, 40%);">+ * start of the function */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->state == LCHAN_S_NONE)</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%);">+ /* release handover state */</span><br><span style="color: hsl(120, 100%, 40%);">+ handover_reset(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->rel_act_kind = rel_act_kind;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Dynamic channel in PDCH mode is released via PCU */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN</span><br><span style="color: hsl(120, 100%, 40%);">+ && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = dyn_ts_pdch_release(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If the PCU is not connected, continue to rel ack right away. */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->rel_act_kind = LCHAN_REL_ACT_PCU;</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_tx_rf_rel_ack(lchan);</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%);">+ /* Waiting for PDCH release */</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 style="color: hsl(120, 100%, 40%);">+ l1sap_chan_rel(lchan->ts->trx, gsm_lchan2chan_nr(lchan));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lapdm_channel_exit(&lchan->lapdm_ch);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const char *gsm_lchans_name(enum gsm_lchan_state s)</span><br><span> {</span><br><span> return get_value_string(lchan_s_names, s);</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 96a2a67..cda0b37 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -1925,37 +1925,9 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int dyn_ts_pdch_release(struct gsm_lchan *lchan)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts *ts = lchan->ts;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->dyn.pchan_is != ts->dyn.pchan_want) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRSL, LOGL_ERROR, "%s: PDCH release requested but already"</span><br><span style="color: hsl(0, 100%, 40%);">- " in switchover\n", gsm_ts_and_pchan_name(ts));</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Indicate PDCH Disconnect in dyn_pdch.want, let pcu_tx_info_ind()</span><br><span style="color: hsl(0, 100%, 40%);">- * pick it up and wait for PCU to disable the channel.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- ts->dyn.pchan_want = GSM_PCHAN_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!pcu_connected()) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* PCU not connected yet. Just record the new type and done,</span><br><span style="color: hsl(0, 100%, 40%);">- * the PCU will pick it up once connected. */</span><br><span style="color: hsl(0, 100%, 40%);">- ts->dyn.pchan_is = GSM_PCHAN_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return pcu_tx_info_ind();</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* 8.4.14 RF CHANnel RELease is received */</span><br><span> static int rsl_rx_rf_chan_rel(struct gsm_lchan *lchan, uint8_t chan_nr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (lchan->state == LCHAN_S_NONE) {</span><br><span> LOGP(DRSL, LOGL_ERROR,</span><br><span> "%s ss=%d state=%s Rx RSL RF Channel Release, but is already inactive;"</span><br><span>@@ -1966,38 +1938,7 @@</span><br><span> * not necessarily reflecting the current lchan state. */</span><br><span> return tx_rf_rel_ack(lchan, chan_nr);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->abis_ip.rtp_socket) {</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">- "Closing RTP socket on Channel Release ");</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_rtp_socket_free(lchan->abis_ip.rtp_socket);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->abis_ip.rtp_socket = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_queue_flush(&lchan->dl_tch_queue);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* release handover state */</span><br><span style="color: hsl(0, 100%, 40%);">- handover_reset(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rel_act_kind = LCHAN_REL_ACT_RSL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Dynamic channel in PDCH mode is released via PCU */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN</span><br><span style="color: hsl(0, 100%, 40%);">- && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = dyn_ts_pdch_release(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* If the PCU is not connected, continue to rel ack right away. */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rel_act_kind = LCHAN_REL_ACT_PCU;</span><br><span style="color: hsl(0, 100%, 40%);">- return rsl_tx_rf_rel_ack(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Waiting for PDCH release */</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- l1sap_chan_rel(lchan->ts->trx, chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- lapdm_channel_exit(&lchan->lapdm_ch);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_release(lchan, LCHAN_REL_ACT_RSL);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25700">change 25700</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-bts/+/25700"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 </div>
<div style="display:none"> Gerrit-Change-Number: 25700 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>