<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20390">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: refactor ns2_prim_status_ind()<br><br>Replace parameters nsi + nsei with a single nse pointer.<br><br>Change-Id: I35f6381110ba7ba1e013f21120e971362bdff55b<br>---<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_sns.c<br>3 files changed, 12 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 05d4972..53500d1 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -344,18 +344,18 @@</span><br><span> * \param[in] nsei NSEI to which the statue relates</span><br><span> * \param[in] bvci BVCI to which the status relates</span><br><span> * \param[in] cause The cause of the status */</span><br><span style="color: hsl(0, 100%, 40%);">-void ns2_prim_status_ind(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t nsei, uint16_t bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+void ns2_prim_status_ind(struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t bvci,</span><br><span> enum gprs_ns2_affecting_cause cause)</span><br><span> {</span><br><span> struct osmo_gprs_ns2_prim nsp = {};</span><br><span style="color: hsl(0, 100%, 40%);">- nsp.nsei = nsei;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsp.nsei = nse->nsei;</span><br><span> nsp.bvci = bvci;</span><br><span> nsp.u.status.cause = cause;</span><br><span> nsp.u.status.transfer = -1;</span><br><span> osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_STATUS,</span><br><span> PRIM_OP_INDICATION, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- nsi->cb(&nsp.oph, nsi->cb_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->nsi->cb(&nsp.oph, nse->nsi->cb_data);</span><br><span> }</span><br><span> </span><br><span> /*! Allocate a NS-VC within the given bind + NSE.</span><br><span>@@ -410,8 +410,7 @@</span><br><span> if (!nsvc)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nsvc->nse->nsi, nsvc->nse->nsei,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, NS_AFF_CAUSE_VC_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nsvc->nse, 0, NS_AFF_CAUSE_VC_FAILURE);</span><br><span> </span><br><span> llist_del(&nsvc->list);</span><br><span> llist_del(&nsvc->blist);</span><br><span>@@ -579,8 +578,7 @@</span><br><span> gprs_ns2_free_nsvc(nsvc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse->nsi, nse->nsei,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, NS_AFF_CAUSE_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_FAILURE);</span><br><span> </span><br><span> llist_del(&nse->list);</span><br><span> if (nse->bss_sns_fi)</span><br><span>@@ -932,8 +930,7 @@</span><br><span> if (unblocked) {</span><br><span> /* this is the first unblocked NSVC on an unavailable NSE */</span><br><span> nse->alive = true;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse->nsi, nse->nsei,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, NS_AFF_CAUSE_RECOVERY);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_RECOVERY);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -950,8 +947,7 @@</span><br><span> </span><br><span> /* nse became unavailable */</span><br><span> nse->alive = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse->nsi, nse->nsei,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, NS_AFF_CAUSE_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_FAILURE);</span><br><span> }</span><br><span> </span><br><span> /*! Create a new GPRS NS instance</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index 15b0bc5..1980ef8 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -213,8 +213,8 @@</span><br><span> struct msgb *gprs_ns2_msgb_alloc(void);</span><br><span> </span><br><span> void gprs_ns2_sns_dump_vty(struct vty *vty, const struct gprs_ns2_nse *nse, bool stats);</span><br><span style="color: hsl(0, 100%, 40%);">-void ns2_prim_status_ind(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t nsei, uint16_t bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+void ns2_prim_status_ind(struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t bvci,</span><br><span> enum gprs_ns2_affecting_cause cause);</span><br><span> void ns2_nse_notify_alive(struct gprs_ns2_vc *nsvc, bool alive);</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 753ac4d..9ffb152 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -670,7 +670,7 @@</span><br><span> struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> </span><br><span> if (old_state != GPRS_SNS_ST_UNCONFIGURED)</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(gss->nse->nsi, gss->nse->nsei, 0, NS_AFF_CAUSE_SNS_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(gss->nse, 0, NS_AFF_CAUSE_SNS_FAILURE);</span><br><span> </span><br><span> if (gss->num_max_ip4_remote > 0)</span><br><span> ns2_tx_sns_size(gss->sns_nsvc, true, gss->num_max_nsvcs, gss->num_max_ip4_remote, -1);</span><br><span>@@ -1110,7 +1110,7 @@</span><br><span> static void ns2_sns_st_configured_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span> {</span><br><span> struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse->nsi, nse->nsei, 0, NS_AFF_CAUSE_SNS_CONFIGURED);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, 0, NS_AFF_CAUSE_SNS_CONFIGURED);</span><br><span> }</span><br><span> </span><br><span> static const struct osmo_fsm_state ns2_sns_bss_states[] = {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20390">change 20390</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/libosmocore/+/20390"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I35f6381110ba7ba1e013f21120e971362bdff55b </div>
<div style="display:none"> Gerrit-Change-Number: 20390 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>