<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24588">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: refactor nss_weight_sum_data -> ip46_weight_sum_data<br><br>Allow to use ip46_weight_sum_data for local endpoints as well.<br><br>Related: OS#5036<br>Change-Id: I75d88f3da89ad13e34a3fd5ae72bd967d81f4abc<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 7 insertions(+), 7 deletions(-)<br><br></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 2256758..d7ff47a 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -209,13 +209,13 @@</span><br><span> #define ip6_weight_sum_data(elems)                ip6_weight_sum(elems, true)</span><br><span> #define ip6_weight_sum_sig(elems)                ip6_weight_sum(elems, false)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int nss_weight_sum(const struct ns2_sns_state *nss, bool data_weight)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ip46_weight_sum(const struct ns2_sns_elems *elems, bool data_weight)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      return ip4_weight_sum(&nss->remote, data_weight) +</span><br><span style="color: hsl(0, 100%, 40%);">-              ip6_weight_sum(&nss->remote, data_weight);</span><br><span style="color: hsl(120, 100%, 40%);">+      return ip4_weight_sum(elems, data_weight) +</span><br><span style="color: hsl(120, 100%, 40%);">+          ip6_weight_sum(elems, data_weight);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#define nss_weight_sum_data(nss) nss_weight_sum(nss, true)</span><br><span style="color: hsl(0, 100%, 40%);">-#define nss_weight_sum_sig(nss)                nss_weight_sum(nss, false)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ip46_weight_sum_data(elems)         ip46_weight_sum(elems, true)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ip46_weight_sum_sig(elems)                ip46_weight_sum(elems, false)</span><br><span> </span><br><span> static struct gprs_ns2_vc *nsvc_by_ip4_elem(struct gprs_ns2_nse *nse,</span><br><span>                                       const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span>@@ -1068,7 +1068,7 @@</span><br><span>           }</span><br><span>            if (event == GPRS_SNS_EV_RX_CONFIG_END) {</span><br><span>                    /* check if sum of data / sig weights == 0 */</span><br><span style="color: hsl(0, 100%, 40%);">-                   if (nss_weight_sum_data(gss) == 0 || nss_weight_sum_sig(gss) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  if (ip46_weight_sum_data(&gss->remote) == 0 || ip46_weight_sum_sig(&gss->remote) == 0) {</span><br><span>                               cause = NS_CAUSE_INVAL_WEIGH;</span><br><span>                                ns2_tx_sns_config_ack(gss->sns_nsvc, &cause);</span><br><span>                                 osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 0);</span><br><span>@@ -2095,7 +2095,7 @@</span><br><span>                 /* only change state if last CONFIG was received */</span><br><span>          if (event == GPRS_SNS_EV_RX_CONFIG_END) {</span><br><span>                    /* ensure sum of data weight / sig weights is > 0 */</span><br><span style="color: hsl(0, 100%, 40%);">-                 if (nss_weight_sum_data(gss) == 0 || nss_weight_sum_sig(gss) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  if (ip46_weight_sum_data(&gss->remote) == 0 || ip46_weight_sum_sig(&gss->remote) == 0) {</span><br><span>                               cause = NS_CAUSE_INVAL_WEIGH;</span><br><span>                                ns2_tx_sns_config_ack(gss->sns_nsvc, &cause);</span><br><span>                                 osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24588">change 24588</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/+/24588"/><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: I75d88f3da89ad13e34a3fd5ae72bd967d81f4abc </div>
<div style="display:none"> Gerrit-Change-Number: 24588 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>