<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22429">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: refactor: ensure all enums have GPRS_NS2_<br><br>Change-Id: I548ff12f7277cbb7e1a630a3dc02b738ce89be72<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_bssgp2.c<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_fr.c<br>M src/gb/gprs_ns2_sns.c<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vc_fsm.c<br>M src/gb/gprs_ns2_vty.c<br>M src/gb/gprs_ns2_vty2.c<br>M tests/gb/gprs_ns2_test.c<br>10 files changed, 123 insertions(+), 123 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/29/22429/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h</span><br><span>index 1b20298..7ceea43 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -26,18 +26,18 @@</span><br><span> /*! The VC will use RESET/BLOCK/UNBLOCK to start the connection and do ALIVE/ACK.</span><br><span> * This is what is needed for Frame Relay transport, and if you use a R97/R99 Gb</span><br><span> * interface over an IP transport (never standardized by 3GPP) */</span><br><span style="color: hsl(0, 100%, 40%);">- NS2_VC_MODE_BLOCKRESET,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_VC_MODE_BLOCKRESET,</span><br><span> /*! The VC will only use ALIVE/ACK (no RESET/BLOCK/UNBLOCK), which is for Gb-IP</span><br><span> * interface compliant to 3GPP Rel=4 or later. */</span><br><span style="color: hsl(0, 100%, 40%);">- NS2_VC_MODE_ALIVE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_VC_MODE_ALIVE,</span><br><span> };</span><br><span> </span><br><span> enum gprs_ns2_dialect {</span><br><span style="color: hsl(0, 100%, 40%);">- NS2_DIALECT_UNDEF,</span><br><span style="color: hsl(0, 100%, 40%);">- NS2_DIALECT_STATIC_ALIVE,</span><br><span style="color: hsl(0, 100%, 40%);">- NS2_DIALECT_STATIC_RESETBLOCK,</span><br><span style="color: hsl(0, 100%, 40%);">- NS2_DIALECT_IPACCESS,</span><br><span style="color: hsl(0, 100%, 40%);">- NS2_DIALECT_SNS,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_DIALECT_UNDEF,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_DIALECT_STATIC_ALIVE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_DIALECT_STATIC_RESETBLOCK,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_DIALECT_IPACCESS,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_DIALECT_SNS,</span><br><span> };</span><br><span> </span><br><span> /*! Osmocom NS link layer types */</span><br><span>@@ -50,9 +50,9 @@</span><br><span> </span><br><span> /*! Osmocom NS primitives according to 48.016 5.2 Service primitves */</span><br><span> enum gprs_ns2_prim {</span><br><span style="color: hsl(0, 100%, 40%);">- PRIM_NS_UNIT_DATA,</span><br><span style="color: hsl(0, 100%, 40%);">- PRIM_NS_CONGESTION,</span><br><span style="color: hsl(0, 100%, 40%);">- PRIM_NS_STATUS,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_PRIM_UNIT_DATA,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_PRIM_CONGESTION,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_PRIM_NS_STATUS,</span><br><span> };</span><br><span> </span><br><span> extern const struct value_string gprs_ns2_prim_strs[];</span><br><span>@@ -68,22 +68,22 @@</span><br><span> </span><br><span> /*! Osmocom NS primitives according to 48.016 5.2.2.4 Service primitves */</span><br><span> enum gprs_ns2_congestion_cause {</span><br><span style="color: hsl(0, 100%, 40%);">- NS_CONG_CAUSE_BACKWARD_BEGIN,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_CONG_CAUSE_BACKWARD_END,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_CONG_CAUSE_FORWARD_BEGIN,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_CONG_CAUSE_FORWARD_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_CONG_CAUSE_BACKWARD_BEGIN,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_CONG_CAUSE_BACKWARD_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_CONG_CAUSE_FORWARD_BEGIN,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_CONG_CAUSE_FORWARD_END,</span><br><span> };</span><br><span> </span><br><span> /*! Osmocom NS primitives according to 48.016 5.2.2.6 Service primitves */</span><br><span> enum gprs_ns2_affecting_cause {</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(0, 100%, 40%);">- NS_AFF_CAUSE_SNS_NO_ENDPOINTS,</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 style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS,</span><br><span> };</span><br><span> </span><br><span> extern const struct value_string gprs_ns2_aff_cause_prim_strs[];</span><br><span>@@ -94,9 +94,9 @@</span><br><span> </span><br><span> /*! Osmocom NS primitives according to 48.016 5.2.2.7 Service primitves */</span><br><span> enum gprs_ns2_change_ip_endpoint {</span><br><span style="color: hsl(0, 100%, 40%);">- NS_ENDPOINT_NO_CHANGE,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_ENDPOINT_REQUEST_CHANGE,</span><br><span style="color: hsl(0, 100%, 40%);">- NS_ENDPOINT_CONFIRM_CHANGE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GRPS_NS2_ENDPOINT_NO_CHANGE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_ENDPOINT_REQUEST_CHANGE,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_ENDPOINT_CONFIRM_CHANGE,</span><br><span> };</span><br><span> </span><br><span> extern const struct value_string gprs_ns2_cause_strs[];</span><br><span>diff --git a/src/gb/gprs_bssgp2.c b/src/gb/gprs_bssgp2.c</span><br><span>index 5a8d41f..0f519ad 100644</span><br><span>--- a/src/gb/gprs_bssgp2.c</span><br><span>+++ b/src/gb/gprs_bssgp2.c</span><br><span>@@ -52,7 +52,7 @@</span><br><span> nsp.nsei = nsei;</span><br><span> nsp.u.unitdata.link_selector = lsp;</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>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 811294b..9682544 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -196,19 +196,19 @@</span><br><span> };</span><br><span> </span><br><span> const struct value_string gprs_ns2_aff_cause_prim_strs[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { NS_AFF_CAUSE_VC_FAILURE, "NSVC failure" },</span><br><span style="color: hsl(0, 100%, 40%);">- { NS_AFF_CAUSE_VC_RECOVERY, "NSVC recovery" },</span><br><span style="color: hsl(0, 100%, 40%);">- { NS_AFF_CAUSE_FAILURE, "NSE failure" },</span><br><span style="color: hsl(0, 100%, 40%);">- { NS_AFF_CAUSE_RECOVERY, "NSE recovery" },</span><br><span style="color: hsl(0, 100%, 40%);">- { NS_AFF_CAUSE_SNS_CONFIGURED, "NSE SNS configured" },</span><br><span style="color: hsl(0, 100%, 40%);">- { NS_AFF_CAUSE_SNS_FAILURE, "NSE SNS failure" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_AFF_CAUSE_VC_FAILURE, "NSVC failure" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_AFF_CAUSE_VC_RECOVERY, "NSVC recovery" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_AFF_CAUSE_FAILURE, "NSE failure" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_AFF_CAUSE_RECOVERY, "NSE recovery" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED, "NSE SNS configured" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_AFF_CAUSE_SNS_FAILURE, "NSE SNS failure" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span> const struct value_string gprs_ns2_prim_strs[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { PRIM_NS_UNIT_DATA, "UNIT DATA" },</span><br><span style="color: hsl(0, 100%, 40%);">- { PRIM_NS_CONGESTION, "CONGESTION" },</span><br><span style="color: hsl(0, 100%, 40%);">- { PRIM_NS_STATUS, "STATUS" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_PRIM_UNIT_DATA, "UNIT DATA" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_PRIM_CONGESTION, "CONGESTION" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { GPRS_NS2_PRIM_NS_STATUS, "STATUS" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -429,7 +429,7 @@</span><br><span> </span><br><span> nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (oph->operation != PRIM_OP_REQUEST || oph->primitive != PRIM_NS_UNIT_DATA)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (oph->operation != PRIM_OP_REQUEST || oph->primitive != GPRS_NS2_PRIM_UNIT_DATA)</span><br><span> return -EINVAL;</span><br><span> </span><br><span> if (!oph->msg)</span><br><span>@@ -448,9 +448,9 @@</span><br><span> if (!nsvc)</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsp->u.unitdata.change == NS_ENDPOINT_REQUEST_CHANGE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsp->u.unitdata.change == GPRS_NS2_ENDPOINT_REQUEST_CHANGE)</span><br><span> sducontrol = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (nsp->u.unitdata.change == NS_ENDPOINT_CONFIRM_CHANGE)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (nsp->u.unitdata.change == GPRS_NS2_ENDPOINT_CONFIRM_CHANGE)</span><br><span> sducontrol = 2;</span><br><span> </span><br><span> return ns2_tx_unit_data(nsvc, bvci, sducontrol, oph->msg);</span><br><span>@@ -477,7 +477,7 @@</span><br><span> if (nsvc)</span><br><span> nsp.u.status.nsvc = gprs_ns2_ll_str_buf(nsvc_str, sizeof(nsvc_str), nsvc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_STATUS,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_NS_STATUS,</span><br><span> PRIM_OP_INDICATION, NULL);</span><br><span> nse->nsi->cb(&nsp.oph, nse->nsi->cb_data);</span><br><span> }</span><br><span>@@ -539,7 +539,7 @@</span><br><span> if (!nsvc)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nsvc->nse, nsvc, 0, NS_AFF_CAUSE_VC_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nsvc->nse, nsvc, 0, GPRS_NS2_AFF_CAUSE_VC_FAILURE);</span><br><span> </span><br><span> llist_del(&nsvc->list);</span><br><span> llist_del(&nsvc->blist);</span><br><span>@@ -703,7 +703,7 @@</span><br><span> if (!nse)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (dialect == NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dialect == GPRS_NS2_DIALECT_SNS) {</span><br><span> snprintf(sns, sizeof(sns), "NSE%05u-SNS", nsei);</span><br><span> nse->bss_sns_fi = ns2_sns_bss_fsm_alloc(nse, sns);</span><br><span> if (!nse->bss_sns_fi) {</span><br><span>@@ -741,7 +741,7 @@</span><br><span> </span><br><span> nse->alive = false;</span><br><span> gprs_ns2_free_nsvcs(nse);</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, NULL, 0, GPRS_NS2_AFF_CAUSE_FAILURE);</span><br><span> </span><br><span> llist_del(&nse->list);</span><br><span> if (nse->bss_sns_fi)</span><br><span>@@ -828,7 +828,7 @@</span><br><span> case NS_PDUT_RESET:</span><br><span> /* accept PDU RESET when vc_mode matches */</span><br><span> if (bind->accept_ipaccess) {</span><br><span style="color: hsl(0, 100%, 40%);">- dialect = NS2_DIALECT_IPACCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ dialect = GPRS_NS2_DIALECT_IPACCESS;</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>@@ -871,7 +871,7 @@</span><br><span> nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei);</span><br><span> if (!nse) {</span><br><span> /* only create nse for udp & ipaccess */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bind->ll != GPRS_NS2_LL_UDP || dialect != NS2_DIALECT_IPACCESS)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bind->ll != GPRS_NS2_LL_UDP || dialect != GPRS_NS2_DIALECT_IPACCESS)</span><br><span> return NS2_CS_SKIPPED;</span><br><span> </span><br><span> if (!bind->nsi->create_nse || !bind->accept_ipaccess)</span><br><span>@@ -942,7 +942,7 @@</span><br><span> if (!nsvc)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->mode == NS2_VC_MODE_BLOCKRESET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->mode == GPRS_NS2_VC_MODE_BLOCKRESET) {</span><br><span> nsvc->nsvci = nsvci;</span><br><span> nsvc->nsvci_is_valid = true;</span><br><span> }</span><br><span>@@ -1151,7 +1151,7 @@</span><br><span> /* wait until both data_weight and sig_weight are != 0 before declaring NSE as alive */</span><br><span> if (unblocked && nse->sum_data_weight && nse->sum_sig_weight) {</span><br><span> nse->alive = true;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_RECOVERY);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, NULL, 0, GPRS_NS2_AFF_CAUSE_RECOVERY);</span><br><span> nse->first = false;</span><br><span> return;</span><br><span> }</span><br><span>@@ -1159,7 +1159,7 @@</span><br><span> if (nse->alive && (nse->sum_data_weight == 0 || nse->sum_sig_weight == 0)) {</span><br><span> /* nse became unavailable */</span><br><span> nse->alive = false;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, NULL, 0, GPRS_NS2_AFF_CAUSE_FAILURE);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -1284,12 +1284,12 @@</span><br><span> enum gprs_ns2_vc_mode ns2_dialect_to_vc_mode(enum gprs_ns2_dialect dialect)</span><br><span> {</span><br><span> switch (dialect) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_SNS:</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_STATIC_ALIVE:</span><br><span style="color: hsl(0, 100%, 40%);">- return NS2_VC_MODE_ALIVE;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_STATIC_RESETBLOCK:</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_IPACCESS:</span><br><span style="color: hsl(0, 100%, 40%);">- return NS2_VC_MODE_BLOCKRESET;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_SNS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_STATIC_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_VC_MODE_ALIVE;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_STATIC_RESETBLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_IPACCESS:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GPRS_NS2_VC_MODE_BLOCKRESET;</span><br><span> default:</span><br><span> return -1;</span><br><span> }</span><br><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index 8ad44ac..1c88db6 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -751,7 +751,7 @@</span><br><span> </span><br><span> snprintf(idbuf, sizeof(idbuf), "%s-%s-DLCI%u-NSE%05u-NSVC%05u", gprs_ns2_lltype_str(nse->ll),</span><br><span> bpriv->netif, dlci, nse->nsei, nsvci);</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = ns2_vc_alloc(bind, nse, true, NS2_VC_MODE_BLOCKRESET, idbuf);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = ns2_vc_alloc(bind, nse, true, GPRS_NS2_VC_MODE_BLOCKRESET, idbuf);</span><br><span> if (!nsvc)</span><br><span> goto err;</span><br><span> </span><br><span>@@ -789,7 +789,7 @@</span><br><span> OSMO_ASSERT(gprs_ns2_is_fr_bind(bind));</span><br><span> nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei);</span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(bind->nsi, nsei, GPRS_NS2_LL_FR, NS2_DIALECT_STATIC_RESETBLOCK);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(bind->nsi, nsei, GPRS_NS2_LL_FR, GPRS_NS2_DIALECT_STATIC_RESETBLOCK);</span><br><span> if (!nse)</span><br><span> return NULL;</span><br><span> created_nse = true;</span><br><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 2dc6524..427a153 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -713,7 +713,7 @@</span><br><span> </span><br><span> /* on a generic failure, the timer callback will recover */</span><br><span> if (old_state != GPRS_SNS_ST_UNCONFIGURED)</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(gss->nse, NULL, 0, NS_AFF_CAUSE_SNS_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE);</span><br><span> </span><br><span> ns2_clear_ipv46_entries(gss);</span><br><span> </span><br><span>@@ -1265,7 +1265,7 @@</span><br><span> static void ns2_sns_st_configured_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</span><br><span> {</span><br><span> struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse, NULL, 0, NS_AFF_CAUSE_SNS_CONFIGURED);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED);</span><br><span> }</span><br><span> </span><br><span> static const struct osmo_fsm_state ns2_sns_bss_states[] = {</span><br><span>@@ -1369,7 +1369,7 @@</span><br><span> /* Choose the next sns endpoint. */</span><br><span> if (llist_empty(&gss->sns_endpoints)) {</span><br><span> gss->initial = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(gss->nse, NULL, 0, NS_AFF_CAUSE_SNS_NO_ENDPOINTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS);</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 3);</span><br><span> return;</span><br><span> } else if (!gss->initial) {</span><br><span>@@ -1606,7 +1606,7 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_SNS) {</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -1645,7 +1645,7 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_SNS) {</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -1698,7 +1698,7 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_SNS) {</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index e1ffad6..43ece13 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -488,7 +488,7 @@</span><br><span> if (osmo_sockaddr_cmp(remote, &vpriv->remote))</span><br><span> return false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->mode == NS2_VC_MODE_BLOCKRESET)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->mode == GPRS_NS2_VC_MODE_BLOCKRESET)</span><br><span> if (nsvc->nsvci != nsvci)</span><br><span> return false;</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>index 7ee29a1..457a41f 100644</span><br><span>--- a/src/gb/gprs_ns2_vc_fsm.c</span><br><span>+++ b/src/gb/gprs_ns2_vc_fsm.c</span><br><span>@@ -212,7 +212,7 @@</span><br><span> osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0);</span><br><span> } else {</span><br><span> /* lost connection */</span><br><span style="color: hsl(0, 100%, 40%);">- if (priv->nsvc->mode == NS2_VC_MODE_BLOCKRESET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->nsvc->mode == GPRS_NS2_VC_MODE_BLOCKRESET) {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], 0);</span><br><span> } else {</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], 0);</span><br><span>@@ -235,10 +235,10 @@</span><br><span> switch (event) {</span><br><span> case GPRS_NS2_EV_REQ_START:</span><br><span> switch (priv->nsvc->mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_VC_MODE_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_VC_MODE_ALIVE:</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_ALIVE, nsi->timeout[NS_TOUT_TNS_ALIVE], NS_TOUT_TNS_ALIVE);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_VC_MODE_BLOCKRESET:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_VC_MODE_BLOCKRESET:</span><br><span> osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_RESET, nsi->timeout[NS_TOUT_TNS_RESET], NS_TOUT_TNS_RESET);</span><br><span> break;</span><br><span> }</span><br><span>@@ -372,7 +372,7 @@</span><br><span> </span><br><span> priv->accept_unitdata = true;</span><br><span> ns2_nse_notify_unblocked(nsvc, true);</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(nse, nsvc, 0, NS_AFF_CAUSE_VC_RECOVERY);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(nse, nsvc, 0, GPRS_NS2_AFF_CAUSE_VC_RECOVERY);</span><br><span> }</span><br><span> </span><br><span> static void ns2_st_unblocked(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -551,9 +551,9 @@</span><br><span> </span><br><span> /* 10.3.9 NS SDU Control Bits */</span><br><span> if (nsh->data[0] & 0x1)</span><br><span style="color: hsl(0, 100%, 40%);">- nsp.u.unitdata.change = NS_ENDPOINT_REQUEST_CHANGE;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsp.u.unitdata.change = GPRS_NS2_ENDPOINT_REQUEST_CHANGE;</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_INDICATION, msg);</span><br><span> nsi->cb(&nsp.oph, nsi->cb_data);</span><br><span> }</span><br><span>@@ -568,7 +568,7 @@</span><br><span> </span><br><span> switch (event) {</span><br><span> case GPRS_NS2_EV_RX_RESET:</span><br><span style="color: hsl(0, 100%, 40%);">- if (priv->nsvc->mode != NS2_VC_MODE_BLOCKRESET)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv->nsvc->mode != GPRS_NS2_VC_MODE_BLOCKRESET)</span><br><span> break;</span><br><span> </span><br><span> /* move the FSM into reset */</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index d6674ff..f803655 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -212,7 +212,7 @@</span><br><span> priv.dscp, VTY_NEWLINE);</span><br><span> </span><br><span> vty_out(vty, " encapsulation udp use-reset-block-unblock %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- priv.vc_mode == NS2_VC_MODE_BLOCKRESET ? "enabled" : "disabled", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ priv.vc_mode == GPRS_NS2_VC_MODE_BLOCKRESET ? "enabled" : "disabled", VTY_NEWLINE);</span><br><span> </span><br><span> llist_for_each_entry(vtyvc, &priv.vtyvc, list) {</span><br><span> vty_out(vty, " nse %u nsvci %u%s",</span><br><span>@@ -440,7 +440,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect == NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect == GPRS_NS2_DIALECT_SNS) {</span><br><span> gprs_ns2_free_nsvcs(nse);</span><br><span> } else {</span><br><span> /* Perform the operation for all nsvc */</span><br><span>@@ -718,9 +718,9 @@</span><br><span> enum gprs_ns2_vc_mode vc_mode;</span><br><span> </span><br><span> if (!strcmp(argv[0], "enabled"))</span><br><span style="color: hsl(0, 100%, 40%);">- vc_mode = NS2_VC_MODE_BLOCKRESET;</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_mode = GPRS_NS2_VC_MODE_BLOCKRESET;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vc_mode = NS2_VC_MODE_ALIVE;</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_mode = GPRS_NS2_VC_MODE_ALIVE;</span><br><span> </span><br><span> priv.vc_mode = vc_mode;</span><br><span> </span><br><span>@@ -831,7 +831,7 @@</span><br><span> vty_nsi = nsi;</span><br><span> memset(&priv, 0, sizeof(struct ns2_vty_priv));</span><br><span> INIT_LLIST_HEAD(&priv.vtyvc);</span><br><span style="color: hsl(0, 100%, 40%);">- priv.vc_mode = NS2_VC_MODE_BLOCKRESET;</span><br><span style="color: hsl(120, 100%, 40%);">+ priv.vc_mode = GPRS_NS2_VC_MODE_BLOCKRESET;</span><br><span> if (default_bind)</span><br><span> memcpy(&priv.udp, default_bind, sizeof(*default_bind));</span><br><span> </span><br><span>@@ -888,7 +888,7 @@</span><br><span> struct gprs_ns2_nse *nse;</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct osmo_sockaddr sockaddr;</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_ns2_dialect dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns2_dialect dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> int rc = 0;</span><br><span> </span><br><span> if (!vty_nsi)</span><br><span>@@ -906,7 +906,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bind->accept_ipaccess = priv.vc_mode == NS2_VC_MODE_BLOCKRESET;</span><br><span style="color: hsl(120, 100%, 40%);">+ bind->accept_ipaccess = priv.vc_mode == GPRS_NS2_VC_MODE_BLOCKRESET;</span><br><span> }</span><br><span> </span><br><span> /* create vcs */</span><br><span>@@ -914,10 +914,10 @@</span><br><span> /* validate settings */</span><br><span> switch (vtyvc->ll) {</span><br><span> case GPRS_NS2_LL_UDP:</span><br><span style="color: hsl(0, 100%, 40%);">- if (priv.vc_mode == NS2_VC_MODE_BLOCKRESET)</span><br><span style="color: hsl(0, 100%, 40%);">- dialect = NS2_DIALECT_IPACCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (priv.vc_mode == GPRS_NS2_VC_MODE_BLOCKRESET)</span><br><span style="color: hsl(120, 100%, 40%);">+ dialect = GPRS_NS2_DIALECT_IPACCESS;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- dialect = NS2_DIALECT_STATIC_ALIVE;</span><br><span style="color: hsl(120, 100%, 40%);">+ dialect = GPRS_NS2_DIALECT_STATIC_ALIVE;</span><br><span> if (strlen(vtyvc->remote.ip) == 0) {</span><br><span> /* Invalid IP for VC */</span><br><span> continue;</span><br><span>@@ -934,10 +934,10 @@</span><br><span> }</span><br><span> break;</span><br><span> case GPRS_NS2_LL_FR:</span><br><span style="color: hsl(0, 100%, 40%);">- dialect = NS2_DIALECT_STATIC_RESETBLOCK;</span><br><span style="color: hsl(120, 100%, 40%);">+ dialect = GPRS_NS2_DIALECT_STATIC_RESETBLOCK;</span><br><span> break;</span><br><span> case GPRS_NS2_LL_FR_GRE:</span><br><span style="color: hsl(0, 100%, 40%);">- dialect = NS2_DIALECT_STATIC_RESETBLOCK;</span><br><span style="color: hsl(120, 100%, 40%);">+ dialect = GPRS_NS2_DIALECT_STATIC_RESETBLOCK;</span><br><span> continue;</span><br><span> case GPRS_NS2_LL_UNDEF:</span><br><span> /* should not happen */</span><br><span>diff --git a/src/gb/gprs_ns2_vty2.c b/src/gb/gprs_ns2_vty2.c</span><br><span>index 43dd263..31aff3e 100644</span><br><span>--- a/src/gb/gprs_ns2_vty2.c</span><br><span>+++ b/src/gb/gprs_ns2_vty2.c</span><br><span>@@ -171,7 +171,7 @@</span><br><span> </span><br><span> nse = gprs_ns2_nse_by_nsei(vty_nsi, nsei);</span><br><span> if (!nse) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(vty_nsi, nsei, GPRS_NS2_LL_UNDEF, NS2_DIALECT_UNDEF);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(vty_nsi, nsei, GPRS_NS2_LL_UNDEF, GPRS_NS2_DIALECT_UNDEF);</span><br><span> if (!nse) {</span><br><span> vty_out(vty, "Failed to create NSE!%s", VTY_NEWLINE);</span><br><span> return CMD_ERR_INCOMPLETE;</span><br><span>@@ -345,7 +345,7 @@</span><br><span> break;</span><br><span> case GPRS_NS2_LL_UDP:</span><br><span> switch (nsvc->nse->dialect) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_IPACCESS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_IPACCESS:</span><br><span> addr = gprs_ns2_ip_vc_remote(nsvc);</span><br><span> if (!addr)</span><br><span> break;</span><br><span>@@ -355,7 +355,7 @@</span><br><span> nsvc->bind->name, addr_str.ip, addr_str.port,</span><br><span> nsvc->nsvci, VTY_NEWLINE);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_STATIC_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_STATIC_ALIVE:</span><br><span> addr = gprs_ns2_ip_vc_remote(nsvc);</span><br><span> if (!addr)</span><br><span> break;</span><br><span>@@ -390,7 +390,7 @@</span><br><span> </span><br><span> vty_out(vty, " nse %u%s", nse->nsei, VTY_NEWLINE);</span><br><span> switch (nse->dialect) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_SNS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_SNS:</span><br><span> ns2_sns_write_vty(vty, nse);</span><br><span> break;</span><br><span> default:</span><br><span>@@ -709,7 +709,7 @@</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_STATIC_RESETBLOCK && nse->dialect != NS2_DIALECT_UNDEF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_STATIC_RESETBLOCK && nse->dialect != GPRS_NS2_DIALECT_UNDEF) {</span><br><span> vty_out(vty, "Can not mix NS-VC with different dialects%s", VTY_NEWLINE);</span><br><span> goto err;</span><br><span> }</span><br><span>@@ -719,8 +719,8 @@</span><br><span> ll_modified = true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect == NS2_DIALECT_UNDEF) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_STATIC_RESETBLOCK;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect == GPRS_NS2_DIALECT_UNDEF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_STATIC_RESETBLOCK;</span><br><span> dialect_modified = true;</span><br><span> }</span><br><span> </span><br><span>@@ -755,7 +755,7 @@</span><br><span> if (ll_modified)</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span> if (dialect_modified)</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> </span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -806,7 +806,7 @@</span><br><span> gprs_ns2_free_nsvc(nsvc);</span><br><span> if (llist_empty(&nse->nsvc)) {</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -825,15 +825,15 @@</span><br><span> uint16_t nsvci = atoi(argv[0]);</span><br><span> </span><br><span> switch (nse->dialect) {</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_SNS:</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_STATIC_ALIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_SNS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_STATIC_ALIVE:</span><br><span> vty_out(vty, "NSE doesn't support NSVCI.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_UNDEF:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_UNDEF:</span><br><span> vty_out(vty, "No NSVCs configured%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_IPACCESS:</span><br><span style="color: hsl(0, 100%, 40%);">- case NS2_DIALECT_STATIC_RESETBLOCK:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_IPACCESS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_DIALECT_STATIC_RESETBLOCK:</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>@@ -852,7 +852,7 @@</span><br><span> gprs_ns2_free_nsvc(nsvc);</span><br><span> if (llist_empty(&nse->nsvc)) {</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -883,8 +883,8 @@</span><br><span> ll_modified = true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect == NS2_DIALECT_UNDEF) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_STATIC_ALIVE;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect == GPRS_NS2_DIALECT_UNDEF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_STATIC_ALIVE;</span><br><span> dialect_modified = true;</span><br><span> }</span><br><span> </span><br><span>@@ -893,7 +893,7 @@</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_STATIC_ALIVE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_STATIC_ALIVE) {</span><br><span> vty_out(vty, "Can not mix NS-VC with different dialects%s", VTY_NEWLINE);</span><br><span> goto err;</span><br><span> }</span><br><span>@@ -934,7 +934,7 @@</span><br><span> if (ll_modified)</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span> if (dialect_modified)</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -961,7 +961,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_STATIC_ALIVE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_STATIC_ALIVE) {</span><br><span> vty_out(vty, "This NSE doesn't support UDP with dialect static alive.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -1010,7 +1010,7 @@</span><br><span> gprs_ns2_free_nsvc(nsvc);</span><br><span> if (llist_empty(&nse->nsvc)) {</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -1044,8 +1044,8 @@</span><br><span> ll_modified = true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect == NS2_DIALECT_UNDEF) {</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_IPACCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect == GPRS_NS2_DIALECT_UNDEF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_IPACCESS;</span><br><span> dialect_modified = true;</span><br><span> }</span><br><span> </span><br><span>@@ -1054,7 +1054,7 @@</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_IPACCESS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_IPACCESS) {</span><br><span> vty_out(vty, "Can not mix NS-VC with different dialects%s", VTY_NEWLINE);</span><br><span> goto err;</span><br><span> }</span><br><span>@@ -1095,7 +1095,7 @@</span><br><span> if (ll_modified)</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span> if (dialect_modified)</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -1125,7 +1125,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_IPACCESS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_IPACCESS) {</span><br><span> vty_out(vty, "This NSE doesn't support UDP with dialect ipaccess.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -1185,7 +1185,7 @@</span><br><span> gprs_ns2_free_nsvc(nsvc);</span><br><span> if (llist_empty(&nse->nsvc)) {</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -1213,13 +1213,13 @@</span><br><span> ll_modified = true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect == NS2_DIALECT_UNDEF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect == GPRS_NS2_DIALECT_UNDEF) {</span><br><span> char sns[16];</span><br><span> snprintf(sns, sizeof(sns), "NSE%05u-SNS", nse->nsei);</span><br><span> nse->bss_sns_fi = ns2_sns_bss_fsm_alloc(nse, sns);</span><br><span> if (!nse->bss_sns_fi)</span><br><span> goto err;</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_SNS;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_SNS;</span><br><span> dialect_modified = true;</span><br><span> }</span><br><span> </span><br><span>@@ -1228,7 +1228,7 @@</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_SNS) {</span><br><span> vty_out(vty, "Can not mix NS-VC with different dialects%s", VTY_NEWLINE);</span><br><span> goto err;</span><br><span> }</span><br><span>@@ -1259,7 +1259,7 @@</span><br><span> if (ll_modified)</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span> if (dialect_modified)</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -1282,7 +1282,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nse->dialect != NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nse->dialect != GPRS_NS2_DIALECT_SNS) {</span><br><span> vty_out(vty, "This NSE doesn't support UDP with dialect ip-sns.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -1313,7 +1313,7 @@</span><br><span> osmo_fsm_inst_term(nse->bss_sns_fi, OSMO_FSM_TERM_REQUEST, NULL);</span><br><span> nse->bss_sns_fi = NULL;</span><br><span> nse->ll = GPRS_NS2_LL_UNDEF;</span><br><span style="color: hsl(0, 100%, 40%);">- nse->dialect = NS2_DIALECT_UNDEF;</span><br><span style="color: hsl(120, 100%, 40%);">+ nse->dialect = GPRS_NS2_DIALECT_UNDEF;</span><br><span> }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -1493,7 +1493,7 @@</span><br><span> </span><br><span> if (!nse->persistent) {</span><br><span> gprs_ns2_free_nse(nse);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (nse->dialect == NS2_DIALECT_SNS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (nse->dialect == GPRS_NS2_DIALECT_SNS) {</span><br><span> gprs_ns2_free_nsvcs(nse);</span><br><span> } else {</span><br><span> /* Perform the operation for all nsvc */</span><br><span>diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c</span><br><span>index 335a079..9e4e02f 100644</span><br><span>--- a/tests/gb/gprs_ns2_test.c</span><br><span>+++ b/tests/gb/gprs_ns2_test.c</span><br><span>@@ -45,7 +45,7 @@</span><br><span> {</span><br><span> OSMO_ASSERT(oph->sap == SAP_NS);</span><br><span> if (oph->msg) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (oph->primitive == PRIM_NS_UNIT_DATA) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (oph->primitive == GPRS_NS2_PRIM_UNIT_DATA) {</span><br><span> osmo_wqueue_enqueue(unitdata, oph->msg);</span><br><span> } else {</span><br><span> msgb_free(oph->msg);</span><br><span>@@ -187,11 +187,11 @@</span><br><span> bind[0] = dummy_bind(nsi, "transfercap1");</span><br><span> bind[1] = dummy_bind(nsi, "transfercap2");</span><br><span> bind[1]->transfer_capability = 23;</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(nsi, 1001, GPRS_NS2_LL_UDP, NS2_DIALECT_STATIC_ALIVE);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(nsi, 1001, GPRS_NS2_LL_UDP, GPRS_NS2_DIALECT_STATIC_ALIVE);</span><br><span> OSMO_ASSERT(nse);</span><br><span> </span><br><span> printf("---- Test with NSVC[0]\n");</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc[0] = ns2_vc_alloc(bind[0], nse, false, NS2_VC_MODE_ALIVE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc[0] = ns2_vc_alloc(bind[0], nse, false, GPRS_NS2_VC_MODE_ALIVE, NULL);</span><br><span> OSMO_ASSERT(nsvc[0]);</span><br><span> OSMO_ASSERT(ns2_count_transfer_cap(nse, 0) == 0);</span><br><span> nsvc[0]->fi->state = 3; /* HACK: 3 = GPRS_NS2_ST_UNBLOCKED */</span><br><span>@@ -199,7 +199,7 @@</span><br><span> OSMO_ASSERT(ns2_count_transfer_cap(nse, 0) == 42);</span><br><span> </span><br><span> printf("---- Test with NSVC[1]\n");</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc[1] = ns2_vc_alloc(bind[0], nse, false, NS2_VC_MODE_ALIVE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc[1] = ns2_vc_alloc(bind[0], nse, false, GPRS_NS2_VC_MODE_ALIVE, NULL);</span><br><span> OSMO_ASSERT(nsvc[1]);</span><br><span> OSMO_ASSERT(ns2_count_transfer_cap(nse, 0) == 42);</span><br><span> nsvc[1]->fi->state = 3; /* HACK: 3 = GPRS_NS2_ST_UNBLOCKED */</span><br><span>@@ -207,7 +207,7 @@</span><br><span> OSMO_ASSERT(ns2_count_transfer_cap(nse, 0) == 42);</span><br><span> </span><br><span> printf("---- Test with NSVC[2]\n");</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc[2] = ns2_vc_alloc(bind[1], nse, false, NS2_VC_MODE_ALIVE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc[2] = ns2_vc_alloc(bind[1], nse, false, GPRS_NS2_VC_MODE_ALIVE, NULL);</span><br><span> OSMO_ASSERT(nsvc[2]);</span><br><span> OSMO_ASSERT(ns2_count_transfer_cap(nse, 0) == 42);</span><br><span> nsvc[2]->fi->state = 3; /* HACK: 3 = GPRS_NS2_ST_UNBLOCKED */</span><br><span>@@ -244,13 +244,13 @@</span><br><span> nsi = gprs_ns2_instantiate(ctx, ns_prim_cb, NULL);</span><br><span> bind[0] = dummy_bind(nsi, "bblock1");</span><br><span> bind[1] = dummy_bind(nsi, "bblock2");</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(nsi, 1001, GPRS_NS2_LL_UDP, NS2_DIALECT_STATIC_RESETBLOCK);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(nsi, 1001, GPRS_NS2_LL_UDP, GPRS_NS2_DIALECT_STATIC_RESETBLOCK);</span><br><span> OSMO_ASSERT(nse);</span><br><span> </span><br><span> for (i=0; i<2; i++) {</span><br><span> printf("---- Create NSVC[i]\n");</span><br><span> snprintf(idbuf, sizeof(idbuf), "NSE%05u-dummy-%i", nse->nsei, i);</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc[i] = ns2_vc_alloc(bind[i], nse, false, NS2_VC_MODE_BLOCKRESET, idbuf);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc[i] = ns2_vc_alloc(bind[i], nse, false, GPRS_NS2_VC_MODE_BLOCKRESET, idbuf);</span><br><span> OSMO_ASSERT(nsvc[i]);</span><br><span> nsvc[i]->fi->state = 3; /* HACK: 3 = GPRS_NS2_ST_UNBLOCKED */</span><br><span> /* ensure the fi->state works correct */</span><br><span>@@ -321,13 +321,13 @@</span><br><span> bind[0] = dummy_bind(nsi, "bblock1");</span><br><span> bind[1] = dummy_bind(nsi, "bblock2");</span><br><span> loopbind = loopback_bind(nsi, "loopback");</span><br><span style="color: hsl(0, 100%, 40%);">- nse = gprs_ns2_create_nse(nsi, 1004, GPRS_NS2_LL_UDP, NS2_DIALECT_STATIC_RESETBLOCK);</span><br><span style="color: hsl(120, 100%, 40%);">+ nse = gprs_ns2_create_nse(nsi, 1004, GPRS_NS2_LL_UDP, GPRS_NS2_DIALECT_STATIC_RESETBLOCK);</span><br><span> OSMO_ASSERT(nse);</span><br><span> </span><br><span> for (i=0; i<2; i++) {</span><br><span> printf("---- Create NSVC[%d]\n", i);</span><br><span> snprintf(idbuf, sizeof(idbuf), "NSE%05u-dummy-%i", nse->nsei, i);</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc[i] = ns2_vc_alloc(bind[i], nse, false, NS2_VC_MODE_BLOCKRESET, idbuf);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc[i] = ns2_vc_alloc(bind[i], nse, false, GPRS_NS2_VC_MODE_BLOCKRESET, idbuf);</span><br><span> loop[i] = loopback_nsvc(loopbind, nsvc[i]);</span><br><span> OSMO_ASSERT(nsvc[i]);</span><br><span> ns2_vc_fsm_start(nsvc[i]);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22429">change 22429</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/libosmocore/+/22429"/><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-Change-Id: I548ff12f7277cbb7e1a630a3dc02b738ce89be72 </div>
<div style="display:none"> Gerrit-Change-Number: 22429 </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>