<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22499">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">follow libosmocore/gprs_ns2 API changes of GPRS enums<br><br>All gprs_ns2 enums have now GPRS_NS2 as prefix.<br><br>API change which must be synchronized with libosmocore<br><br>Depends-on: I548ff12f7277cbb7e1a630a3dc02b738ce89be72 (libosmocore)<br>Change-Id: I1af704cdd62ddaff4304479b837dc185b80d7dd6<br>---<br>M src/gbproxy/gb_proxy.c<br>M src/sgsn/gprs_gb.c<br>2 files changed, 20 insertions(+), 20 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 1dc3114..1d29b64 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -168,7 +168,7 @@</span><br><span> if (gprs_gb_parse_tlli(msgb_data(msg), msgb_length(msg), &tlli) == 1)</span><br><span> nsp.u.unitdata.link_selector = tlli;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA,</span><br><span> PRIM_OP_REQUEST, msg);</span><br><span> rc = gprs_ns2_recv_prim(nsi, &nsp.oph);</span><br><span> /* FIXME: We need a counter group for gbproxy_nse */</span><br><span>@@ -1279,7 +1279,7 @@</span><br><span> nsp.bvci = msgb_bvci(msg);</span><br><span> nsp.nsei = msgb_nsei(msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA, PRIM_OP_REQUEST, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, PRIM_OP_REQUEST, msg);</span><br><span> rc = gprs_ns2_recv_prim(nsi, &nsp.oph);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -1321,13 +1321,13 @@</span><br><span> }</span><br><span> </span><br><span> /* TODO: What about handling:</span><br><span style="color: hsl(0, 100%, 40%);">- * NS_AFF_CAUSE_VC_FAILURE,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_AFF_CAUSE_VC_RECOVERY,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_AFF_CAUSE_FAILURE,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_AFF_CAUSE_RECOVERY,</span><br><span style="color: hsl(120, 100%, 40%);">+ * GPRS_NS2_AFF_CAUSE_VC_FAILURE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_AFF_CAUSE_VC_RECOVERY,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_AFF_CAUSE_FAILURE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_AFF_CAUSE_RECOVERY,</span><br><span> osmocom own causes</span><br><span style="color: hsl(0, 100%, 40%);">- NS_AFF_CAUSE_SNS_CONFIGURED,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_AFF_CAUSE_SNS_FAILURE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_AFF_CAUSE_SNS_FAILURE,</span><br><span> */</span><br><span> </span><br><span> void gprs_ns_prim_status_cb(struct gbproxy_config *cfg, struct osmo_gprs_ns2_prim *nsp)</span><br><span>@@ -1340,11 +1340,11 @@</span><br><span> struct gbproxy_nse *sgsn_nse;</span><br><span> </span><br><span> switch (nsp->u.status.cause) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NS_AFF_CAUSE_SNS_FAILURE:</span><br><span style="color: hsl(0, 100%, 40%);">- case NS_AFF_CAUSE_SNS_CONFIGURED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_AFF_CAUSE_SNS_FAILURE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED:</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- case NS_AFF_CAUSE_RECOVERY:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_AFF_CAUSE_RECOVERY:</span><br><span> LOGP(DGPRS, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei);</span><br><span> sgsn_nse = gbproxy_nse_by_nsei(cfg, nsp->nsei, NSE_F_SGSN);</span><br><span> if (sgsn_nse) {</span><br><span>@@ -1354,7 +1354,7 @@</span><br><span> osmo_fsm_inst_dispatch(bvc->fi, BSSGP_BVCFSM_E_REQ_RESET, &cause); </span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS_AFF_CAUSE_FAILURE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_AFF_CAUSE_FAILURE:</span><br><span> #if 0</span><br><span> if (gbproxy_is_sgsn_nsei(cfg, nsp->nsei)) {</span><br><span> /* sgsn */</span><br><span>@@ -1408,7 +1408,7 @@</span><br><span> }</span><br><span> </span><br><span> switch (oph->primitive) {</span><br><span style="color: hsl(0, 100%, 40%);">- case PRIM_NS_UNIT_DATA:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_PRIM_UNIT_DATA:</span><br><span> </span><br><span> /* hand the message into the BSSGP implementation */</span><br><span> msgb_bssgph(oph->msg) = oph->msg->l3h;</span><br><span>@@ -1420,7 +1420,7 @@</span><br><span> rc = gbprox_rcvmsg(cfg, oph->msg);</span><br><span> msgb_free(oph->msg);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case PRIM_NS_STATUS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_PRIM_STATUS:</span><br><span> gprs_ns_prim_status_cb(cfg, nsp);</span><br><span> break;</span><br><span> default:</span><br><span>diff --git a/src/sgsn/gprs_gb.c b/src/sgsn/gprs_gb.c</span><br><span>index c7d5c28..2585d6d 100644</span><br><span>--- a/src/sgsn/gprs_gb.c</span><br><span>+++ b/src/sgsn/gprs_gb.c</span><br><span>@@ -114,17 +114,17 @@</span><br><span> struct osmo_gprs_ns2_prim nsp = {};</span><br><span> nsp.nsei = msgb_nsei(msg);</span><br><span> nsp.bvci = msgb_bvci(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA, PRIM_OP_REQUEST, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA, PRIM_OP_REQUEST, msg);</span><br><span> return gprs_ns2_recv_prim(nsi, &nsp.oph);</span><br><span> }</span><br><span> </span><br><span> void gprs_ns_prim_status_cb(struct osmo_gprs_ns2_prim *nsp)</span><br><span> {</span><br><span> switch (nsp->u.status.cause) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NS_AFF_CAUSE_SNS_CONFIGURED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED:</span><br><span> LOGP(DGPRS, LOGL_NOTICE, "NS-E %d SNS configured.\n", nsp->nsei);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS_AFF_CAUSE_RECOVERY:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_AFF_CAUSE_RECOVERY:</span><br><span> LOGP(DGPRS, LOGL_NOTICE, "NS-E %d became available\n", nsp->nsei);</span><br><span> /* workaround for broken BSS which doesn't respond correct to BSSGP status message.</span><br><span> * Sent a BSSGP Reset when a persistent NSVC comes up for the first time. */</span><br><span>@@ -135,7 +135,7 @@</span><br><span> bssgp_tx_bvc_reset2(&bctx, BVCI_SIGNALLING, BSSGP_CAUSE_EQUIP_FAIL, false);</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS_AFF_CAUSE_FAILURE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_AFF_CAUSE_FAILURE:</span><br><span> LOGP(DGPRS, LOGL_NOTICE, "NS-E %d became unavailable\n", nsp->nsei);</span><br><span> break;</span><br><span> default:</span><br><span>@@ -164,7 +164,7 @@</span><br><span> }</span><br><span> </span><br><span> switch (oph->primitive) {</span><br><span style="color: hsl(0, 100%, 40%);">- case PRIM_NS_UNIT_DATA:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_PRIM_UNIT_DATA:</span><br><span> /* hand the message into the BSSGP implementation */</span><br><span> /* add required msg fields for Gb layer */</span><br><span> msgb_bssgph(oph->msg) = oph->msg->l3h;</span><br><span>@@ -172,7 +172,7 @@</span><br><span> msgb_nsei(oph->msg) = nsp->nsei;</span><br><span> rc = bssgp_rcvmsg(oph->msg);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case PRIM_NS_STATUS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_PRIM_STATUS:</span><br><span> gprs_ns_prim_status_cb(nsp);</span><br><span> break;</span><br><span> default:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22499">change 22499</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/+/22499"/><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: I1af704cdd62ddaff4304479b837dc185b80d7dd6 </div>
<div style="display:none"> Gerrit-Change-Number: 22499 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: daniel <dwillmann@sysmocom.de> </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>