diff options
| author | Jonathan Santos <jrsantos@jonathanrsantos.com> | 2011-06-23 17:46:50 -0400 |
|---|---|---|
| committer | Jonathan Santos <jrsantos@jonathanrsantos.com> | 2011-06-23 17:46:50 -0400 |
| commit | a0fb1bb84765bfe3148d55a6da57c007a5ffe895 (patch) | |
| tree | fef22ea553cb6e04a4ad186958ae5ab96204ed36 /src/gprs/sgsn_libgtp.c | |
| parent | 749a666d849743353473813210cbf6899005c6c4 (diff) | |
| parent | dec0ea8fd269ff5980e199bcb05206c0ea52c26e (diff) | |
Merge branch 'attach_already_attached'
Diffstat (limited to 'src/gprs/sgsn_libgtp.c')
| -rw-r--r-- | src/gprs/sgsn_libgtp.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c index 7b10a45a3..b2d8874ac 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/gprs/sgsn_libgtp.c @@ -208,12 +208,20 @@ 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) +int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx, int implicit) { LOGP(DGPRS, LOGL_ERROR, "Delete PDP Context\n"); + if (implicit != 0) { + /* Deactivate the SNDCP layer */ + sndcp_sm_deactivate_ind(&pctx->mm->llme->lle[pctx->sapi], pctx->nsapi); + } + /* FIXME: decide if we need teardown or not ! */ - return gtp_delete_context_req(pctx->ggsn->gsn, pctx->lib, pctx, 1); + return gtp_delete_context_req(pctx->ggsn->gsn, + pctx->lib, + implicit == 0 ? pctx : NULL, + 1); } struct cause_map { @@ -312,6 +320,10 @@ static int delete_pdp_conf(struct pdp_t *pdp, void *cbp, int cause) DEBUGP(DGPRS, "Received DELETE PDP CTX CONF, cause=%d(%s)\n", cause, get_value_string(gtp_cause_strs, cause)); + if (!pctx) { + return 0; + } + /* Deactivate the SNDCP layer */ sndcp_sm_deactivate_ind(&pctx->mm->llme->lle[pctx->sapi], pctx->nsapi); |