<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22506">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">follow gprs_ns2 API enum changes<br><br>All gprs_ns2 enums have now GPRS_NS2 as prefix.<br><br>Depends-on: I548ff12f7277cbb7e1a630a3dc02b738ce89be72 (libosmocore)<br>Change-Id: Ifdc7956318c07d680feab33c22bc2c6f20927bf9<br>---<br>M src/gprs_bssgp_pcu.c<br>M src/gprs_pcu.c<br>M src/pcu_vty.c<br>3 files changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/22506/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c</span><br><span>index 81a6518..a6b6f7e 100644</span><br><span>--- a/src/gprs_bssgp_pcu.c</span><br><span>+++ b/src/gprs_bssgp_pcu.c</span><br><span>@@ -576,10 +576,10 @@</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(DPCU, LOGL_NOTICE, "NS-NSE %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(DPCU, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei);</span><br><span> if (!the_pcu->bssgp.nsvc_unblocked) {</span><br><span> the_pcu->bssgp.bvc_sig_reset = 0;</span><br><span>@@ -588,7 +588,7 @@</span><br><span> bvc_timeout(NULL);</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(DPCU, LOGL_NOTICE, "NS-NSE %d became unavailable\n", nsp->nsei);</span><br><span> if (the_pcu->bssgp.nsvc_unblocked) {</span><br><span> the_pcu->bssgp.nsvc_unblocked = 0;</span><br><span>@@ -598,7 +598,7 @@</span><br><span> the_pcu->bssgp.bvc_unblocked = 0;</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS_AFF_CAUSE_SNS_FAILURE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_AFF_CAUSE_SNS_FAILURE:</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DPCU, LOGL_DEBUG,</span><br><span>@@ -628,7 +628,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>@@ -636,10 +636,10 @@</span><br><span> msgb_nsei(oph->msg) = nsp->nsei;</span><br><span> rc = gprs_bssgp_pcu_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 style="color: hsl(0, 100%, 40%);">- case PRIM_NS_CONGESTION:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_PRIM_CONGESTION:</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DPCU, LOGL_DEBUG,</span><br><span>@@ -663,7 +663,7 @@</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,</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> return gprs_ns2_recv_prim(nsi, &nsp.oph);</span><br><span> }</span><br><span>@@ -1029,7 +1029,7 @@</span><br><span> continue;</span><br><span> </span><br><span> /* FIXME: for SNS we just use the first successful NS-VC instead of all for the initial connect */</span><br><span style="color: hsl(0, 100%, 40%);">- if (the_pcu->vty.ns_dialect == NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) {</span><br><span> rc = gprs_ns2_sns_add_endpoint(bts->nse, &remote[i]);</span><br><span> if (!rc)</span><br><span> return rc;</span><br><span>@@ -1099,7 +1099,7 @@</span><br><span> gprs_ns2_free_nses(the_pcu->nsi);</span><br><span> gprs_ns2_free_binds(the_pcu->nsi);</span><br><span> rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (the_pcu->vty.ns_dialect == NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) {</span><br><span> /* SNS: check if the initial nsvc is the same, if not recreate it */</span><br><span> const struct osmo_sockaddr *initial = gprs_ns2_nse_sns_remote(bts->nse);</span><br><span> unsigned int i;</span><br><span>diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c</span><br><span>index 2f18dfd..0786199 100644</span><br><span>--- a/src/gprs_pcu.c</span><br><span>+++ b/src/gprs_pcu.c</span><br><span>@@ -91,7 +91,7 @@</span><br><span> pcu->vty.mcs_lqual_ranges[7].high = 24;</span><br><span> pcu->vty.mcs_lqual_ranges[8].low = 23;</span><br><span> pcu->vty.mcs_lqual_ranges[8].high = 256;</span><br><span style="color: hsl(0, 100%, 40%);">- pcu->vty.ns_dialect = NS2_DIALECT_IPACCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu->vty.ns_dialect = GPRS_NS2_DIALECT_IPACCESS;</span><br><span> /* TODO: increase them when CRBB decoding is implemented */</span><br><span> pcu->vty.ws_base = 64;</span><br><span> pcu->vty.ws_pdch = 0;</span><br><span>diff --git a/src/pcu_vty.c b/src/pcu_vty.c</span><br><span>index 288f241..4b502c9 100644</span><br><span>--- a/src/pcu_vty.c</span><br><span>+++ b/src/pcu_vty.c</span><br><span>@@ -244,7 +244,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (the_pcu->vty.ns_dialect == NS2_DIALECT_SNS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS)</span><br><span> vty_out(vty, " gb-dialect ip-sns%s", VTY_NEWLINE);</span><br><span> else</span><br><span> vty_out(vty, " gb-dialect classic%s", VTY_NEWLINE);</span><br><span>@@ -1010,9 +1010,9 @@</span><br><span> "Modern Gb interface with IP-SNS (Sub Network Service) and dynamic configuration\n")</span><br><span> {</span><br><span> if (!strcmp(argv[0], "ip-sns")) {</span><br><span style="color: hsl(0, 100%, 40%);">- the_pcu->vty.ns_dialect = NS2_DIALECT_SNS;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.ns_dialect = GPRS_NS2_DIALECT_SNS;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- the_pcu->vty.ns_dialect = NS2_DIALECT_IPACCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ the_pcu->vty.ns_dialect = GPRS_NS2_DIALECT_IPACCESS;</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22506">change 22506</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-pcu/+/22506"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifdc7956318c07d680feab33c22bc2c6f20927bf9 </div>
<div style="display:none"> Gerrit-Change-Number: 22506 </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-MessageType: newchange </div>