<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12486">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCLS: use libosmocore function to add status<br><br>* use gsm0808_create_ass_compl2() to add BSS Status IE to Assignment<br> Complete message<br>* drop local helpers<br><br>Depends-on: (libosmocore) I547c6b8707123aa8c1ef636db88908df112d90a4<br>Change-Id: I6916928391667cd9c345becf00e7c8561846c295<br>Related: OS#2487<br>---<br>M include/osmocom/bsc/osmo_bsc_lcls.h<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/osmo_bsc_lcls.c<br>3 files changed, 4 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/osmo_bsc_lcls.h b/include/osmocom/bsc/osmo_bsc_lcls.h</span><br><span>index c8b0ebd..d98fe98 100644</span><br><span>--- a/include/osmocom/bsc/osmo_bsc_lcls.h</span><br><span>+++ b/include/osmocom/bsc/osmo_bsc_lcls.h</span><br><span>@@ -37,5 +37,3 @@</span><br><span> void lcls_apply_config(struct gsm_subscriber_connection *conn);</span><br><span> </span><br><span> extern struct osmo_fsm lcls_fsm;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void bssmap_add_lcls_status_if_needed(struct gsm_subscriber_connection *conn, struct msgb *msg);</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index a24f7f9..2ad3959 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -175,10 +175,10 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- resp = gsm0808_create_ass_compl(lchan->abis_ip.ass_compl.rr_cause,</span><br><span style="color: hsl(0, 100%, 40%);">- chosen_channel,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->encr.alg_id, perm_spch,</span><br><span style="color: hsl(0, 100%, 40%);">- addr_local_p, sc_ptr, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ resp = gsm0808_create_ass_compl2(lchan->abis_ip.ass_compl.rr_cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ chosen_channel,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->encr.alg_id, perm_spch,</span><br><span style="color: hsl(120, 100%, 40%);">+ addr_local_p, sc_ptr, NULL, lcls_get_status(conn));</span><br><span> </span><br><span> if (!resp) {</span><br><span> assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE,</span><br><span>@@ -186,9 +186,6 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Add LCLS BSS-Status IE in case there is any LCLS status for this connection */</span><br><span style="color: hsl(0, 100%, 40%);">- bssmap_add_lcls_status_if_needed(conn, resp);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> rc = gscon_sigtran_send(conn, resp);</span><br><span> if (rc) {</span><br><span> assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE,</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 e4459da..f7b84e1 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>@@ -864,35 +864,3 @@</span><br><span> .log_subsys = DLCLS,</span><br><span> .event_names = lcls_event_names,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Add the LCLS BSS Status IE to a BSSMAP message. We assume this is</span><br><span style="color: hsl(0, 100%, 40%);">- * called on a msgb that was returned by gsm0808_create_ass_compl() */</span><br><span style="color: hsl(0, 100%, 40%);">-static void bssmap_add_lcls_status(struct msgb *msg, enum gsm0808_lcls_status status)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg->l3h[0] == BSSAP_MSG_BSS_MANAGEMENT);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg->l3h[2] == BSS_MAP_MSG_ASSIGMENT_COMPLETE ||</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l3h[2] == BSS_MAP_MSG_HANDOVER_RQST_ACKNOWLEDGE ||</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l3h[2] == BSS_MAP_MSG_HANDOVER_COMPLETE ||</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l3h[2] == BSS_MAP_MSG_HANDOVER_PERFORMED);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msgb_tailroom(msg) >= 2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* append IE to end of message */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, status);</span><br><span style="color: hsl(0, 100%, 40%);">- /* increment the "length" byte in the BSSAP header */</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l3h[1] += 2;</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%);">-/* Add (append) the LCLS BSS Status IE to a BSSMAP message, if there is any LCLS</span><br><span style="color: hsl(0, 100%, 40%);">- * active on the given \a conn */</span><br><span style="color: hsl(0, 100%, 40%);">-void bssmap_add_lcls_status_if_needed(struct gsm_subscriber_connection *conn, struct msgb *msg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- enum gsm0808_lcls_status status = lcls_get_status(conn);</span><br><span style="color: hsl(0, 100%, 40%);">- if (status != GSM0808_LCLS_STS_NA) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSM(conn->fi, "Adding LCLS BSS-Status (%s) to %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0808_lcls_status_name(status),</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0808_bssmap_name(msg->l3h[2]));</span><br><span style="color: hsl(0, 100%, 40%);">- bssmap_add_lcls_status(msg, status);</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%);">-</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12486">change 12486</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/12486"/><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: I6916928391667cd9c345becf00e7c8561846c295 </div>
<div style="display:none"> Gerrit-Change-Number: 12486 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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: osmith <osmith@sysmocom.de> </div>