<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/18707">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS: replace use of gprs_nsvc_create() with gprs_nsvc_crate2()<br><br>Change-Id: I2b10e1707b0976b685d1c14016481d5565888150<br>---<br>M TODO-RELEASE<br>M include/osmocom/gprs/gprs_ns.h<br>M src/gb/gprs_ns.c<br>M src/gb/gprs_ns_vty.c<br>M src/gb/libosmogb.map<br>5 files changed, 7 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index a6ed730..c9d9c56 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -11,3 +11,4 @@</span><br><span> sim API/ABI change new osim_file_desc_find_aid()</span><br><span> sim API/ABI change all over the place</span><br><span> gsm new API new osmo_bts_unset_feature()</span><br><span style="color: hsl(120, 100%, 40%);">+gb API/ABI change deprecate gprs_nsvc_crate(); export gprs_nsvc_create2()</span><br><span>diff --git a/include/osmocom/gprs/gprs_ns.h b/include/osmocom/gprs/gprs_ns.h</span><br><span>index 94d3036..65c7df3 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns.h</span><br><span>@@ -197,7 +197,6 @@</span><br><span> /* Listen for incoming GPRS packets via NS/FR/GRE */</span><br><span> int gprs_ns_frgre_listen(struct gprs_ns_inst *nsi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_nsvc *gprs_nsvc_create(struct gprs_ns_inst *nsi, uint16_t nsvci);</span><br><span> struct gprs_nsvc *gprs_nsvc_create2(struct gprs_ns_inst *nsi, uint16_t nsvci,</span><br><span> uint8_t sig_weight, uint8_t data_weight);</span><br><span> void gprs_nsvc_delete(struct gprs_nsvc *nsvc);</span><br><span>diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c</span><br><span>index f1b36f4..14fe661 100644</span><br><span>--- a/src/gb/gprs_ns.c</span><br><span>+++ b/src/gb/gprs_ns.c</span><br><span>@@ -347,12 +347,6 @@</span><br><span> return nsvc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Old API for creating a NS-VC. Uses gprs_nsvc_create2 with fixed weights. */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_nsvc *gprs_nsvc_create(struct gprs_ns_inst *nsi, uint16_t nsvci)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_nsvc_create2(nsi, nsvci, 1, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! Delete given NS-VC</span><br><span> * \param[in] nsvc gprs_nsvc to be deleted</span><br><span> */</span><br><span>@@ -1269,7 +1263,7 @@</span><br><span> nsvci, (*nsvc)->nsvci,</span><br><span> gprs_ns_ll_str(*nsvc));</span><br><span> orig_nsvc = *nsvc;</span><br><span style="color: hsl(0, 100%, 40%);">- *nsvc = gprs_nsvc_create((*nsvc)->nsi, nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ *nsvc = gprs_nsvc_create2((*nsvc)->nsi, nsvci, 1, 1);</span><br><span> (*nsvc)->nsei = nsei;</span><br><span> }</span><br><span> }</span><br><span>@@ -1691,7 +1685,7 @@</span><br><span> * simply have changed addresses, or it is a SGSN */</span><br><span> existing_nsvc = gprs_nsvc_by_nsvci(nsi, nsvci);</span><br><span> if (!existing_nsvc) {</span><br><span style="color: hsl(0, 100%, 40%);">- *new_nsvc = gprs_nsvc_create(nsi, 0xffff);</span><br><span style="color: hsl(120, 100%, 40%);">+ *new_nsvc = gprs_nsvc_create2(nsi, 0xffff, 1, 1);</span><br><span> (*new_nsvc)->nsvci_is_valid = 0;</span><br><span> log_set_context(LOG_CTX_GB_NSVC, *new_nsvc);</span><br><span> gprs_ns_ll_copy(*new_nsvc, fallback_nsvc);</span><br><span>@@ -1914,7 +1908,7 @@</span><br><span> </span><br><span> /* Create the dummy NSVC that we use for sending</span><br><span> * messages to non-existant/unknown NS-VC's */</span><br><span style="color: hsl(0, 100%, 40%);">- nsi->unknown_nsvc = gprs_nsvc_create(nsi, 0xfffe);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsi->unknown_nsvc = gprs_nsvc_create2(nsi, 0xfffe, 1, 1);</span><br><span> nsi->unknown_nsvc->nsvci_is_valid = 0;</span><br><span> llist_del(&nsi->unknown_nsvc->list);</span><br><span> INIT_LLIST_HEAD(&nsi->unknown_nsvc->list);</span><br><span>@@ -2155,7 +2149,7 @@</span><br><span> </span><br><span> nsvc = gprs_nsvc_by_rem_addr(nsi, dest);</span><br><span> if (!nsvc)</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = gprs_nsvc_create(nsi, nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = gprs_nsvc_create2(nsi, nsvci, 1, 1);</span><br><span> nsvc->ip.bts_addr = *dest;</span><br><span> nsvc->nsei = nsei;</span><br><span> nsvc->remote_end_is_sgsn = 1;</span><br><span>diff --git a/src/gb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c</span><br><span>index bd53f2f..38d4393 100644</span><br><span>--- a/src/gb/gprs_ns_vty.c</span><br><span>+++ b/src/gb/gprs_ns_vty.c</span><br><span>@@ -292,7 +292,7 @@</span><br><span> </span><br><span> nsvc = gprs_nsvc_by_nsei(vty_nsi, nsei);</span><br><span> if (!nsvc) {</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc = gprs_nsvc_create(vty_nsi, nsvci);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc = gprs_nsvc_create2(vty_nsi, nsvci, 1, 1);</span><br><span> nsvc->nsei = nsei;</span><br><span> }</span><br><span> nsvc->nsvci = nsvci;</span><br><span>diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map</span><br><span>index ad139c1..b29ecb9 100644</span><br><span>--- a/src/gb/libosmogb.map</span><br><span>+++ b/src/gb/libosmogb.map</span><br><span>@@ -70,7 +70,7 @@</span><br><span> gprs_ns_ll_clear;</span><br><span> gprs_ns_msgb_alloc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-gprs_nsvc_create;</span><br><span style="color: hsl(120, 100%, 40%);">+gprs_nsvc_create2;</span><br><span> gprs_nsvc_delete;</span><br><span> gprs_nsvc_reset;</span><br><span> gprs_nsvc_by_nsvci;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/18707">change 18707</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/+/18707"/><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: I2b10e1707b0976b685d1c14016481d5565888150 </div>
<div style="display:none"> Gerrit-Change-Number: 18707 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>