cellular-infrastructure
/
osmo-sgsn
mirror of https://gerrit.osmocom.org/osmo-sgsn
9
0
Fork 0
Code Issues Releases Wiki Activity

sgsn: gtp: Use new API to send PDP DEL CTX REQ without freeing ctx locally 

Previous API freed the ctx immediatelly after sending the packet, which
triggered a call to cb_delete_context() and dropped the entire
sgsn_pdp_ctx before the PDP DEL CTX ACCEPT was received. This new API
won't free the pdp ctx and we can tear down everything once we receive
the ACCEPT in cb_conf.

cb_conf is not automatically freed at cb_conf, user needs to free it, so
we need to remove setting pctx->lib to NULL in cb_conf to avoid leaking the
pdp ctx, as it needs to be freed inside sgsn_pdp_ctx_free().

Depends: osmo-ggsn (libgtp) Change-Id I29d366253bb98dcba328c7ce8aa3e4daf8f75e6c.
Change-Id: I304c59de5d137b81de3c6df0fdbe911ae3dbd1f3
This commit is contained in:
Pau Espin 2018-07-17 12:42:12 +02:00
parent c6cef69eef
commit 03dc773e08
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gprs/sgsn_libgtp.c
View File

@ -314,10 +314,10 @@ struct sgsn_pdp_ctx *sgsn_create_pdp_ctx(struct sgsn_ggsn_ctx *ggsn,
/* SGSN wants to delete a PDP context */
int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx)
{
LOGPDPCTXP(LOGL_ERROR, pctx, "Delete PDP Context\n");
LOGPDPCTXP(LOGL_INFO, pctx, "Delete PDP Context\n");
/* FIXME: decide if we need teardown or not ! */
return gtp_delete_context_req(pctx->ggsn->gsn, pctx->lib, pctx, 1);
return gtp_delete_context_req2(pctx->ggsn->gsn, pctx->lib, pctx, 1);
}
struct cause_map {
@ -573,10 +573,6 @@ static int delete_pdp_conf(struct pdp_t *pdp, void *cbp, int cause)
"is not available\n");
}
/* unlink the now non-existing library handle from the pdp
* context */
pctx->lib = NULL;
sgsn_pdp_ctx_free(pctx);
return rc;