<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10002">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Forward GGSN originated DEACT PDP CTX REQ<br><br>This commit fixes TTCN3 sgsn test TC_attach_pdp_act_user_deact_mt.<br><br>Change-Id: I204209c017aac8a8402cbb8d0a0200540abcc954<br>---<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/gprs_sgsn.c<br>M src/gprs/sgsn_libgtp.c<br>3 files changed, 15 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index 5f30889..8eba2d4 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -361,6 +361,7 @@</span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_by_id(uint32_t id);</span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_by_addr(struct in_addr *addr);</span><br><span> struct sgsn_ggsn_ctx *sgsn_ggsn_ctx_find_alloc(uint32_t id);</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_ctx_drop_pdp(struct sgsn_pdp_ctx *pctx);</span><br><span> int sgsn_ggsn_ctx_drop_all_pdp(struct sgsn_ggsn_ctx *ggsn);</span><br><span> void sgsn_ggsn_ctx_add_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp);</span><br><span> void sgsn_ggsn_ctx_remove_pdp(struct sgsn_ggsn_ctx *ggc, struct sgsn_pdp_ctx *pdp);</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index ef0cc23..e6d88e3 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -699,17 +699,17 @@</span><br><span> return GSM_RESERVED_TMSI;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void drop_one_pdp(struct sgsn_pdp_ctx *pdp)</span><br><span style="color: hsl(120, 100%, 40%);">+void sgsn_ggsn_ctx_drop_pdp(struct sgsn_pdp_ctx *pctx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp->mm->gmm_state == GMM_REGISTERED_NORMAL) {</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_tx_gsm_deact_pdp_req(pdp, GSM_CAUSE_NET_FAIL, true);</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_ggsn_ctx_remove_pdp(pdp->ggsn, pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pctx->mm->gmm_state == GMM_REGISTERED_NORMAL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_tx_gsm_deact_pdp_req(pctx, GSM_CAUSE_NET_FAIL, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ggsn_ctx_remove_pdp(pctx->ggsn, pctx);</span><br><span> } else {</span><br><span> /* FIXME: GPRS paging in case MS is SUSPENDED */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPDPCTXP(LOGL_NOTICE, pdp, "Hard-dropping PDP ctx due to GGSN "</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPDPCTXP(LOGL_NOTICE, pctx, "Hard-dropping PDP ctx due to GGSN "</span><br><span> "recovery\n");</span><br><span> /* FIXME: how to tell this to libgtp? */</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_pdp_ctx_free(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_pdp_ctx_free(pctx);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -721,7 +721,7 @@</span><br><span> </span><br><span> struct sgsn_pdp_ctx *pdp, *pdp2;</span><br><span> llist_for_each_entry_safe(pdp, pdp2, &ggsn->pdp_list, ggsn_list) {</span><br><span style="color: hsl(0, 100%, 40%);">- drop_one_pdp(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ggsn_ctx_drop_pdp(pdp);</span><br><span> num++;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c</span><br><span>index 88cea5d..659392e 100644</span><br><span>--- a/src/gprs/sgsn_libgtp.c</span><br><span>+++ b/src/gprs/sgsn_libgtp.c</span><br><span>@@ -639,8 +639,15 @@</span><br><span> /* Called whenever a PDP context is deleted for any reason */</span><br><span> static int cb_delete_context(struct pdp_t *pdp)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sgsn_pdp_ctx *pctx = pdp->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> LOGPDPX(DGPRS, LOGL_INFO, pdp, "Context %p was deleted\n", pdp);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* unlink the now non-existing library handle from the pdp</span><br><span style="color: hsl(120, 100%, 40%);">+ * context */</span><br><span style="color: hsl(120, 100%, 40%);">+ pctx->lib = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ggsn_ctx_drop_pdp(pctx);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10002">change 10002</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/10002"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I204209c017aac8a8402cbb8d0a0200540abcc954 </div>
<div style="display:none"> Gerrit-Change-Number: 10002 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>