<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24824">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  daniel: 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;">gprs_ns2: fix crash when changing the MTU<br><br>When the MTU changes for any fr device, all<br>NSE will recalculate their MTU. If any NSE is alive,<br>libosmocore will crash.<br><br>Related: OS#5192<br>Change-Id: I31ba5cefea7bbb0b74060d6664b42c58815ee2a1<br>---<br>M src/gb/gprs_ns2.c<br>M tests/gb/gprs_ns2_test.c<br>2 files changed, 12 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index 720e836..a8e646b 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -1552,7 +1552,7 @@</span><br><span> </span><br><span>     nse->mtu = mtu;</span><br><span>   if (nse->alive)</span><br><span style="color: hsl(0, 100%, 40%);">-              ns2_prim_status_ind(nsvc->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_MTU_CHANGE);</span><br><span style="color: hsl(120, 100%, 40%);">+            ns2_prim_status_ind(nse, NULL, 0, GPRS_NS2_AFF_CAUSE_MTU_CHANGE);</span><br><span> }</span><br><span> </span><br><span> /*! calculate the transfer capabilities for a nse</span><br><span>diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c</span><br><span>index c53cc6d..b96e739 100644</span><br><span>--- a/tests/gb/gprs_ns2_test.c</span><br><span>+++ b/tests/gb/gprs_ns2_test.c</span><br><span>@@ -41,6 +41,7 @@</span><br><span> static struct log_info info = {};</span><br><span> static struct osmo_wqueue *unitdata = NULL;</span><br><span> static struct osmo_gprs_ns2_prim last_nse_recovery = {};</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_gprs_ns2_prim last_nse_mtu_change = {};</span><br><span> </span><br><span> static int ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx)</span><br><span> {</span><br><span>@@ -54,8 +55,12 @@</span><br><span>                    msgb_free(oph->msg);</span><br><span>              }</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (oph->primitive == GPRS_NS2_PRIM_STATUS && nsp->u.status.cause == GPRS_NS2_AFF_CAUSE_RECOVERY) {</span><br><span style="color: hsl(0, 100%, 40%);">-               last_nse_recovery = *nsp;</span><br><span style="color: hsl(120, 100%, 40%);">+     if (oph->primitive == GPRS_NS2_PRIM_STATUS) {</span><br><span style="color: hsl(120, 100%, 40%);">+              if (nsp->u.status.cause == GPRS_NS2_AFF_CAUSE_RECOVERY) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  last_nse_recovery = *nsp;</span><br><span style="color: hsl(120, 100%, 40%);">+             } else if (nsp->u.status.cause == GPRS_NS2_AFF_CAUSE_MTU_CHANGE) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 last_nse_mtu_change = *nsp;</span><br><span style="color: hsl(120, 100%, 40%);">+           }</span><br><span>    }</span><br><span>    return 0;</span><br><span> }</span><br><span>@@ -579,6 +584,10 @@</span><br><span>        /* 1b NS PDU type, 1b NS SDU control, 2b BVCI */</span><br><span>     OSMO_ASSERT(last_nse_recovery.u.status.mtu == 123 - 4);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   bind[0]->mtu = 100;</span><br><span style="color: hsl(120, 100%, 40%);">+        ns2_nse_update_mtu(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_ASSERT(last_nse_mtu_change.u.status.mtu == 100 - 4);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  gprs_ns2_free(nsi);</span><br><span>  printf("--- Finish unitdata test\n");</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24824">change 24824</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/+/24824"/><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: I31ba5cefea7bbb0b74060d6664b42c58815ee2a1 </div>
<div style="display:none"> Gerrit-Change-Number: 24824 </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: daniel <dwillmann@sysmocom.de> </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>