<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22292">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_vc_fsm: rename all event to match RX_ or REQ_<br><br>Similiar to the BSSGP layer prefix events with RX if it's an received PDU<br>or REQ if it's a request from the code.<br><br>Change-Id: I341fa28fb671d439c050d985c88ece1521430a99<br>---<br>M src/gb/gprs_ns2_vc_fsm.c<br>1 file changed, 69 insertions(+), 69 deletions(-)<br><br></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 9f0c5f4..8a78e57 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>@@ -100,39 +100,39 @@</span><br><span> };</span><br><span> </span><br><span> enum gprs_ns2_vc_event {</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_START,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_REQ_START,</span><br><span> </span><br><span> /* received messages */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_RESET,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_RESET_ACK,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_UNBLOCK,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_UNBLOCK_ACK,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_BLOCK,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_BLOCK_ACK,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_ALIVE,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_ALIVE_ACK,</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_STATUS,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_RESET,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_RESET_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_UNBLOCK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_UNBLOCK_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_BLOCK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_BLOCK_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_ALIVE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_ALIVE_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_STATUS,</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_UNITDATA,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_RX_UNITDATA,</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_FORCE_UNCONFIGURED, /* called via vty for tests */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_REQ_OM_BLOCK, /* vty cmd: block */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS2_EV_REQ_OM_UNBLOCK, /* vty cmd: unblock*/</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, /* called via vty for tests */</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_REQ_OM_BLOCK, /* vty cmd: block */</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_EV_REQ_OM_UNBLOCK, /* vty cmd: unblock*/</span><br><span> };</span><br><span> </span><br><span> static const struct value_string gprs_ns2_vc_event_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_START, "START" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_RESET, "RESET" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_RESET_ACK, "RESET_ACK" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_UNBLOCK, "UNBLOCK" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_UNBLOCK_ACK, "UNBLOCK_ACK" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_BLOCK, "BLOCK" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_BLOCK_ACK, "BLOCK_ACK" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_ALIVE, "ALIVE" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_ALIVE_ACK, "ALIVE_ACK" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_STATUS, "STATUS" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_UNITDATA, "UNITDATA" },</span><br><span style="color: hsl(0, 100%, 40%);">- { GPRS_NS2_EV_FORCE_UNCONFIGURED, "FORCE_UNCONFIGURED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_REQ_START, "START" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_RESET, "RESET" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_RESET_ACK, "RESET_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_UNBLOCK, "UNBLOCK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_UNBLOCK_ACK, "UNBLOCK_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_BLOCK, "BLOCK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_BLOCK_ACK, "BLOCK_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_ALIVE, "ALIVE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_ALIVE_ACK, "ALIVE_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_STATUS, "STATUS" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_RX_UNITDATA, "UNITDATA" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, "FORCE_UNCONFIGURED" },</span><br><span> { GPRS_NS2_EV_REQ_OM_BLOCK, "REQ-O&M-BLOCK"},</span><br><span> { GPRS_NS2_EV_REQ_OM_UNBLOCK, "REQ-O&M-UNBLOCK"},</span><br><span> { 0, NULL }</span><br><span>@@ -229,7 +229,7 @@</span><br><span> struct gprs_ns2_inst *nsi = priv->nsvc->nse->nsi;</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_START:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_REQ_START:</span><br><span> switch (priv->nsvc->mode) {</span><br><span> case NS2_VC_MODE_ALIVE:</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE);</span><br><span>@@ -268,7 +268,7 @@</span><br><span> </span><br><span> if (priv->initiate_reset) {</span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_RESET_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_RESET_ACK:</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED,</span><br><span> nsi->timeout[NS_TOUT_TNS_BLOCK], NS_TOUT_TNS_BLOCK);</span><br><span> break;</span><br><span>@@ -276,7 +276,7 @@</span><br><span> } else {</span><br><span> /* we are on the receiving end */</span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_RESET:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_RESET:</span><br><span> ns2_tx_reset_ack(priv->nsvc);</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED,</span><br><span> 0, 0);</span><br><span>@@ -312,16 +312,16 @@</span><br><span> </span><br><span> if (priv->om_blocked) {</span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_BLOCK_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_BLOCK_ACK:</span><br><span> priv->accept_unitdata = false;</span><br><span> osmo_timer_del(&fi->timer);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_BLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_BLOCK:</span><br><span> priv->accept_unitdata = false;</span><br><span> ns2_tx_block_ack(priv->nsvc);</span><br><span> osmo_timer_del(&fi->timer);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_UNBLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_UNBLOCK:</span><br><span> priv->accept_unitdata = false;</span><br><span> ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION);</span><br><span> osmo_timer_add(&fi->timer);</span><br><span>@@ -329,14 +329,14 @@</span><br><span> }</span><br><span> } else if (priv->initiate_block) {</span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_BLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_BLOCK:</span><br><span> /* TODO: BLOCK is a UNBLOCK_NACK */</span><br><span> ns2_tx_block_ack(priv->nsvc);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_UNBLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_UNBLOCK:</span><br><span> ns2_tx_unblock_ack(priv->nsvc);</span><br><span> /* fall through */</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_UNBLOCK_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_UNBLOCK_ACK:</span><br><span> priv->accept_unitdata = true;</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNBLOCKED,</span><br><span> 0, NS_TOUT_TNS_TEST);</span><br><span>@@ -345,10 +345,10 @@</span><br><span> } else {</span><br><span> /* we are on the receiving end. The initiator who sent RESET is responsible to UNBLOCK! */</span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_BLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_BLOCK:</span><br><span> ns2_tx_block_ack(priv->nsvc);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_UNBLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_UNBLOCK:</span><br><span> ns2_tx_unblock_ack(priv->nsvc);</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNBLOCKED,</span><br><span> 0, 0);</span><br><span>@@ -373,10 +373,10 @@</span><br><span> struct gprs_ns2_vc_priv *priv = fi->priv;</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_UNBLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_UNBLOCK:</span><br><span> ns2_tx_unblock_ack(priv->nsvc);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_BLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_BLOCK:</span><br><span> priv->initiate_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>@@ -388,7 +388,7 @@</span><br><span> static void gprs_ns2_st_alive(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_ALIVE_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_ALIVE_ACK:</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNBLOCKED, 0, 0);</span><br><span> break;</span><br><span> }</span><br><span>@@ -416,13 +416,13 @@</span><br><span> </span><br><span> static const struct osmo_fsm_state gprs_ns2_vc_states[] = {</span><br><span> [GPRS_NS2_ST_UNCONFIGURED] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_NS2_EV_START),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_NS2_EV_REQ_START),</span><br><span> .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE),</span><br><span> .name = "UNCONFIGURED",</span><br><span> .action = gprs_ns2_st_unconfigured,</span><br><span> },</span><br><span> [GPRS_NS2_ST_RESET] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_NS2_EV_RESET_ACK) | S(GPRS_NS2_EV_RESET),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_NS2_EV_RX_RESET_ACK) | S(GPRS_NS2_EV_RX_RESET),</span><br><span> .out_state_mask = S(GPRS_NS2_ST_RESET) |</span><br><span> S(GPRS_NS2_ST_BLOCKED) |</span><br><span> S(GPRS_NS2_ST_UNCONFIGURED),</span><br><span>@@ -431,8 +431,8 @@</span><br><span> .onenter = gprs_ns2_st_reset_onenter,</span><br><span> },</span><br><span> [GPRS_NS2_ST_BLOCKED] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_NS2_EV_BLOCK) | S(GPRS_NS2_EV_BLOCK_ACK) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_NS2_EV_UNBLOCK) | S(GPRS_NS2_EV_UNBLOCK_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_NS2_EV_RX_BLOCK) | S(GPRS_NS2_EV_RX_BLOCK_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_NS2_EV_RX_UNBLOCK) | S(GPRS_NS2_EV_RX_UNBLOCK_ACK),</span><br><span> .out_state_mask = S(GPRS_NS2_ST_RESET) |</span><br><span> S(GPRS_NS2_ST_UNBLOCKED) |</span><br><span> S(GPRS_NS2_ST_BLOCKED) |</span><br><span>@@ -442,8 +442,8 @@</span><br><span> .onenter = gprs_ns2_st_blocked_onenter,</span><br><span> },</span><br><span> [GPRS_NS2_ST_UNBLOCKED] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_NS2_EV_BLOCK) | S(GPRS_NS2_EV_UNBLOCK_ACK) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_NS2_EV_UNBLOCK),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_NS2_EV_RX_BLOCK) | S(GPRS_NS2_EV_RX_UNBLOCK_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_NS2_EV_RX_UNBLOCK),</span><br><span> .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE) |</span><br><span> S(GPRS_NS2_ST_BLOCKED) |</span><br><span> S(GPRS_NS2_ST_UNCONFIGURED),</span><br><span>@@ -454,7 +454,7 @@</span><br><span> </span><br><span> /* ST_ALIVE is only used on VC without RESET/BLOCK */</span><br><span> [GPRS_NS2_ST_ALIVE] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GPRS_NS2_EV_ALIVE_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GPRS_NS2_EV_RX_ALIVE_ACK),</span><br><span> .out_state_mask = S(GPRS_NS2_ST_RESET) |</span><br><span> S(GPRS_NS2_ST_UNBLOCKED) |</span><br><span> S(GPRS_NS2_ST_UNCONFIGURED),</span><br><span>@@ -560,7 +560,7 @@</span><br><span> struct msgb *msg = data;</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_RESET:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_RESET:</span><br><span> if (priv->nsvc->mode != NS2_VC_MODE_BLOCKRESET)</span><br><span> break;</span><br><span> </span><br><span>@@ -572,7 +572,7 @@</span><br><span> /* pass the event down into FSM action */</span><br><span> gprs_ns2_st_reset(fi, event, data);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_ALIVE:</span><br><span> switch (fi->state) {</span><br><span> case GPRS_NS2_ST_UNCONFIGURED:</span><br><span> case GPRS_NS2_ST_RESET:</span><br><span>@@ -582,14 +582,14 @@</span><br><span> ns2_tx_alive_ack(priv->nsvc);</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_ALIVE_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_ALIVE_ACK:</span><br><span> /* for VCs without RESET/BLOCK/UNBLOCK, the connections comes after ALIVE_ACK unblocked */</span><br><span> if (fi->state == GPRS_NS2_ST_ALIVE)</span><br><span> gprs_ns2_st_alive(fi, event, data);</span><br><span> else</span><br><span> recv_test_procedure(fi);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_UNITDATA:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_RX_UNITDATA:</span><br><span> /* UNITDATA has to handle the release of msg.</span><br><span> * If send upwards (gprs_ns2_recv_unitdata) it must NOT free</span><br><span> * the msg, the upper layer has to do it.</span><br><span>@@ -616,11 +616,11 @@</span><br><span> </span><br><span> msgb_free(msg);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS2_EV_FORCE_UNCONFIGURED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED:</span><br><span> if (fi->state != GPRS_NS2_ST_UNCONFIGURED) {</span><br><span> /* Force the NSVC back to its initial state */</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_UNCONFIGURED, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_START, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_REQ_START, NULL);</span><br><span> return;</span><br><span> }</span><br><span> break;</span><br><span>@@ -653,11 +653,11 @@</span><br><span> .name = "GPRS-NS2-VC",</span><br><span> .states = gprs_ns2_vc_states,</span><br><span> .num_states = ARRAY_SIZE(gprs_ns2_vc_states),</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = S(GPRS_NS2_EV_UNITDATA) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_NS2_EV_RESET) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_NS2_EV_ALIVE) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_NS2_EV_ALIVE_ACK) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(GPRS_NS2_EV_FORCE_UNCONFIGURED) |</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = S(GPRS_NS2_EV_RX_UNITDATA) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_NS2_EV_RX_RESET) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_NS2_EV_RX_ALIVE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_NS2_EV_RX_ALIVE_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED) |</span><br><span> S(GPRS_NS2_EV_REQ_OM_BLOCK) |</span><br><span> S(GPRS_NS2_EV_REQ_OM_UNBLOCK),</span><br><span> .allstate_action = gprs_ns2_vc_fsm_allstate_action,</span><br><span>@@ -705,7 +705,7 @@</span><br><span> {</span><br><span> /* allows to call this function even for started nsvc by gprs_ns2_start_alive_all_nsvcs */</span><br><span> if (nsvc->fi->state == GPRS_NS2_ST_UNCONFIGURED)</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_START, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_REQ_START, NULL);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -714,7 +714,7 @@</span><br><span> * \return 0 on success; negative on error */</span><br><span> int gprs_ns2_vc_force_unconfigured(struct gprs_ns2_vc *nsvc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_FORCE_UNCONFIGURED, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, NULL);</span><br><span> }</span><br><span> </span><br><span> /*! Block a NS-VC.</span><br><span>@@ -759,32 +759,32 @@</span><br><span> </span><br><span> switch (nsh->pdu_type) {</span><br><span> case NS_PDUT_RESET:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RESET, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);</span><br><span> break;</span><br><span> case NS_PDUT_RESET_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RESET_ACK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET_ACK, tp);</span><br><span> break;</span><br><span> case NS_PDUT_BLOCK:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_BLOCK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_BLOCK, tp);</span><br><span> break;</span><br><span> case NS_PDUT_BLOCK_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_BLOCK_ACK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_BLOCK_ACK, tp);</span><br><span> break;</span><br><span> case NS_PDUT_UNBLOCK:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_UNBLOCK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNBLOCK, tp);</span><br><span> break;</span><br><span> case NS_PDUT_UNBLOCK_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_UNBLOCK_ACK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNBLOCK_ACK, tp);</span><br><span> break;</span><br><span> case NS_PDUT_ALIVE:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_ALIVE, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_ALIVE, tp);</span><br><span> break;</span><br><span> case NS_PDUT_ALIVE_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_ALIVE_ACK, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_ALIVE_ACK, tp);</span><br><span> break;</span><br><span> case NS_PDUT_UNITDATA:</span><br><span> /* UNITDATA have to free msg because it might send the msg layer upwards */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_UNITDATA, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNITDATA, msg);</span><br><span> return 0;</span><br><span> default:</span><br><span> LOGP(DLNS, LOGL_ERROR, "NSEI=%u Rx unknown NS PDU type %s\n", nsvc->nse->nsei,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22292">change 22292</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/+/22292"/><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: I341fa28fb671d439c050d985c88ece1521430a99 </div>
<div style="display:none"> Gerrit-Change-Number: 22292 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>