<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22703">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: Avoid g_unblocked_nsvcs_* overflowing<br><br>Sometimes we run into situations where the g_unblocked_nsvcs_* is<br>exceeding the number of NSVCs we have in g_nsvcs. This can only happen<br>as we blindly append integers to the ro_integer fields, rather than<br>checking if they are already contained.<br><br>Let's factor out the add_unique and del functions (in Osmocom_Types)<br>and use them from NS_Emulation.<br><br>Change-Id: Ib3273d6ce9b80f700c964d578fdb0f268eac6a14<br>---<br>M library/NS_Emulation.ttcnpp<br>M library/Osmocom_Types.ttcn<br>2 files changed, 23 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp</span><br><span>index ca44a02..6d8113c 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -310,30 +310,16 @@</span><br><span> /* add index to list of unblocked NSVCs */</span><br><span> if (not ischosen(g_nsvcs[i].cfg.provider.ip) or</span><br><span> g_nsvcs[i].cfg.provider.ip.signalling_weight > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- g_unblocked_nsvcs_sig := g_unblocked_nsvcs_sig & {i};</span><br><span style="color: hsl(120, 100%, 40%);">+ ro_integer_add_unique(g_unblocked_nsvcs_sig, i);</span><br><span> }</span><br><span> if (not ischosen(g_nsvcs[i].cfg.provider.ip) or</span><br><span> g_nsvcs[i].cfg.provider.ip.data_weight > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- g_unblocked_nsvcs_data := g_unblocked_nsvcs_data & {i};</span><br><span style="color: hsl(120, 100%, 40%);">+ ro_integer_add_unique(g_unblocked_nsvcs_data, i);</span><br><span> }</span><br><span> } else if (g_nsvcs[i].state == NSVC_S_ALIVE_UNBLOCKED and state != NSVC_S_ALIVE_UNBLOCKED) {</span><br><span> /* remove index to list of unblocked NSVCs */</span><br><span style="color: hsl(0, 100%, 40%);">- var Osmocom_Types.ro_integer new_unblocked_nsvcs_sig := {};</span><br><span style="color: hsl(0, 100%, 40%);">- for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_sig); j := j+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_unblocked_nsvcs_sig[j] != i) {</span><br><span style="color: hsl(0, 100%, 40%);">- new_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig & {j};</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- g_unblocked_nsvcs_sig := new_unblocked_nsvcs_sig;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- var Osmocom_Types.ro_integer new_unblocked_nsvcs_data := {};</span><br><span style="color: hsl(0, 100%, 40%);">- for (var integer j := 0; j < lengthof(g_unblocked_nsvcs_data); j := j+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_unblocked_nsvcs_data[j] != i) {</span><br><span style="color: hsl(0, 100%, 40%);">- new_unblocked_nsvcs_data := new_unblocked_nsvcs_data & {j};</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- g_unblocked_nsvcs_data := new_unblocked_nsvcs_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ ro_integer_del(g_unblocked_nsvcs_sig, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ ro_integer_del(g_unblocked_nsvcs_data, i);</span><br><span> }</span><br><span> g_nsvcs[i].state := state;</span><br><span> }</span><br><span>diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn</span><br><span>index 06920bf..23f8fd9 100644</span><br><span>--- a/library/Osmocom_Types.ttcn</span><br><span>+++ b/library/Osmocom_Types.ttcn</span><br><span>@@ -294,6 +294,25 @@</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function ro_integer_add_unique(inout ro_integer roi, integer new_entry)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ro_integer_contains(roi, new_entry)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ roi := roi & {new_entry};</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+function ro_integer_del(inout ro_integer roi, integer del_entry)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var ro_integer tmp := {};</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer j := 0; j < lengthof(roi); j := j+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (roi[j] != del_entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tmp := tmp & { roi[j] };</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ roi := tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record of ro_integer roro_integer;</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22703">change 22703</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/osmo-ttcn3-hacks/+/22703"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib3273d6ce9b80f700c964d578fdb0f268eac6a14 </div>
<div style="display:none"> Gerrit-Change-Number: 22703 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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-MessageType: merged </div>