osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Rene Pilz: 

The MCC/MNC in de_gmm_rai is not correct decoded

svn path=/trunk/; revision=15296
This commit is contained in:
Anders Broman 2005-08-11 20:47:09 +00:00
parent c61a9fddad
commit 0c69d44dba
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/packet-gsm_a.c
View File

@ -10396,12 +10396,15 @@ de_gmm_rai(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *ad
len = len; len = len;
curr_offset = offset; curr_offset = offset;
mcc = tvb_get_guint8(tvb, curr_offset); mcc = (tvb_get_guint8(tvb, curr_offset) & 0x0f) <<8;
mcc |= (tvb_get_guint8(tvb, curr_offset+1)&0x0f)<<8; mcc |= (tvb_get_guint8(tvb, curr_offset) & 0xf0);
mnc = tvb_get_guint8(tvb, curr_offset+2); mcc |= (tvb_get_guint8(tvb, curr_offset+1) & 0x0f);
mnc |= (tvb_get_guint8(tvb, curr_offset+1)<<4)&0x0f00; mnc = (tvb_get_guint8(tvb, curr_offset+2) & 0x0f) <<8;
if ((mnc&0x0f00) == 0x0f00 ) mnc |= (tvb_get_guint8(tvb, curr_offset+2) & 0xf0);
mnc&=0xff; mnc |= (tvb_get_guint8(tvb, curr_offset+1) & 0xf0) >>4;
if ((mnc&0x000f) == 0x000f)
mnc>>4;
lac = tvb_get_guint8(tvb, curr_offset+3); lac = tvb_get_guint8(tvb, curr_offset+3);
lac <<= 8; lac <<= 8;
lac |= tvb_get_guint8(tvb, curr_offset+4); lac |= tvb_get_guint8(tvb, curr_offset+4);