This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
lynxis lazus gerrit-no-reply at lists.osmocom.orglynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22506 )
Change subject: follow gprs_ns2 API enum changes
......................................................................
follow gprs_ns2 API enum changes
All gprs_ns2 enums have now GPRS_NS2 as prefix.
Depends-on: I548ff12f7277cbb7e1a630a3dc02b738ce89be72 (libosmocore)
Change-Id: Ifdc7956318c07d680feab33c22bc2c6f20927bf9
---
M src/gprs_bssgp_pcu.c
M src/gprs_pcu.c
M src/pcu_vty.c
3 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/22506/1
diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c
index 81a6518..a6b6f7e 100644
--- a/src/gprs_bssgp_pcu.c
+++ b/src/gprs_bssgp_pcu.c
@@ -576,10 +576,10 @@
void gprs_ns_prim_status_cb(struct osmo_gprs_ns2_prim *nsp)
{
switch (nsp->u.status.cause) {
- case NS_AFF_CAUSE_SNS_CONFIGURED:
+ case GPRS_NS2_AFF_CAUSE_SNS_CONFIGURED:
LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d SNS configured.\n", nsp->nsei);
break;
- case NS_AFF_CAUSE_RECOVERY:
+ case GPRS_NS2_AFF_CAUSE_RECOVERY:
LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei);
if (!the_pcu->bssgp.nsvc_unblocked) {
the_pcu->bssgp.bvc_sig_reset = 0;
@@ -588,7 +588,7 @@
bvc_timeout(NULL);
}
break;
- case NS_AFF_CAUSE_FAILURE:
+ case GPRS_NS2_AFF_CAUSE_FAILURE:
LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became unavailable\n", nsp->nsei);
if (the_pcu->bssgp.nsvc_unblocked) {
the_pcu->bssgp.nsvc_unblocked = 0;
@@ -598,7 +598,7 @@
the_pcu->bssgp.bvc_unblocked = 0;
}
break;
- case NS_AFF_CAUSE_SNS_FAILURE:
+ case GPRS_NS2_AFF_CAUSE_SNS_FAILURE:
break;
default:
LOGP(DPCU, LOGL_DEBUG,
@@ -628,7 +628,7 @@
}
switch (oph->primitive) {
- case PRIM_NS_UNIT_DATA:
+ case GPRS_NS2_PRIM_UNIT_DATA:
/* hand the message into the BSSGP implementation */
/* add required msg fields for Gb layer */
msgb_bssgph(oph->msg) = oph->msg->l3h;
@@ -636,10 +636,10 @@
msgb_nsei(oph->msg) = nsp->nsei;
rc = gprs_bssgp_pcu_rcvmsg(oph->msg);
break;
- case PRIM_NS_STATUS:
+ case GPRS_NS2_PRIM_STATUS:
gprs_ns_prim_status_cb(nsp);
break;
- case PRIM_NS_CONGESTION:
+ case GPRS_NS2_PRIM_CONGESTION:
break;
default:
LOGP(DPCU, LOGL_DEBUG,
@@ -663,7 +663,7 @@
struct osmo_gprs_ns2_prim nsp = {};
nsp.nsei = msgb_nsei(msg);
nsp.bvci = msgb_bvci(msg);
- osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA,
+ osmo_prim_init(&nsp.oph, SAP_NS, GPRS_NS2_PRIM_UNIT_DATA,
PRIM_OP_REQUEST, msg);
return gprs_ns2_recv_prim(nsi, &nsp.oph);
}
@@ -1029,7 +1029,7 @@
continue;
/* FIXME: for SNS we just use the first successful NS-VC instead of all for the initial connect */
- if (the_pcu->vty.ns_dialect == NS2_DIALECT_SNS) {
+ if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) {
rc = gprs_ns2_sns_add_endpoint(bts->nse, &remote[i]);
if (!rc)
return rc;
@@ -1099,7 +1099,7 @@
gprs_ns2_free_nses(the_pcu->nsi);
gprs_ns2_free_binds(the_pcu->nsi);
rc = ns_create_nsvc(bts, nsei, local, remote, nsvci, valid);
- } else if (the_pcu->vty.ns_dialect == NS2_DIALECT_SNS) {
+ } else if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS) {
/* SNS: check if the initial nsvc is the same, if not recreate it */
const struct osmo_sockaddr *initial = gprs_ns2_nse_sns_remote(bts->nse);
unsigned int i;
diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c
index 2f18dfd..0786199 100644
--- a/src/gprs_pcu.c
+++ b/src/gprs_pcu.c
@@ -91,7 +91,7 @@
pcu->vty.mcs_lqual_ranges[7].high = 24;
pcu->vty.mcs_lqual_ranges[8].low = 23;
pcu->vty.mcs_lqual_ranges[8].high = 256;
- pcu->vty.ns_dialect = NS2_DIALECT_IPACCESS;
+ pcu->vty.ns_dialect = GPRS_NS2_DIALECT_IPACCESS;
/* TODO: increase them when CRBB decoding is implemented */
pcu->vty.ws_base = 64;
pcu->vty.ws_pdch = 0;
diff --git a/src/pcu_vty.c b/src/pcu_vty.c
index 288f241..4b502c9 100644
--- a/src/pcu_vty.c
+++ b/src/pcu_vty.c
@@ -244,7 +244,7 @@
}
}
- if (the_pcu->vty.ns_dialect == NS2_DIALECT_SNS)
+ if (the_pcu->vty.ns_dialect == GPRS_NS2_DIALECT_SNS)
vty_out(vty, " gb-dialect ip-sns%s", VTY_NEWLINE);
else
vty_out(vty, " gb-dialect classic%s", VTY_NEWLINE);
@@ -1010,9 +1010,9 @@
"Modern Gb interface with IP-SNS (Sub Network Service) and dynamic configuration\n")
{
if (!strcmp(argv[0], "ip-sns")) {
- the_pcu->vty.ns_dialect = NS2_DIALECT_SNS;
+ the_pcu->vty.ns_dialect = GPRS_NS2_DIALECT_SNS;
} else {
- the_pcu->vty.ns_dialect = NS2_DIALECT_IPACCESS;
+ the_pcu->vty.ns_dialect = GPRS_NS2_DIALECT_IPACCESS;
}
return CMD_SUCCESS;
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22506
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ifdc7956318c07d680feab33c22bc2c6f20927bf9
Gerrit-Change-Number: 22506
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210127/65ce177b/attachment.htm>