<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11820">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Max: Looks good to me, approved
Pau Espin Pedrol: Looks good to me, but someone else must approve
Stefan Sperling: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCLS: update parameter representation<br><br>* use osmo_lcls struct from libosmocore<br>* use enum values instead of magic numbers<br><br>Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858<br>Related: OS#3659<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>3 files changed, 15 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 738bad3..cf34c6f 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -275,8 +275,8 @@</span><br><span> struct {</span><br><span> uint8_t global_call_ref[15];</span><br><span> uint8_t global_call_ref_len; /* length of global_call_ref */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t config; /* TS 48.008 3.2.2.116 */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t control;/* TS 48.008 3.2.2.117 */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm0808_lcls_config config; /* TS 48.008 3.2.2.116 */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm0808_lcls_control control; /* TS 48.008 3.2.2.117 */</span><br><span> /* LCLS FSM */</span><br><span> struct osmo_fsm_inst *fi;</span><br><span> /* pointer to "other" connection, if Call Leg Relocation was successful */</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 fac0bc0..85e754f 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>@@ -883,9 +883,9 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* initialize to some magic values that indicate "IE not [yet] received" */</span><br><span style="color: hsl(0, 100%, 40%);">- conn->lcls.config = 0xff;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->lcls.control = 0xff;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* indicate "IE not [yet] received" */</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->lcls.config = GSM0808_LCLS_CFG_NA;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->lcls.control = GSM0808_LCLS_CSC_NA;</span><br><span> conn->lcls.fi = osmo_fsm_inst_alloc_child(&lcls_fsm, conn->fi, GSCON_EV_LCLS_FAIL);</span><br><span> if (!conn->lcls.fi) {</span><br><span> osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_ERROR, NULL);</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>index cdd6557..622611d 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_lcls.c</span><br><span>@@ -156,22 +156,16 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct lcls_cfg_csc {</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm0808_lcls_config config;</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm0808_lcls_control control;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Update the connections LCLS configuration and return old/previous configuration.</span><br><span> * \returns (staticallly allocated) old configuration; NULL if new config not supported */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct lcls_cfg_csc *update_lcls_cfg_csc(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(0, 100%, 40%);">- struct lcls_cfg_csc *new_cfg_csc)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_lcls *update_lcls_cfg_csc(struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_lcls *new_cfg_csc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static struct lcls_cfg_csc old_cfg_csc;</span><br><span style="color: hsl(120, 100%, 40%);">+ static struct osmo_lcls old_cfg_csc = { 0 };</span><br><span> old_cfg_csc.config = conn->lcls.config;</span><br><span> old_cfg_csc.control = conn->lcls.control;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (new_cfg_csc->config != 0xff) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_cfg_csc->config != GSM0808_LCLS_CFG_NA) {</span><br><span> if (!lcls_is_supported_config(new_cfg_csc->config))</span><br><span> return NULL;</span><br><span> if (conn->lcls.config != new_cfg_csc->config) {</span><br><span>@@ -179,7 +173,7 @@</span><br><span> conn->lcls.config = new_cfg_csc->config;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (new_cfg_csc->control != 0xff) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (new_cfg_csc->control != GSM0808_LCLS_CSC_NA) {</span><br><span> if (conn->lcls.control != new_cfg_csc->control) {</span><br><span> /* TODO: logging */</span><br><span> conn->lcls.control = new_cfg_csc->control;</span><br><span>@@ -193,9 +187,9 @@</span><br><span> * unsupported, change into LCLS NOT SUPPORTED state and return -EINVAL. */</span><br><span> static int lcls_handle_cfg_update(struct gsm_subscriber_connection *conn, void *data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct lcls_cfg_csc *new_cfg_csc, *old_cfg_csc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_lcls *new_cfg_csc, *old_cfg_csc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- new_cfg_csc = (struct lcls_cfg_csc *) data;</span><br><span style="color: hsl(120, 100%, 40%);">+ new_cfg_csc = (struct osmo_lcls *) data;</span><br><span> old_cfg_csc = update_lcls_cfg_csc(conn, new_cfg_csc);</span><br><span> if (!old_cfg_csc) {</span><br><span> osmo_fsm_inst_state_chg(conn->lcls.fi, ST_REQ_LCLS_NOT_SUPP, 0, 0);</span><br><span>@@ -208,9 +202,9 @@</span><br><span> void lcls_update_config(struct gsm_subscriber_connection *conn,</span><br><span> const uint8_t *config, const uint8_t *control)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct lcls_cfg_csc new_cfg = {</span><br><span style="color: hsl(0, 100%, 40%);">- .config = 0xff,</span><br><span style="color: hsl(0, 100%, 40%);">- .control = 0xff,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_lcls new_cfg = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .config = GSM0808_LCLS_CFG_NA,</span><br><span style="color: hsl(120, 100%, 40%);">+ .control = GSM0808_LCLS_CSC_NA,</span><br><span> };</span><br><span> /* nothing to update, skip it */</span><br><span> if (!config && !control)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11820">change 11820</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/11820"/><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: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 </div>
<div style="display:none"> Gerrit-Change-Number: 11820 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>