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

SGSN: move TLLI unassignment into separate function 

Change-Id: Ia4df145ab03ebcaad70a13601cff60c488a5de54
Related: OS#1582
This commit is contained in:
Max 2016-06-28 17:39:20 +02:00 committed by Harald Welte
parent 93408ae727
commit 3955025c2a
5 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openbsc/include/openbsc/gprs_llc.h
View File

@ -218,6 +218,7 @@ int gprs_llgmm_reset_oldmsg(struct msgb* oldmsg, uint8_t sapi);
int gprs_llgmm_assign(struct gprs_llc_llme *llme,
uint32_t old_tlli, uint32_t new_tlli,
enum gprs_ciph_algo alg, const uint8_t *kc);
int gprs_llgmm_unassign(struct gprs_llc_llme *llme);
int gprs_llc_init(const char *cipher_plugin_path);
int gprs_llc_vty_init(void);

26
openbsc/src/gprs/gprs_gmm.c
View File

@ -982,8 +982,7 @@ rejected:
if (ctx)
mm_ctx_cleanup_free(ctx, "GPRS ATTACH REJ");
else
/* TLLI unassignment */
gprs_llgmm_assign(llme, llme->tlli, 0xffffffff, GPRS_ALGO_GEA0, NULL);
gprs_llgmm_unassign(llme);
return rc;
@ -1286,11 +1285,8 @@ rejected:
if (mmctx)
mm_ctx_cleanup_free(mmctx, "GPRS RA UPDATE REJ");
else {
if (llme) {
/* TLLI unassignment */
gprs_llgmm_assign(llme, llme->tlli, 0xffffffff,
GPRS_ALGO_GEA0, NULL);
}
if (llme)
gprs_llgmm_unassign(llme);
}
return rc;
@ -1323,17 +1319,13 @@ static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
/* 4.7.10 */
if (gh->msg_type == GSM48_MT_GMM_STATUS) {
/* TLLI unassignment */
gprs_llgmm_assign(llme, llme->tlli, 0xffffffff,
GPRS_ALGO_GEA0, NULL);
gprs_llgmm_unassign(llme);
return 0;
}
/* Don't reply or establish a LLME on DETACH_ACK */
if (gh->msg_type == GSM48_MT_GMM_DETACH_ACK) {
/* TLLI unassignment */
return gprs_llgmm_assign(llme, llme->tlli, 0xffffffff,
GPRS_ALGO_GEA0, NULL);
}
if (gh->msg_type == GSM48_MT_GMM_DETACH_ACK)
return gprs_llgmm_unassign(llme);
gprs_llgmm_reset(llme);
@ -1343,8 +1335,7 @@ static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
rc = gsm48_rx_gmm_det_req(NULL, msg);
/* TLLI unassignment */
gprs_llgmm_assign(llme, llme->tlli, 0xffffffff,
GPRS_ALGO_GEA0, NULL);
gprs_llgmm_unassign(llme);
return rc;
}
@ -1352,8 +1343,7 @@ static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
rc = sgsn_force_reattach_oldmsg(msg);
/* TLLI unassignment */
gprs_llgmm_assign(llme, llme->tlli, 0xffffffff,
GPRS_ALGO_GEA0, NULL);
gprs_llgmm_unassign(llme);
return rc;
}

7
openbsc/src/gprs/gprs_llc.c
View File

@ -745,6 +745,13 @@ int gprs_llgmm_assign(struct gprs_llc_llme *llme,
return 0;
}
/* TLLI unassignment */
int gprs_llgmm_unassign(struct gprs_llc_llme *llme)
{
return gprs_llgmm_assign(llme, llme->tlli, 0xffffffff, GPRS_ALGO_GEA0,
NULL);
}
/* Chapter 7.2.1.2 LLGMM-RESET.req */
int gprs_llgmm_reset(struct gprs_llc_llme *llme)
{

2
openbsc/src/gprs/gprs_sgsn.c
View File

@ -770,7 +770,7 @@ static void sgsn_llme_cleanup_free(struct gprs_llc_llme *llme)
/* No MM context found */
LOGP(DGPRS, LOGL_INFO, "Deleting orphaned LLME, TLLI 0x%08x\n",
llme->tlli);
gprs_llgmm_assign(llme, llme->tlli, 0xffffffff, GPRS_ALGO_GEA0, NULL);
gprs_llgmm_unassign(llme);
}
static void sgsn_llme_check_cb(void *data_)

2
openbsc/tests/sgsn/sgsn_test.c
View File

@ -222,7 +222,7 @@ static void test_llme(void)
OSMO_ASSERT(count(gprs_llme_list()) == 1);
/* unassign which should delete it*/
gprs_llgmm_assign(lle->llme, lle->llme->tlli, 0xffffffff, GPRS_ALGO_GEA0, NULL);
gprs_llgmm_unassign(lle->llme);
/* Check that everything was cleaned up */
OSMO_ASSERT(count(gprs_llme_list()) == 0);