<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21616">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;">gbproxy: Implement handling of BVC Flow Control<br><br>We must locally terminate + acknowledge any inbound BSSGP-FC-BVC,<br>and ourselves trigger the transmission of BSSGP-FC-BVC to each<br>SGSN in the pool.<br><br>Related: OS#4891<br>Depends: libosmcoore.git Ie59be6761177c43456898be9148727f15861a622<br>Change-Id: Ib6495e5de4bfcf748a98e08743d1a8f2565f8b69<br>---<br>M src/gbproxy/gb_proxy.c<br>1 file changed, 50 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index 4f8c0e6..06023c4 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -291,6 +291,8 @@</span><br><span> rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]);</span><br><span> return tx_status_from_tlvp(rc, msg);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_bcid(msg) = (void *)&tp;</span><br><span> </span><br><span> switch (bgph->pdu_type) {</span><br><span> case BSSGP_PDUT_UL_UNITDATA:</span><br><span>@@ -331,9 +333,7 @@</span><br><span> LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n", pdut_name);</span><br><span> break;</span><br><span> case BSSGP_PDUT_FLOW_CONTROL_BVC:</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: Implement via FSM */</span><br><span style="color: hsl(0, 100%, 40%);">- //rc = osmo_fsm_inst_dispatch(bss_bvc->fi, FIXME, &tp);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n", pdut_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bss_bvc->fi, BSSGP_BVCFSM_E_RX_FC_BVC, msg);</span><br><span> break;</span><br><span> case BSSGP_PDUT_STATUS:</span><br><span> /* TODO: Implement by inspecting the contained PDU */</span><br><span>@@ -352,7 +352,9 @@</span><br><span> struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg);</span><br><span> const char *pdut_name = osmo_tlv_prot_msg_name(&osmo_pdef_bssgp, bgph->pdu_type);</span><br><span> struct gbproxy_bvc *sgsn_bvc, *bss_bvc;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tlv_parsed tp;</span><br><span> char log_pfx[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> snprintf(log_pfx, sizeof(log_pfx), "NSE(%05u/SGSN)-BVC(%05u/??)", nse->nsei, ns_bvci);</span><br><span> </span><br><span>@@ -386,10 +388,39 @@</span><br><span> rate_ctr_inc(&sgsn_bvc->ctrg->ctr[GBPROX_PEER_CTR_DROPPED]);</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_BVCI_BLOCKED, &ns_bvci, msg);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* DL_UNITDATA has a different header than all other uplink PDUs */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) msgb_bssgph(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msgb_bssgp_len(msg) < sizeof(*budh))</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, budh->data,</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_bssgp_len(msg) - sizeof(*budh), 0, 0, DGPRS, log_pfx);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* populate TLLI from the fixed headser into the TLV-parsed array so later code</span><br><span style="color: hsl(120, 100%, 40%);">+ * doesn't have to worry where the TLLI came from */</span><br><span style="color: hsl(120, 100%, 40%);">+ tp.lv[BSSGP_IE_TLLI].len = 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ tp.lv[BSSGP_IE_TLLI].val = (const uint8_t *) &budh->tlli;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, &tp, 1, bgph->pdu_type, bgph->data,</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_bssgp_len(msg) - sizeof(*bgph), 0, 0, DGPRS, log_pfx);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&nse->cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return tx_status_from_tlvp(rc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_bcid(msg) = (void *)&tp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OSMO_ASSERT(sgsn_bvc->cell);</span><br><span> bss_bvc = sgsn_bvc->cell->bss_bvc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (bgph->pdu_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSSGP_PDUT_FLOW_CONTROL_BVC_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_fsm_inst_dispatch(sgsn_bvc->fi, BSSGP_BVCFSM_E_RX_FC_BVC_ACK, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span> /***********************************************************************</span><br><span>@@ -532,9 +563,24 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* BVC FSM informs us about BVC-FC PDU receive */</span><br><span style="color: hsl(120, 100%, 40%);">+static void bss_ptp_bvc_fc_bvc(uint16_t nsei, uint16_t bvci, const struct bssgp2_flow_ctrl *fc, void *priv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_bvc *bss_bvc = priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_cell *cell = bss_bvc->cell;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cell)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: actually split the bandwidth among the SGSNs! */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ dispatch_to_all_sgsn_bvc(cell, BSSGP_BVCFSM_E_REQ_FC_BVC, (void *) fc);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct bssgp_bvc_fsm_ops bss_ptp_bvc_fsm_ops = {</span><br><span> .reset_notification = bss_ptp_bvc_reset_notif,</span><br><span> .state_chg_notification = bss_ptp_bvc_state_chg_notif,</span><br><span style="color: hsl(120, 100%, 40%);">+ .rx_fc_bvc = bss_ptp_bvc_fc_bvc,</span><br><span> };</span><br><span> </span><br><span> /* BVC FSM informs us about a SGSN-side reset of a PTP BVC */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21616">change 21616</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/osmo-sgsn/+/21616"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib6495e5de4bfcf748a98e08743d1a8f2565f8b69 </div>
<div style="display:none"> Gerrit-Change-Number: 21616 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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-MessageType: merged </div>