<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21611">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bssgp_bvc_fsm: Add basic BVC flow control rx/tx support<br><br>The FSM doesn't actually implement the flow control logic,<br>it only decodes / dispatches and encodes messages.<br><br>Change-Id: Ie59be6761177c43456898be9148727f15861a622<br>---<br>M include/osmocom/gprs/bssgp_bvc_fsm.h<br>M src/gb/bssgp_bvc_fsm.c<br>2 files changed, 41 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/21611/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h b/include/osmocom/gprs/bssgp_bvc_fsm.h</span><br><span>index 7c6fdeb..e69c205 100644</span><br><span>--- a/include/osmocom/gprs/bssgp_bvc_fsm.h</span><br><span>+++ b/include/osmocom/gprs/bssgp_bvc_fsm.h</span><br><span>@@ -4,6 +4,7 @@</span><br><span> struct gprs_ns2_inst;</span><br><span> struct osmo_fsm_inst;</span><br><span> struct gprs_ra_id;</span><br><span style="color: hsl(120, 100%, 40%);">+struct bssgp2_flow_ctrl;</span><br><span> </span><br><span> enum bssp_ptp_bvc_fsm_state {</span><br><span> BSSGP_BVCFSM_S_NULL,</span><br><span>@@ -22,10 +23,13 @@</span><br><span> BSSGP_BVCFSM_E_RX_UNBLOCK_ACK,</span><br><span> BSSGP_BVCFSM_E_RX_RESET,</span><br><span> BSSGP_BVCFSM_E_RX_RESET_ACK,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSGP_BVCFSM_E_RX_FC_BVC,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSGP_BVCFSM_E_RX_FC_BVC_ACK,</span><br><span> /* Requests of the local user */</span><br><span> BSSGP_BVCFSM_E_REQ_BLOCK, /* data: uint8_t *cause */</span><br><span> BSSGP_BVCFSM_E_REQ_UNBLOCK,</span><br><span> BSSGP_BVCFSM_E_REQ_RESET, /* data: uint8_t *cause */</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSGP_BVCFSM_E_REQ_FC_BVC, /* data: struct bssgp2_flow_ctrl */</span><br><span> };</span><br><span> </span><br><span> struct bssgp_bvc_fsm_ops {</span><br><span>@@ -35,6 +39,7 @@</span><br><span> /* call-back notifying the user of a BVC-RESET event */</span><br><span> void (*reset_notification)(uint16_t nsei, uint16_t bvci, const struct gprs_ra_id *ra_id,</span><br><span> uint16_t cell_id, uint8_t cause, void *priv);</span><br><span style="color: hsl(120, 100%, 40%);">+ void (*rx_fc_bvc)(uint16_t nsei, uint16_t bvci, const struct bssgp2_flow_ctrl *fc, void *priv);</span><br><span> };</span><br><span> </span><br><span> struct osmo_fsm_inst *</span><br><span>diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c</span><br><span>index a0e4b01..2224eba 100644</span><br><span>--- a/src/gb/bssgp_bvc_fsm.c</span><br><span>+++ b/src/gb/bssgp_bvc_fsm.c</span><br><span>@@ -86,6 +86,8 @@</span><br><span> { BSSGP_BVCFSM_E_REQ_BLOCK, "REQ-BLOCK" },</span><br><span> { BSSGP_BVCFSM_E_REQ_UNBLOCK, "REQ-UNBLOCK" },</span><br><span> { BSSGP_BVCFSM_E_REQ_RESET, "REQ-RESET" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { BSSGP_BVCFSM_E_RX_FC_BVC, "RX-FLOW-CONTROL-BVC" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { BSSGP_BVCFSM_E_RX_FC_BVC_ACK, "RX-FLOW-CONTROL-BVC-ACK" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -114,6 +116,8 @@</span><br><span> uint32_t advertised;</span><br><span> uint32_t received;</span><br><span> uint32_t negotiated;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* only used if BSSGP_XFEAT_GBIT is negotiated */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum bssgp_fc_granularity fc_granularity;</span><br><span> } features;</span><br><span> </span><br><span> /* Cell Identification used by BSS when</span><br><span>@@ -372,9 +376,11 @@</span><br><span> </span><br><span> static void bssgp_bvc_fsm_unblocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bssgp2_flow_ctrl rx_fc, *tx_fc;</span><br><span> struct bvc_fsm_priv *bfp = fi->priv;</span><br><span> const struct tlv_parsed *tp = NULL;</span><br><span> struct msgb *rx = NULL, *tx;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> switch (event) {</span><br><span> case BSSGP_BVCFSM_E_RX_UNBLOCK_ACK:</span><br><span>@@ -440,6 +446,33 @@</span><br><span> fi_tx_sig(fi, tx);</span><br><span> osmo_fsm_inst_state_chg(fi, BSSGP_BVCFSM_S_BLOCKED, T1_SECS, T1);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_BVCFSM_E_RX_FC_BVC:</span><br><span style="color: hsl(120, 100%, 40%);">+ rx = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ tp = (const struct tlv_parsed *) msgb_bcid(rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we assume osmo_tlv_prot_* has been used before calling here to ensure this */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(bfp->role_sgsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bssgp2_dec_fc_bvc(&rx_fc, tp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ _tx_status(fi, BSSGP_CAUSE_SEM_INCORR_PDU, rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bfp->ops->rx_fc_bvc)</span><br><span style="color: hsl(120, 100%, 40%);">+ bfp->ops->rx_fc_bvc(bfp->nsei, bfp->bvci, &rx_fc, bfp->ops_priv);</span><br><span style="color: hsl(120, 100%, 40%);">+ tx = bssgp2_enc_fc_bvc_ack(rx_fc.tag);</span><br><span style="color: hsl(120, 100%, 40%);">+ fi_tx_sig(fi, tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_BVCFSM_E_RX_FC_BVC_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ rx = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ tp = (const struct tlv_parsed *) msgb_bcid(rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we assume osmo_tlv_prot_* has been used before calling here to ensure this */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(!bfp->role_sgsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_BVCFSM_E_REQ_FC_BVC:</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_fc = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ tx = bssgp2_enc_fc_bvc(tx_fc, bfp->features.negotiated & (BSSGP_XFEAT_GBIT << 8) ?</span><br><span style="color: hsl(120, 100%, 40%);">+ &bfp->features.fc_granularity : NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ fi_tx_sig(fi, tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -561,7 +594,9 @@</span><br><span> .in_event_mask = S(BSSGP_BVCFSM_E_RX_BLOCK) |</span><br><span> S(BSSGP_BVCFSM_E_RX_UNBLOCK) |</span><br><span> S(BSSGP_BVCFSM_E_RX_UNBLOCK_ACK) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(BSSGP_BVCFSM_E_REQ_BLOCK),</span><br><span style="color: hsl(120, 100%, 40%);">+ S(BSSGP_BVCFSM_E_REQ_BLOCK) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(BSSGP_BVCFSM_E_RX_FC_BVC) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(BSSGP_BVCFSM_E_RX_FC_BVC_ACK),</span><br><span> .out_state_mask = S(BSSGP_BVCFSM_S_BLOCKED) |</span><br><span> S(BSSGP_BVCFSM_S_WAIT_RESET_ACK) |</span><br><span> S(BSSGP_BVCFSM_S_UNBLOCKED),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21611">change 21611</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/+/21611"/><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: Ie59be6761177c43456898be9148727f15861a622 </div>
<div style="display:none"> Gerrit-Change-Number: 21611 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>