<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13204">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSGP: use variable for NSEI<br><br>Handle NSEI the same way as BVCI is handled: assign it to variable<br>instead of repetitive calls to msgb_nsei() - this simplifies log update<br>in follow-up patches and makes code slightly easier to read.<br><br>Change-Id: I919a717ca22646849d6ec7f62c677c536db0ed31<br>---<br>M src/gb/gprs_bssgp.c<br>1 file changed, 27 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c</span><br><span>index 4a4bab3..550757f 100644</span><br><span>--- a/src/gb/gprs_bssgp.c</span><br><span>+++ b/src/gb/gprs_bssgp.c</span><br><span>@@ -307,7 +307,7 @@</span><br><span> static int bssgp_rx_bvc_block(struct msgb *msg, struct tlv_parsed *tp)</span><br><span> {</span><br><span> struct osmo_bssgp_prim nmp;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t bvci;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t bvci, nsei = msgb_nsei(msg);</span><br><span> struct bssgp_bvc_ctx *ptp_ctx;</span><br><span> </span><br><span> bvci = tlvp_val16be(tp, BSSGP_IE_BVCI);</span><br><span>@@ -315,13 +315,13 @@</span><br><span> /* 8.3.2: Signalling BVC shall never be blocked */</span><br><span> LOGP(DBSSGP, LOGL_ERROR, "NSEI=%u/BVCI=%u "</span><br><span> "received block for signalling BVC!?!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_nsei(msg), msgb_bvci(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei, msgb_bvci(msg));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> LOGP(DBSSGP, LOGL_INFO, "BSSGP Rx BVCI=%u BVC-BLOCK\n", bvci);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ptp_ctx = btsctx_by_bvci_nsei(bvci, msgb_nsei(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ ptp_ctx = btsctx_by_bvci_nsei(bvci, nsei);</span><br><span> if (!ptp_ctx)</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &bvci, msg);</span><br><span> </span><br><span>@@ -330,7 +330,7 @@</span><br><span> </span><br><span> /* Send NM_BVC_BLOCK.ind to NM */</span><br><span> memset(&nmp, 0, sizeof(nmp));</span><br><span style="color: hsl(0, 100%, 40%);">- nmp.nsei = msgb_nsei(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ nmp.nsei = nsei;</span><br><span> nmp.bvci = bvci;</span><br><span> nmp.tp = tp;</span><br><span> osmo_prim_init(&nmp.oph, SAP_BSSGP_NM, PRIM_NM_BVC_BLOCK,</span><br><span>@@ -338,14 +338,14 @@</span><br><span> bssgp_prim_cb(&nmp.oph, NULL);</span><br><span> </span><br><span> /* We always acknowledge the BLOCKing */</span><br><span style="color: hsl(0, 100%, 40%);">- return bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_BLOCK_ACK, msgb_nsei(msg),</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_BLOCK_ACK, nsei,</span><br><span> bvci, msgb_bvci(msg));</span><br><span> };</span><br><span> </span><br><span> static int bssgp_rx_bvc_unblock(struct msgb *msg, struct tlv_parsed *tp)</span><br><span> {</span><br><span> struct osmo_bssgp_prim nmp;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t bvci;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t bvci, nsei = msgb_nsei(msg);</span><br><span> struct bssgp_bvc_ctx *ptp_ctx;</span><br><span> </span><br><span> bvci = tlvp_val16be(tp, BSSGP_IE_BVCI);</span><br><span>@@ -353,13 +353,13 @@</span><br><span> /* 8.3.2: Signalling BVC shall never be blocked */</span><br><span> LOGP(DBSSGP, LOGL_ERROR, "NSEI=%u/BVCI=%u "</span><br><span> "received unblock for signalling BVC!?!\n",</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_nsei(msg), msgb_bvci(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei, msgb_bvci(msg));</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> DEBUGP(DBSSGP, "BSSGP BVCI=%u Rx BVC-UNBLOCK\n", bvci);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ptp_ctx = btsctx_by_bvci_nsei(bvci, msgb_nsei(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ ptp_ctx = btsctx_by_bvci_nsei(bvci, nsei);</span><br><span> if (!ptp_ctx)</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &bvci, msg);</span><br><span> </span><br><span>@@ -367,7 +367,7 @@</span><br><span> </span><br><span> /* Send NM_BVC_UNBLOCK.ind to NM */</span><br><span> memset(&nmp, 0, sizeof(nmp));</span><br><span style="color: hsl(0, 100%, 40%);">- nmp.nsei = msgb_nsei(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ nmp.nsei = nsei;</span><br><span> nmp.bvci = bvci;</span><br><span> nmp.tp = tp;</span><br><span> osmo_prim_init(&nmp.oph, SAP_BSSGP_NM, PRIM_NM_BVC_UNBLOCK,</span><br><span>@@ -375,7 +375,7 @@</span><br><span> bssgp_prim_cb(&nmp.oph, NULL);</span><br><span> </span><br><span> /* We always acknowledge the unBLOCKing */</span><br><span style="color: hsl(0, 100%, 40%);">- return bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_UNBLOCK_ACK, msgb_nsei(msg),</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_tx_simple_bvci(BSSGP_PDUT_BVC_UNBLOCK_ACK, nsei,</span><br><span> bvci, msgb_bvci(msg));</span><br><span> };</span><br><span> </span><br><span>@@ -419,7 +419,7 @@</span><br><span> struct osmo_bssgp_prim gbp;</span><br><span> struct gprs_ra_id raid;</span><br><span> uint32_t tlli;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ns_bvci = msgb_bvci(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t ns_bvci = msgb_bvci(msg), nsei = msgb_nsei(msg);</span><br><span> int rc;</span><br><span> </span><br><span> if (!TLVP_PRESENT(tp, BSSGP_IE_TLLI) ||</span><br><span>@@ -438,7 +438,7 @@</span><br><span> </span><br><span> /* Inform GMM about the SUSPEND request */</span><br><span> memset(&gbp, 0, sizeof(gbp));</span><br><span style="color: hsl(0, 100%, 40%);">- gbp.nsei = msgb_nsei(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbp.nsei = nsei;</span><br><span> gbp.bvci = ns_bvci;</span><br><span> gbp.tlli = tlli;</span><br><span> gbp.ra_id = &raid;</span><br><span>@@ -447,9 +447,9 @@</span><br><span> </span><br><span> rc = bssgp_prim_cb(&gbp.oph, NULL);</span><br><span> if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return bssgp_tx_suspend_nack(msgb_nsei(msg), tlli, &raid, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_tx_suspend_nack(nsei, tlli, &raid, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bssgp_tx_suspend_ack(msgb_nsei(msg), tlli, &raid, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_tx_suspend_ack(nsei, tlli, &raid, 0);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -460,7 +460,7 @@</span><br><span> struct gprs_ra_id raid;</span><br><span> uint32_t tlli;</span><br><span> uint8_t suspend_ref;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ns_bvci = msgb_bvci(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t ns_bvci = msgb_bvci(msg), nsei = msgb_nsei(msg);</span><br><span> int rc;</span><br><span> </span><br><span> if (!TLVP_PRESENT(tp, BSSGP_IE_TLLI) ||</span><br><span>@@ -480,7 +480,7 @@</span><br><span> </span><br><span> /* Inform GMM about the RESUME request */</span><br><span> memset(&gbp, 0, sizeof(gbp));</span><br><span style="color: hsl(0, 100%, 40%);">- gbp.nsei = msgb_nsei(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ gbp.nsei = nsei;</span><br><span> gbp.bvci = ns_bvci;</span><br><span> gbp.tlli = tlli;</span><br><span> gbp.ra_id = &raid;</span><br><span>@@ -490,10 +490,10 @@</span><br><span> </span><br><span> rc = bssgp_prim_cb(&gbp.oph, NULL);</span><br><span> if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return bssgp_tx_resume_nack(msgb_nsei(msg), tlli, &raid,</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_tx_resume_nack(nsei, tlli, &raid,</span><br><span> NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bssgp_tx_resume_ack(msgb_nsei(msg), tlli, &raid);</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_tx_resume_ack(nsei, tlli, &raid);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -503,6 +503,7 @@</span><br><span> {</span><br><span> struct osmo_bssgp_prim nmp;</span><br><span> uint32_t tlli = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t nsei = msgb_nsei(msg);</span><br><span> </span><br><span> if (!TLVP_PRESENT(tp, BSSGP_IE_TLLI) ||</span><br><span> !TLVP_PRESENT(tp, BSSGP_IE_LLC_FRAMES_DISCARDED) ||</span><br><span>@@ -522,7 +523,7 @@</span><br><span> </span><br><span> /* send NM_LLC_DISCARDED to NM */</span><br><span> memset(&nmp, 0, sizeof(nmp));</span><br><span style="color: hsl(0, 100%, 40%);">- nmp.nsei = msgb_nsei(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ nmp.nsei = nsei;</span><br><span> nmp.bvci = ctx->bvci;</span><br><span> nmp.tlli = tlli;</span><br><span> nmp.tp = tp;</span><br><span>@@ -535,6 +536,7 @@</span><br><span> int bssgp_rx_status(struct msgb *msg, struct tlv_parsed *tp,</span><br><span> uint16_t bvci, struct bssgp_bvc_ctx *bctx)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t nsei = msgb_nsei(msg);</span><br><span> struct osmo_bssgp_prim nmp;</span><br><span> enum gprs_bssgp_cause cause;</span><br><span> </span><br><span>@@ -562,7 +564,7 @@</span><br><span> </span><br><span> /* send NM_STATUS to NM */</span><br><span> memset(&nmp, 0, sizeof(nmp));</span><br><span style="color: hsl(0, 100%, 40%);">- nmp.nsei = msgb_nsei(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ nmp.nsei = nsei;</span><br><span> nmp.bvci = bvci;</span><br><span> nmp.tp = tp;</span><br><span> osmo_prim_init(&nmp.oph, SAP_BSSGP_NM, PRIM_NM_STATUS,</span><br><span>@@ -1034,6 +1036,7 @@</span><br><span> struct bssgp_bvc_ctx *bctx;</span><br><span> uint8_t pdu_type = bgph->pdu_type;</span><br><span> uint16_t ns_bvci = msgb_bvci(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t nsei = msgb_nsei(msg);</span><br><span> uint16_t bvci = ns_bvci;</span><br><span> int data_len;</span><br><span> int rc = 0;</span><br><span>@@ -1061,7 +1064,7 @@</span><br><span> bvci = tlvp_val16be(&tp, BSSGP_IE_BVCI);</span><br><span> </span><br><span> /* look-up or create the BTS context for this BVC */</span><br><span style="color: hsl(0, 100%, 40%);">- bctx = btsctx_by_bvci_nsei(bvci, msgb_nsei(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ bctx = btsctx_by_bvci_nsei(bvci, nsei);</span><br><span> </span><br><span> if (bctx) {</span><br><span> log_set_context(LOG_CTX_GB_BVC, bctx);</span><br><span>@@ -1080,8 +1083,7 @@</span><br><span> * registered if a BVCI is given. */</span><br><span> if (!bctx && bvci != BVCI_SIGNALLING &&</span><br><span> pdu_type != BSSGP_PDUT_BVC_RESET) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DBSSGP, LOGL_NOTICE, "NSEI=%u/BVCI=%u Rejecting PDU "</span><br><span style="color: hsl(0, 100%, 40%);">- "type %s for unknown BVCI\n", msgb_nsei(msg), bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DBSSGP, LOGL_NOTICE, "NSEI=%u/BVCI=%u Rejecting PDU type %s for unknown BVCI\n", nsei, bvci,</span><br><span> bssgp_pdu_str(pdu_type));</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_UNKNOWN_BVCI, &bvci, msg);</span><br><span> }</span><br><span>@@ -1094,9 +1096,8 @@</span><br><span> rc = bssgp_rx_ptp(msg, &tp, bctx);</span><br><span> else</span><br><span> LOGP(DBSSGP, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "NSEI=%u/BVCI=%u Cannot handle PDU type %s for "</span><br><span style="color: hsl(0, 100%, 40%);">- "unknown BVCI, NS BVCI %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_nsei(msg), bvci, bssgp_pdu_str(pdu_type), ns_bvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ "NSEI=%u/BVCI=%u Cannot handle PDU type %s for unknown BVCI, NS BVCI %u\n", nsei, bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_pdu_str(pdu_type), ns_bvci);</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13204">change 13204</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/13204"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I919a717ca22646849d6ec7f62c677c536db0ed31 </div>
<div style="display:none"> Gerrit-Change-Number: 13204 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Assignee: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: André Boddenberg <dr.blobb@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>