<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15701">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;">ranap: add non-spec X1001<br><br>When the SGSN releases a RANAP connection, it sends a Release Command<br>and waits for a Release Complete. Use X1001 to release the Iu connection<br>when the Release Complete is lost/never received.<br><br>Change-Id: I39a0169c22a4ac430b3d6f3c281d1f381eaa4756<br>---<br>M src/sgsn/gprs_ranap.c<br>M src/sgsn/sgsn_vty.c<br>M tests/test_nodes.vty<br>3 files changed, 12 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c</span><br><span>index 9c7a5db..7a33491 100644</span><br><span>--- a/src/sgsn/gprs_ranap.c</span><br><span>+++ b/src/sgsn/gprs_ranap.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include <gtp.h></span><br><span> </span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/tdef.h></span><br><span> </span><br><span> #include <osmocom/ranap/ranap_common.h></span><br><span> </span><br><span>@@ -162,8 +163,6 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TODO: use timers */</span><br><span style="color: hsl(0, 100%, 40%);">-#define TIMEOUT_RANAP_RELEASE_SEC 5</span><br><span> void sgsn_ranap_iu_free(struct sgsn_mm_ctx *ctx)</span><br><span> {</span><br><span> if (!ctx)</span><br><span>@@ -179,15 +178,19 @@</span><br><span> void sgsn_ranap_iu_release_free(struct sgsn_mm_ctx *ctx,</span><br><span> const struct RANAP_Cause *cause)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned long X1001;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!ctx)</span><br><span> return;</span><br><span> </span><br><span> if (!ctx->iu.ue_ctx)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ X1001 = osmo_tdef_get(sgsn->cfg.T_defs, -1001, OSMO_TDEF_S, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ranap_iu_tx_release_free(ctx->iu.ue_ctx,</span><br><span> cause,</span><br><span style="color: hsl(0, 100%, 40%);">- TIMEOUT_RANAP_RELEASE_SEC);</span><br><span style="color: hsl(120, 100%, 40%);">+ (int) X1001);</span><br><span> ctx->iu.ue_ctx = NULL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c</span><br><span>index 17b64c8..14248d1 100644</span><br><span>--- a/src/sgsn/sgsn_vty.c</span><br><span>+++ b/src/sgsn/sgsn_vty.c</span><br><span>@@ -90,6 +90,9 @@</span><br><span> #define GSM0408_T3395_SECS 8 /* wait for DEACT PDP CTX ACK */</span><br><span> #define GSM0408_T3397_SECS 8 /* wait for DEACT AA PDP CTX ACK */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Non spec timer */</span><br><span style="color: hsl(120, 100%, 40%);">+#define NONSPEC_X1001_SECS 5 /* wait for a RANAP Release Complete */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> static struct osmo_tdef sgsn_T_defs[] = {</span><br><span> { .T=3312, .default_val=GSM0408_T3312_SECS, .desc="Periodic RA Update timer (s)" },</span><br><span>@@ -105,6 +108,8 @@</span><br><span> { .T=3395, .default_val=GSM0408_T3395_SECS, .desc="Wait for DEACT PDP CTX ACK timer (s)" },</span><br><span> { .T=3397, .default_val=GSM0408_T3397_SECS, .desc="Wait for DEACT AA PDP CTX ACK timer (s)" },</span><br><span> /* non spec timers */</span><br><span style="color: hsl(120, 100%, 40%);">+ { .T=-1001, .default_val=NONSPEC_X1001_SECS, .desc="RANAP Release timeout. Wait for RANAP Release Complete."</span><br><span style="color: hsl(120, 100%, 40%);">+ "On expiry release Iu connection (s)" },</span><br><span> { .T=-3314, .default_val=GSM0408_T3314_SECS, .desc="Iu User inactivity timer. On expiry release Iu connection (s)" },</span><br><span> {}</span><br><span> };</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index b9cf91e..18bccc8 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -12,6 +12,7 @@</span><br><span> T3386 = 8 s Wait for MODIFY PDP CTX ACK timer (s) (default: 8 s)</span><br><span> T3395 = 8 s Wait for DEACT PDP CTX ACK timer (s) (default: 8 s)</span><br><span> T3397 = 8 s Wait for DEACT AA PDP CTX ACK timer (s) (default: 8 s)</span><br><span style="color: hsl(120, 100%, 40%);">+X1001 = 5 s RANAP Release timeout. Wait for RANAP Release Complete.On expiry release Iu connection (s) (default: 5 s)</span><br><span> X3314 = 44 s Iu User inactivity timer. On expiry release Iu connection (s) (default: 44 s)</span><br><span> OsmoSGSN# configure terminal</span><br><span> OsmoSGSN(config)# list</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15701">change 15701</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-sgsn/+/15701"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I39a0169c22a4ac430b3d6f3c281d1f381eaa4756 </div>
<div style="display:none"> Gerrit-Change-Number: 15701 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>