<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21559">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gb_proxy: cosmetic: Use function rather than open-coding is_sgsn<br><br>Change-Id: Id41d74ebd41e5084377a986f4a1acd53cae12bc1<br>---<br>M src/gbproxy/gb_proxy.c<br>1 file changed, 8 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/59/21559/1</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 74f799d..98fa928 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -83,6 +83,12 @@</span><br><span> static int gbprox_relay2sgsn(struct gbproxy_config *cfg, struct msgb *old_msg,</span><br><span>                         uint16_t ns_bvci, uint16_t sgsn_nsei);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int gbproxy_is_sgsn_nsei(struct gbproxy_config *cfg, uint16_t nsei)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      return nsei == cfg->nsip_sgsn_nsei;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int check_bvc_nsei(struct gbproxy_bvc *bvc, uint16_t nsei)</span><br><span> {</span><br><span>        OSMO_ASSERT(bvc);</span><br><span>@@ -726,11 +732,6 @@</span><br><span>     return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, orig_msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gbproxy_is_sgsn_nsei(struct gbproxy_config *cfg, uint16_t nsei)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-   return nsei == cfg->nsip_sgsn_nsei;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int gbprox_bssgp_send_cb(void *ctx, struct msgb *msg)</span><br><span> {</span><br><span>        int rc;</span><br><span>@@ -800,7 +801,7 @@</span><br><span> </span><br><span>    case NS_AFF_CAUSE_RECOVERY:</span><br><span>          LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei);</span><br><span style="color: hsl(0, 100%, 40%);">-                if (nsp->nsei == cfg->nsip_sgsn_nsei) {</span><br><span style="color: hsl(120, 100%, 40%);">+         if (gbproxy_is_sgsn_nsei(cfg, nsp->nsei)) {</span><br><span>                       /* look-up or create the BTS context for this BVC */</span><br><span>                         struct bssgp_bvc_ctx *bctx = btsctx_by_bvci_nsei(nsp->bvci, nsp->nsei);</span><br><span>                        if (!bctx)</span><br><span>@@ -810,7 +811,7 @@</span><br><span>             }</span><br><span>            break;</span><br><span>       case NS_AFF_CAUSE_FAILURE:</span><br><span style="color: hsl(0, 100%, 40%);">-              if (nsp->nsei == cfg->nsip_sgsn_nsei) {</span><br><span style="color: hsl(120, 100%, 40%);">+         if (gbproxy_is_sgsn_nsei(cfg, nsp->nsei)) {</span><br><span>                       /* sgsn */</span><br><span>                   /* TODO: BSVC: block all PtP towards bss */</span><br><span>                  rate_ctr_inc(&cfg->ctrg-></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21559">change 21559</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/+/21559"/><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: Id41d74ebd41e5084377a986f4a1acd53cae12bc1 </div>
<div style="display:none"> Gerrit-Change-Number: 21559 </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>