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