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/libosmocore/+/22426 )
Change subject: gprs_ns2: drop GPRS_ prefix of gprs_ns2_cs
......................................................................
gprs_ns2: drop GPRS_ prefix of gprs_ns2_cs
gprs_ns2_cs is a privat enum while GPRS_ should only used
for public enums.
Change-Id: I79be92ca716366c2e07ea061c08d95bea817a8c7
---
M src/gb/gprs_ns2.c
M src/gb/gprs_ns2_frgre.c
M src/gb/gprs_ns2_internal.h
M src/gb/gprs_ns2_udp.c
4 files changed, 38 insertions(+), 38 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/22426/1
diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c
index 451290b..2c417f2 100644
--- a/src/gb/gprs_ns2.c
+++ b/src/gb/gprs_ns2.c
@@ -778,11 +778,11 @@
* \param[out] reject A message filled to be sent back. Only used in failure cases.
* \param[out] success A pointer which will be set to the new VC on success
* \return enum value indicating the status, e.g. GPRS_NS2_CS_CREATED */
-enum gprs_ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind,
- struct msgb *msg,
- const char *logname,
- struct msgb **reject,
- struct gprs_ns2_vc **success)
+enum ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind,
+ struct msgb *msg,
+ const char *logname,
+ struct msgb **reject,
+ struct gprs_ns2_vc **success)
{
struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *)msg->l2h;
struct tlv_parsed tp;
@@ -797,7 +797,7 @@
int rc, tlv;
if (msg->len < sizeof(struct gprs_ns_hdr))
- return GPRS_NS2_CS_ERROR;
+ return NS2_CS_ERROR;
/* parse the tlv early to allow reject status msg to
* work with valid tp.
@@ -812,19 +812,19 @@
LOGP(DLNS, LOGL_INFO, "Ignoring NS STATUS from %s "
"for non-existing NS-VC\n",
logname);
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
case NS_PDUT_ALIVE_ACK:
/* Ignore this, see 3GPP TS 08.16, 7.4.1 */
LOGP(DLNS, LOGL_INFO, "Ignoring NS ALIVE ACK from %s "
"for non-existing NS-VC\n",
logname);
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
case NS_PDUT_RESET_ACK:
/* Ignore this, see 3GPP TS 08.16, 7.3.1 */
LOGP(DLNS, LOGL_INFO, "Ignoring NS RESET ACK from %s "
"for non-existing NS-VC\n",
logname);
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
case NS_PDUT_RESET:
/* accept PDU RESET when vc_mode matches */
if (bind->accept_ipaccess) {
@@ -835,12 +835,12 @@
rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE);
if (rc < 0)
LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);
- return GPRS_NS2_CS_REJECTED;
+ return NS2_CS_REJECTED;
default:
rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PDU_INCOMP_PSTATE);
if (rc < 0)
LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);
- return GPRS_NS2_CS_REJECTED;
+ return NS2_CS_REJECTED;
}
if (tlv < 0) {
@@ -852,7 +852,7 @@
rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_PROTO_ERR_UNSPEC);
if (rc < 0)
LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);
- return GPRS_NS2_CS_REJECTED;
+ return NS2_CS_REJECTED;
}
if (!TLVP_PRES_LEN(&tp, NS_IE_CAUSE, 1) ||
@@ -861,7 +861,7 @@
rc = reject_status_msg(msg, &tp, reject, NS_CAUSE_MISSING_ESSENT_IE);
if (rc < 0)
LOGP(DLNS, LOGL_ERROR, "Failed to generate reject message (%d)\n", rc);
- return GPRS_NS2_CS_REJECTED;
+ return NS2_CS_REJECTED;
}
nsei = tlvp_val16be(&tp, NS_IE_NSEI);
@@ -872,15 +872,15 @@
if (!nse) {
/* only create nse for udp & ipaccess */
if (bind->ll != GPRS_NS2_LL_UDP || dialect != NS2_DIALECT_IPACCESS)
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
if (!bind->nsi->create_nse || !bind->accept_ipaccess)
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
nse = gprs_ns2_create_nse(bind->nsi, nsei, bind->ll, dialect);
if (!nse) {
LOGP(DLNS, LOGL_ERROR, "Failed to create NSE(%05u)\n", nsei);
- return GPRS_NS2_CS_ERROR;
+ return NS2_CS_ERROR;
}
} else {
/* nsei already known */
@@ -888,7 +888,7 @@
LOGNSE(nse, LOGL_ERROR, "Received NS-RESET NS-VCI(%05u) with wrong linklayer(%s)"
" for already known NSE(%s)\n", nsvci, gprs_ns2_lltype_str(bind->ll),
gprs_ns2_lltype_str(nse->ll));
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
}
}
@@ -896,7 +896,7 @@
if (nsvc) {
if (nsvc->persistent) {
LOGNSVC(nsvc, LOGL_ERROR, "Received NS-RESET for a persistent NSE over wrong connection.\n");
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
}
/* destroy old dynamic nsvc */
gprs_ns2_free_nsvc(nsvc);
@@ -906,7 +906,7 @@
if (nse->persistent) {
LOGNSE(nse, LOGL_ERROR, "Received NS-RESET for a persistent NSE but the unknown "
"NS-VCI(%05u)\n", nsvci);
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
}
nsvci = tlvp_val16be(&tp, NS_IE_VCI);
@@ -915,14 +915,14 @@
nse->nsei, nsvci);
nsvc = ns2_vc_alloc(bind, nse, false, vc_mode, idbuf);
if (!nsvc)
- return GPRS_NS2_CS_SKIPPED;
+ return NS2_CS_SKIPPED;
nsvc->nsvci = nsvci;
nsvc->nsvci_is_valid = true;
*success = nsvc;
- return GPRS_NS2_CS_CREATED;
+ return NS2_CS_CREATED;
}
/*! Create, and connect an inactive, new IP-based NS-VC
diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c
index 2812e12..da7e53f 100644
--- a/src/gb/gprs_ns2_frgre.c
+++ b/src/gb/gprs_ns2_frgre.c
@@ -439,17 +439,17 @@
/* VC not found */
rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);
switch (rc) {
- case GPRS_NS2_CS_FOUND:
+ case NS2_CS_FOUND:
break;
- case GPRS_NS2_CS_ERROR:
- case GPRS_NS2_CS_SKIPPED:
+ case NS2_CS_ERROR:
+ case NS2_CS_SKIPPED:
rc = 0;
goto out;
- case GPRS_NS2_CS_REJECTED:
+ case NS2_CS_REJECTED:
/* nsip_sendmsg will free reject */
rc = frgre_sendmsg(bind, reject, &saddr);
goto out;
- case GPRS_NS2_CS_CREATED:
+ case NS2_CS_CREATED:
frgre_alloc_vc(bind, nsvc, &saddr, dlci);
gprs_ns2_vc_fsm_start(nsvc);
break;
diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h
index 7183bd8..a36396f 100644
--- a/src/gb/gprs_ns2_internal.h
+++ b/src/gb/gprs_ns2_internal.h
@@ -77,12 +77,12 @@
};
/*! Osmocom NS2 VC create status */
-enum gprs_ns2_cs {
- GPRS_NS2_CS_CREATED, /*!< A NSVC object has been created */
- GPRS_NS2_CS_FOUND, /*!< A NSVC object has been found */
- GPRS_NS2_CS_REJECTED, /*!< Rejected and answered message */
- GPRS_NS2_CS_SKIPPED, /*!< Skipped message */
- GPRS_NS2_CS_ERROR, /*!< Failed to process message */
+enum ns2_cs {
+ NS2_CS_CREATED, /*!< A NSVC object has been created */
+ NS2_CS_FOUND, /*!< A NSVC object has been found */
+ NS2_CS_REJECTED, /*!< Rejected and answered message */
+ NS2_CS_SKIPPED, /*!< Skipped message */
+ NS2_CS_ERROR, /*!< Failed to process message */
};
@@ -245,7 +245,7 @@
void (*free_bind)(struct gprs_ns2_vc_bind *driver);
};
-enum gprs_ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind,
+enum ns2_cs ns2_create_vc(struct gprs_ns2_vc_bind *bind,
struct msgb *msg,
const char *logname,
struct msgb **reject,
diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c
index 8bfa184..6ee6eb2 100644
--- a/src/gb/gprs_ns2_udp.c
+++ b/src/gb/gprs_ns2_udp.c
@@ -231,17 +231,17 @@
/* VC not found */
rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc);
switch (rc) {
- case GPRS_NS2_CS_FOUND:
+ case NS2_CS_FOUND:
break;
- case GPRS_NS2_CS_ERROR:
- case GPRS_NS2_CS_SKIPPED:
+ case NS2_CS_ERROR:
+ case NS2_CS_SKIPPED:
rc = 0;
goto out;
- case GPRS_NS2_CS_REJECTED:
+ case NS2_CS_REJECTED:
/* nsip_sendmsg will free reject */
rc = nsip_sendmsg(bind, reject, &saddr);
goto out;
- case GPRS_NS2_CS_CREATED:
+ case NS2_CS_CREATED:
ns2_driver_alloc_vc(bind, nsvc, &saddr);
gprs_ns2_vc_fsm_start(nsvc);
break;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22426
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I79be92ca716366c2e07ea061c08d95bea817a8c7
Gerrit-Change-Number: 22426
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/20210125/3bb2dae9/attachment.htm>