<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21246">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: 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;">ns2: move LL into public api<br><br>Also fix prefix. GPRS_NS -> GPRS_NS2.<br>In preparation to move LL into upper layer.<br><br>Change-Id: I3b5e0d51ce69b095095e5160ca0cf0d4534db1b8<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_fr.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vty.c<br>6 files changed, 37 insertions(+), 37 deletions(-)<br><br></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 7029c07..da37e01 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -32,6 +32,14 @@</span><br><span> NS2_VC_MODE_ALIVE,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Osmocom NS link layer types */</span><br><span style="color: hsl(120, 100%, 40%);">+enum gprs_ns2_ll {</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_LL_UDP, /*!< NS/UDP/IP */</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_LL_E1, /*!< NS/E1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_LL_FR, /*!< NS/FR */</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRS_NS2_LL_FR_GRE, /*!< NS/FR/GRE/IP */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Osmocom NS primitives according to 48.016 5.2 Service primitves */</span><br><span> enum gprs_ns2_prim {</span><br><span> PRIM_NS_UNIT_DATA,</span><br><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 1b68714..96ad767 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -227,7 +227,7 @@</span><br><span> return NULL;</span><br><span> </span><br><span> switch (nsvc->ll) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_UDP:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_UDP:</span><br><span> if (!gprs_ns2_is_ip_bind(nsvc->bind)) {</span><br><span> buf[0] = '\0';</span><br><span> return buf;</span><br><span>@@ -250,13 +250,13 @@</span><br><span> local_str.ip, local_str.port,</span><br><span> remote_str.ip, remote_str.port);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR_GRE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR_GRE:</span><br><span> snprintf(buf, buf_len, "frgre)");</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_E1:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_E1:</span><br><span> snprintf(buf, buf_len, "e1)");</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR:</span><br><span> if (!gprs_ns2_is_frgre_bind(nsvc->bind)) {</span><br><span> buf[0] = '\0';</span><br><span> return buf;</span><br><span>@@ -397,7 +397,7 @@</span><br><span> /* signalling */</span><br><span> nsvc = ns2_load_sharing_signal(nse);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_ns_ll ll;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns2_ll ll;</span><br><span> </span><br><span> /* data with load sharing parameter */</span><br><span> if (llist_empty(&nse->nsvc))</span><br><span>@@ -406,7 +406,7 @@</span><br><span> ll = nsvc->ll;</span><br><span> </span><br><span> switch (ll) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR:</span><br><span> nsvc = ns2_load_sharing_modulor(nse, bvci, link_selector);</span><br><span> break;</span><br><span> default:</span><br><span>@@ -855,7 +855,7 @@</span><br><span> if (!nsvc)</span><br><span> return GPRS_NS2_CS_SKIPPED;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->ll = GPRS_NS_LL_UDP;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->ll = GPRS_NS2_LL_UDP;</span><br><span> </span><br><span> nsvci = tlvp_val16be(&tp, NS_IE_VCI);</span><br><span> nsvc->nsvci = nsvci;</span><br><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index ae54a41..75c70d7 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -490,7 +490,7 @@</span><br><span> </span><br><span> nsvc->nsvci = nsvci;</span><br><span> nsvc->nsvci_is_valid = true;</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->ll = GPRS_NS_LL_FR;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->ll = GPRS_NS2_LL_FR;</span><br><span> </span><br><span> gprs_ns2_vc_fsm_start(nsvc);</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index de0f5d4..d7211e5 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -56,14 +56,6 @@</span><br><span> NS_STAT_ALIVE_DELAY,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Osmocom NS link layer types */</span><br><span style="color: hsl(0, 100%, 40%);">-enum gprs_ns_ll {</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS_LL_UDP, /*!< NS/UDP/IP */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS_LL_E1, /*!< NS/E1 */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS_LL_FR, /*!< NS/FR */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_NS_LL_FR_GRE, /*!< NS/FR/GRE/IP */</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! Osmocom NS2 VC create status */</span><br><span> enum gprs_ns2_cs {</span><br><span> GPRS_NS2_CS_CREATED, /*!< A NSVC object has been created */</span><br><span>@@ -173,7 +165,7 @@</span><br><span> struct osmo_stat_item_group *statg;</span><br><span> </span><br><span> /*! which link-layer are we based on? */</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_ns_ll ll;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns2_ll ll;</span><br><span> enum gprs_ns2_vc_mode mode;</span><br><span> </span><br><span> struct osmo_fsm_inst *fi;</span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 26a0483..38c1a16 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -391,7 +391,7 @@</span><br><span> priv = nsvc->priv;</span><br><span> priv->remote = *remote;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->ll = GPRS_NS_LL_UDP;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->ll = GPRS_NS2_LL_UDP;</span><br><span> </span><br><span> return nsvc;</span><br><span> }</span><br><span>@@ -403,7 +403,7 @@</span><br><span> {</span><br><span> struct priv_bind *priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->ll != GPRS_NS_LL_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->ll != GPRS_NS2_LL_UDP)</span><br><span> return NULL;</span><br><span> </span><br><span> if (nsvc->bind->driver != &vc_driver_ip)</span><br><span>@@ -420,7 +420,7 @@</span><br><span> {</span><br><span> struct priv_vc *priv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->ll != GPRS_NS_LL_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->ll != GPRS_NS2_LL_UDP)</span><br><span> return NULL;</span><br><span> </span><br><span> priv = nsvc->priv;</span><br><span>@@ -442,7 +442,7 @@</span><br><span> struct priv_vc *vpriv;</span><br><span> struct priv_bind *bpriv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc->ll != GPRS_NS_LL_UDP)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->ll != GPRS_NS2_LL_UDP)</span><br><span> return false;</span><br><span> </span><br><span> vpriv = nsvc->priv;</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index 1759a12..fa9b97b 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -73,7 +73,7 @@</span><br><span> struct llist_head list;</span><br><span> </span><br><span> struct osmo_sockaddr_str remote;</span><br><span style="color: hsl(0, 100%, 40%);">- enum gprs_ns_ll ll;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gprs_ns2_ll ll;</span><br><span> </span><br><span> /* old vty code doesnt support multiple NSVCI per NSEI */</span><br><span> uint16_t nsei;</span><br><span>@@ -213,7 +213,7 @@</span><br><span> vtyvc->remote_end_is_sgsn ? "sgsn" : "bss", VTY_NEWLINE);</span><br><span> </span><br><span> switch (vtyvc->ll) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_UDP:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_UDP:</span><br><span> vty_out(vty, " nse %u nsvci %u encapsulation udp%s", vtyvc->nsei, vtyvc->nsvci,</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " nse %u nsvci %u remote-ip %s%s", vtyvc->nsei, vtyvc->nsvci,</span><br><span>@@ -221,7 +221,7 @@</span><br><span> vty_out(vty, " nse %u nsvci %u remote-port %u%s", vtyvc->nsei, vtyvc->nsvci,</span><br><span> vtyvc->remote.port, VTY_NEWLINE);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR_GRE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR_GRE:</span><br><span> vty_out(vty, " nse %u nsvci %u encapsulation framerelay-gre%s", vtyvc->nsei,</span><br><span> vtyvc->nsvci, VTY_NEWLINE);</span><br><span> vty_out(vty, " nse %u nsvci %u remote-ip %s%s", vtyvc->nsei, vtyvc->nsvci,</span><br><span>@@ -229,7 +229,7 @@</span><br><span> vty_out(vty, " nse %u nsvci %u fr-dlci %u%s", vtyvc->nsei, vtyvc->nsvci,</span><br><span> vtyvc->frdlci, VTY_NEWLINE);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR:</span><br><span> vty_out(vty, " nse %u nsvci %u fr %s dlci %u%s", vtyvc->nsei, vtyvc->nsvci,</span><br><span> vtyvc->netif, vtyvc->frdlci, VTY_NEWLINE);</span><br><span> break;</span><br><span>@@ -430,7 +430,7 @@</span><br><span> osmo_strlcpy(vtyvc->netif, name, sizeof(vtyvc->netif));</span><br><span> vtyvc->frdlci = dlci;</span><br><span> vtyvc->nsvci = nsvci;</span><br><span style="color: hsl(0, 100%, 40%);">- vtyvc->ll = GPRS_NS_LL_FR;</span><br><span style="color: hsl(120, 100%, 40%);">+ vtyvc->ll = GPRS_NS2_LL_FR;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -525,7 +525,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (vtyvc->ll != GPRS_NS_LL_FR_GRE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vtyvc->ll != GPRS_NS2_LL_FR_GRE) {</span><br><span> vty_out(vty, "Warning: seting FR DLCI on non-FR NSE%s",</span><br><span> VTY_NEWLINE);</span><br><span> }</span><br><span>@@ -554,9 +554,9 @@</span><br><span> }</span><br><span> </span><br><span> if (!strcmp(argv[2], "udp"))</span><br><span style="color: hsl(0, 100%, 40%);">- vtyvc->ll = GPRS_NS_LL_UDP;</span><br><span style="color: hsl(120, 100%, 40%);">+ vtyvc->ll = GPRS_NS2_LL_UDP;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vtyvc->ll = GPRS_NS_LL_FR_GRE;</span><br><span style="color: hsl(120, 100%, 40%);">+ vtyvc->ll = GPRS_NS2_LL_FR_GRE;</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -855,7 +855,7 @@</span><br><span> llist_for_each_entry(vtyvc, &priv.vtyvc, list) {</span><br><span> /* validate settings */</span><br><span> switch (vtyvc->ll) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_UDP:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_UDP:</span><br><span> if (strlen(vtyvc->remote.ip) == 0) {</span><br><span> /* Invalid IP for VC */</span><br><span> continue;</span><br><span>@@ -871,10 +871,10 @@</span><br><span> continue;</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR:</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR_GRE:</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_E1:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR_GRE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_E1:</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span>@@ -889,7 +889,7 @@</span><br><span> nse->persistent = true;</span><br><span> </span><br><span> switch (vtyvc->ll) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_UDP:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_UDP:</span><br><span> nsvc = gprs_ns2_ip_connect(bind,</span><br><span> &sockaddr,</span><br><span> nse,</span><br><span>@@ -900,7 +900,7 @@</span><br><span> }</span><br><span> nsvc->persistent = true;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR: {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR: {</span><br><span> if (vty_fr_network == NULL) {</span><br><span> /* TODO: add a switch for BSS/SGSN/gbproxy */</span><br><span> vty_fr_network = osmo_fr_network_alloc(vty_nsi);</span><br><span>@@ -924,8 +924,8 @@</span><br><span> nsvc->persistent = true;</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_FR_GRE:</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_NS_LL_E1:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_FR_GRE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_NS2_LL_E1:</span><br><span> continue;</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21246">change 21246</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/+/21246"/><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: I3b5e0d51ce69b095095e5160ca0cf0d4534db1b8 </div>
<div style="display:none"> Gerrit-Change-Number: 21246 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>