<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24587">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: refactor ip4_weight_sum/ip6_weight_sum<br><br>Use the new introduced struct ns2_sns_elems instead of<br>the elems seperate.<br><br>Related: OS#5036<br>Change-Id: I0956ab6085554210569188f52cae121e32fca19b<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 14 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/24587/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 2e84d16..66765f3 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -176,45 +176,43 @@</span><br><span> }</span><br><span> </span><br><span> /* helper function to compute the sum of all (data or signaling) weights */</span><br><span style="color: hsl(0, 100%, 40%);">-static int ip4_weight_sum(const struct gprs_ns_ie_ip4_elem *ip4, unsigned int num,</span><br><span style="color: hsl(0, 100%, 40%);">- bool data_weight)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ip4_weight_sum(const struct ns2_sns_elems *elems, bool data_weight)</span><br><span> {</span><br><span> unsigned int i;</span><br><span> int weight_sum = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < num; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < elems->num_ip4; i++) {</span><br><span> if (data_weight)</span><br><span style="color: hsl(0, 100%, 40%);">- weight_sum += ip4[i].data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ weight_sum += elems->ip4[i].data_weight;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- weight_sum += ip4[i].sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ weight_sum += elems->ip4[i].sig_weight;</span><br><span> }</span><br><span> return weight_sum;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#define ip4_weight_sum_data(x,y) ip4_weight_sum(x, y, true)</span><br><span style="color: hsl(0, 100%, 40%);">-#define ip4_weight_sum_sig(x,y) ip4_weight_sum(x, y, false)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ip4_weight_sum_data(elems) ip4_weight_sum(elems, true)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ip4_weight_sum_sig(elems) ip4_weight_sum(elems, false)</span><br><span> </span><br><span> /* helper function to compute the sum of all (data or signaling) weights */</span><br><span style="color: hsl(0, 100%, 40%);">-static int ip6_weight_sum(const struct gprs_ns_ie_ip6_elem *ip6, unsigned int num,</span><br><span style="color: hsl(0, 100%, 40%);">- bool data_weight)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ip6_weight_sum(const struct ns2_sns_elems *elems, bool data_weight)</span><br><span> {</span><br><span> unsigned int i;</span><br><span> int weight_sum = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < num; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < elems->num_ip6; i++) {</span><br><span> if (data_weight)</span><br><span style="color: hsl(0, 100%, 40%);">- weight_sum += ip6[i].data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ weight_sum += elems->ip6[i].data_weight;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- weight_sum += ip6[i].sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+ weight_sum += elems->ip6[i].sig_weight;</span><br><span> }</span><br><span> return weight_sum;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#define ip6_weight_sum_data(x,y) ip6_weight_sum(x, y, true)</span><br><span style="color: hsl(0, 100%, 40%);">-#define ip6_weight_sum_sig(x,y) ip6_weight_sum(x, y, false)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ip6_weight_sum_data(elems) ip6_weight_sum(elems, true)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ip6_weight_sum_sig(elems) ip6_weight_sum(elems, false)</span><br><span> </span><br><span> static int nss_weight_sum(const struct ns2_sns_state *nss, bool data_weight)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return ip4_weight_sum(nss->remote.ip4, nss->remote.num_ip4, data_weight) +</span><br><span style="color: hsl(0, 100%, 40%);">- ip6_weight_sum(nss->remote.ip6, nss->remote.num_ip6, data_weight);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ip4_weight_sum(&nss->remote, data_weight) +</span><br><span style="color: hsl(120, 100%, 40%);">+ ip6_weight_sum(&nss->remote, data_weight);</span><br><span> }</span><br><span> #define nss_weight_sum_data(nss) nss_weight_sum(nss, true)</span><br><span> #define nss_weight_sum_sig(nss) nss_weight_sum(nss, false)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24587">change 24587</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/+/24587"/><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: I0956ab6085554210569188f52cae121e32fca19b </div>
<div style="display:none"> Gerrit-Change-Number: 24587 </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-MessageType: newchange </div>