aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-08-05 21:23:46 +0200
committerJonathan Santos <jrsantos@jonathanrsantos.com>2011-08-23 12:38:00 -0400
commit1fced2f4d7e2b3c006b3de1aebfb39b4195cbea4 (patch)
tree8022fee4855813d9ba30fe8fdf80bf5f28f421ce
parentac3159af4a5a1590992ef5318a35170b5f5d99d0 (diff)
GPRS: Fix the parsing/interpretation of the PDP CTX status IE
The byte ordering is a bit odd: The least significant byte is ahead of the most significant byte, different from everything else in GSM that seems to be big-endian. Thanks to Seungju Kim <admin@manateeshome.com> for repoerting the bug.
-rw-r--r--src/gprs/gprs_gmm.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index f6cc0d47..2a3fba84 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -871,7 +871,7 @@ static int gsm48_tx_gmm_ra_upd_rej(struct msgb *old_msg, uint8_t cause)
}
static void process_ms_ctx_status(struct sgsn_mm_ctx *mmctx,
- uint16_t pdp_status)
+ uint8_t *pdp_status)
{
struct sgsn_pdp_ctx *pdp, *pdp2;
/* 24.008 4.7.5.1.3: If the PDP context status information element is
@@ -882,11 +882,20 @@ static void process_ms_ctx_status(struct sgsn_mm_ctx *mmctx,
* being in state PDP-INACTIVE. */
llist_for_each_entry_safe(pdp, pdp2, &mmctx->pdp_list, list) {
- if (!(pdp_status & (1 << pdp->nsapi))) {
- LOGP(DMM, LOGL_NOTICE, "Dropping PDP context for NSAPI=%u "
- "due to PDP CTX STATUS IE= 0x%04x\n",
- pdp->nsapi, pdp_status);
- sgsn_delete_pdp_ctx(pdp, 0);
+ if (pdp->nsapi < 8) {
+ if (!(pdp_status[0] & (1 << pdp->nsapi))) {
+ LOGP(DMM, LOGL_NOTICE, "Dropping PDP context for NSAPI=%u "
+ "due to PDP CTX STATUS IE= 0x%02x%02x\n",
+ pdp->nsapi, pdp_status[1], pdp_status[0]);
+ sgsn_delete_pdp_ctx(pdp, 0);
+ }
+ } else {
+ if (!(pdp_status[1] & (1 << (pdp->nsapi - 8)))) {
+ LOGP(DMM, LOGL_NOTICE, "Dropping PDP context for NSAPI=%u "
+ "due to PDP CTX STATUS IE= 0x%02x%02x\n",
+ pdp->nsapi, pdp_status[1], pdp_status[0]);
+ sgsn_delete_pdp_ctx(pdp, 0);
+ }
}
}
}
@@ -978,8 +987,7 @@ static int gsm48_rx_gmm_ra_upd_req(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
/* Look at PDP Context Status IE and see if MS's view of
* activated/deactivated NSAPIs agrees with our view */
if (TLVP_PRESENT(&tp, GSM48_IE_GMM_PDP_CTX_STATUS)) {
- uint16_t pdp_status = ntohs(*(uint16_t *)
- TLVP_VAL(&tp, GSM48_IE_GMM_PDP_CTX_STATUS));
+ uint8_t *pdp_status = TLVP_VAL(&tp, GSM48_IE_GMM_PDP_CTX_STATUS);
process_ms_ctx_status(mmctx, pdp_status);
}