diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-05-01 19:07:53 +0000 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-05-01 19:07:53 +0000 |
| commit | c9e0218990229654f8b1a44d9fcb5ba4b9feca42 (patch) | |
| tree | c64da37d029b2b40011360324fc22e737b47e114 /src/gsm_04_08.c | |
| parent | 440fed08ec0c665a910e34c0dda294a72bab7963 (diff) | |
Fix "CM Service Request" parsing for Phase 1 devices. This means MO calls from phase1 should work now.
Diffstat (limited to 'src/gsm_04_08.c')
| -rw-r--r-- | src/gsm_04_08.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/gsm_04_08.c b/src/gsm_04_08.c index fa70b81f7..fe1637e9a 100644 --- a/src/gsm_04_08.c +++ b/src/gsm_04_08.c @@ -768,29 +768,35 @@ static int gsm48_rx_mm_serv_req(struct msgb *msg) struct gsm48_hdr *gh = msgb_l3(msg); struct gsm48_service_request *req = (struct gsm48_service_request *)gh->data; + /* unfortunately in Phase1 the classmar2 length is variable */ + u_int8_t classmark2_len = gh->data[1]; + u_int8_t *classmark2 = gh->data+2; + u_int8_t mi_len = *(classmark2 + classmark2_len); + u_int8_t *mi = (classmark2 + classmark2_len + 1); + DEBUGP(DMM, "<- CM SERVICE REQUEST "); if (msg->data_len < sizeof(struct gsm48_service_request*)) { - DEBUGP(DMM, "<- CM SERVICE REQUEST wrong sized message\n"); + DEBUGPC(DMM, "wrong sized message\n"); return gsm48_tx_mm_serv_rej(msg->lchan, GSM48_REJECT_INCORRECT_MESSAGE); } if (msg->data_len < req->mi_len + 6) { - DEBUGP(DMM, "<- CM SERVICE REQUEST MI does not fit in package\n"); + DEBUGPC(DMM, "does not fit in packet\n"); return gsm48_tx_mm_serv_rej(msg->lchan, GSM48_REJECT_INCORRECT_MESSAGE); } - mi_type = req->mi[0] & GSM_MI_TYPE_MASK; + mi_type = mi[0] & GSM_MI_TYPE_MASK; if (mi_type != GSM_MI_TYPE_TMSI) { - DEBUGP(DMM, "<- CM SERVICE REQUEST mi type is not TMSI: %d\n", mi_type); + DEBUGPC(DMM, "mi_type is not TMSI: %d\n", mi_type); return gsm48_tx_mm_serv_rej(msg->lchan, GSM48_REJECT_INCORRECT_MESSAGE); } - mi_to_string(mi_string, sizeof(mi_string), req->mi, req->mi_len); + mi_to_string(mi_string, sizeof(mi_string), mi, mi_len); subscr = subscr_get_by_tmsi(mi_string); - DEBUGP(DMM, "<- CM SERVICE REQUEST serv_type=0x%02x mi_type=0x%02x M(%s)\n", + DEBUGPC(DMM, "serv_type=0x%02x mi_type=0x%02x M(%s)\n", req->cm_service_type, mi_type, mi_string); /* FIXME: if we don't know the TMSI, inquire abit IMSI and allocate new TMSI */ |