<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21240">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ns2: Split initiater into init_reset and init_block<br><br>Change-Id: Iff5aff0cf8d19d9c718dd11c4e731ced2aeb16ba<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 27 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/21240/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>index 0d30f12..0dcaf5e 100644</span><br><span>--- a/src/gb/gprs_ns2_vc_fsm.c</span><br><span>+++ b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>@@ -55,9 +55,10 @@</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> /* how often the timer was triggered */</span><br><span> int N;</span><br><span style="color: hsl(0, 100%, 40%);">- /* The initiater is responsible to UNBLOCK the VC. The BSS is usually the initiater.</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The initiator is responsible to UNBLOCK the VC. The BSS is usually the initiator.</span><br><span> * It can change while runtime. The side which blocks an unblocked side.*/</span><br><span style="color: hsl(0, 100%, 40%);">- bool initiater;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool init_block;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool init_reset;</span><br><span> </span><br><span> /* the alive counter is present in all states */</span><br><span> struct {</span><br><span>@@ -241,7 +242,7 @@</span><br><span> if (old_state != GPRS_NS2_ST_RESET)</span><br><span> priv->N = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (priv->initiater)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->init_reset)</span><br><span> ns2_tx_reset(priv->nsvc, NS_CAUSE_OM_INTERVENTION);</span><br><span> </span><br><span> stop_test_procedure(priv);</span><br><span>@@ -253,7 +254,7 @@</span><br><span> struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi);</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (priv->initiater) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->init_reset) {</span><br><span> switch (event) {</span><br><span> case GPRS_NS2_EV_RESET_ACK:</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED,</span><br><span>@@ -279,7 +280,7 @@</span><br><span> if (old_state != GPRS_NS2_ST_BLOCKED)</span><br><span> priv->N = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (priv->initiater)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->init_block)</span><br><span> ns2_tx_unblock(priv->nsvc);</span><br><span> </span><br><span> start_test_procedure(priv);</span><br><span>@@ -289,7 +290,7 @@</span><br><span> {</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (priv->initiater) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->init_block) {</span><br><span> switch (event) {</span><br><span> case GPRS_NS2_EV_BLOCK:</span><br><span> /* TODO: BLOCK is a UNBLOCK_NACK */</span><br><span>@@ -331,7 +332,7 @@</span><br><span> </span><br><span> switch (event) {</span><br><span> case GPRS_NS2_EV_BLOCK:</span><br><span style="color: hsl(0, 100%, 40%);">- priv->initiater = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->init_block = false;</span><br><span> ns2_tx_block_ack(priv->nsvc);</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED,</span><br><span> 0, 2);</span><br><span>@@ -419,10 +420,10 @@</span><br><span> struct gprs_ns2_inst *nsi = ns_inst_from_fi(fi);</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (priv->initiater) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* PCU timeouts */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (fi->state) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_ST_RESET:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* PCU timeouts */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (fi->state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_ST_RESET:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->init_reset) {</span><br><span> priv->N++;</span><br><span> if (priv->N <= nsi->timeout[NS_TOUT_TNS_RESET_RETRIES]) {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0);</span><br><span>@@ -430,16 +431,20 @@</span><br><span> priv->N = 0;</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_ST_BLOCKED:</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_ST_BLOCKED:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->init_block) {</span><br><span> priv->N++;</span><br><span> if (priv->N <= nsi->timeout[NS_TOUT_TNS_BLOCK_RETRIES]) {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, nsi->timeout[NS_TOUT_TNS_BLOCK], 0);</span><br><span> } else {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_ST_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_ST_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->init_reset) {</span><br><span> priv->N++;</span><br><span> if (priv->N <= nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]) {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, 0, 0);</span><br><span>@@ -449,6 +454,7 @@</span><br><span> }</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -502,7 +508,7 @@</span><br><span> </span><br><span> /* move the FSM into reset */</span><br><span> if (fi->state != GPRS_NS2_ST_RESET) {</span><br><span style="color: hsl(0, 100%, 40%);">- priv->initiater = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->init_reset = false;</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET);</span><br><span> }</span><br><span> /* pass the event down into FSM action */</span><br><span>@@ -534,7 +540,7 @@</span><br><span> switch (fi->state) {</span><br><span> case GPRS_NS2_ST_BLOCKED:</span><br><span> /* 7.2.1: the BLOCKED_ACK might be lost */</span><br><span style="color: hsl(0, 100%, 40%);">- if (priv->initiater) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->init_block) {</span><br><span> gprs_ns2_recv_unitdata(fi, msg);</span><br><span> return;</span><br><span> }</span><br><span>@@ -585,11 +591,11 @@</span><br><span> * \param ctx</span><br><span> * \param vc</span><br><span> * \param id a char representation of the virtual curcuit</span><br><span style="color: hsl(0, 100%, 40%);">- * \param initiater initiater is the site which starts the connection. Usually the BSS.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param initiator initiator is the site which starts the connection. Usually the BSS.</span><br><span> * \return NULL on error, otherwise the fsm</span><br><span> */</span><br><span> struct osmo_fsm_inst *gprs_ns2_vc_fsm_alloc(struct gprs_ns2_vc *nsvc,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *id, bool initiater)</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *id, bool initiator)</span><br><span> {</span><br><span> struct osmo_fsm_inst *fi;</span><br><span> struct gprs_ns2_vc_priv *priv;</span><br><span>@@ -601,7 +607,8 @@</span><br><span> nsvc->fi = fi;</span><br><span> priv = fi->priv = talloc_zero(fi, struct gprs_ns2_vc_priv);</span><br><span> priv->nsvc = nsvc;</span><br><span style="color: hsl(0, 100%, 40%);">- priv->initiater = initiater;</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->init_reset = initiator;</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->init_block = initiator;</span><br><span> </span><br><span> osmo_timer_setup(&priv->alive.timer, alive_timeout_handler, fi);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21240">change 21240</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/+/21240"/><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: Iff5aff0cf8d19d9c718dd11c4e731ced2aeb16ba </div>
<div style="display:none"> Gerrit-Change-Number: 21240 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>