aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Santos <jrsantos@jonathanrsantos.com>2011-06-10 17:08:56 -0400
committerJonathan Santos <jrsantos@jonathanrsantos.com>2011-06-23 17:45:38 -0400
commitdec0ea8fd269ff5980e199bcb05206c0ea52c26e (patch)
treefef22ea553cb6e04a4ad186958ae5ab96204ed36
parent8f3a5a2f0bbcd94e122639c45a9f7f0e73c46865 (diff)
gprs: Set GMM state to GMM_REGISTERED_NORMAL after ATTACH_COMPLETE received
The SGSN was updating the GMM state when sending the ATTACH_ACCEPT, when it should enter that state after the ATTACH_COMPLETE is received.
-rw-r--r--src/gprs/gprs_gmm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index 942d93f..b722f12 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -549,7 +549,6 @@ static int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx,
ctx->t3350_mode = t3350_mode;
mmctx_timer_start(ctx, 3350, GSM0408_T3350_SECS);
#endif
- ctx->mm_state = GMM_REGISTERED_NORMAL;
return gsm48_tx_gmm_att_ack(ctx);
}
if (!strlen(ctx->imei)) {
@@ -1021,6 +1020,7 @@ static int gsm0408_rcv_gmm(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
case GSM48_MT_GMM_ATTACH_COMPL:
/* only in case SGSN offered new P-TMSI */
DEBUGP(DMM, "-> ATTACH COMPLETE\n");
+ mmctx->mm_state = GMM_REGISTERED_NORMAL;
mmctx_timer_stop(mmctx, 3350);
mmctx->p_tmsi_old = 0;
/* Inform LLC layer about new TLLI but keep old active */
@@ -1070,8 +1070,6 @@ static void mmctx_timer_cb(void *_mm)
case 3350: /* waiting for ATTACH COMPLETE */
if (mm->num_T_exp >= 5) {
LOGP(DMM, LOGL_NOTICE, "T3350 expired >= 5 times\n");
- mm->mm_state = GMM_DEREGISTERED;
- /* FIXME: should we return some error? */
break;
}
/* re-transmit the respective msg and re-start timer */