diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-03-19 22:02:46 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-03-19 22:02:46 +0000 |
| commit | a9f6319ec85645fbe6e0d6a40a3e697cf7b58d2f (patch) | |
| tree | 534bf59ae8c9274b0a7c639e68c3a2cfbd5d7b5c /epan/dissectors/packet-e212.c | |
| parent | 27024a1d5a68dada122f48278e3e03b3265b42be (diff) | |
Revert the previous changes MCC and MNC are coded differently in different places.
svn path=/trunk/; revision=27801
Diffstat (limited to 'epan/dissectors/packet-e212.c')
| -rw-r--r-- | epan/dissectors/packet-e212.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index 2ed3bc192b..7857d0e895 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -277,6 +277,12 @@ static int hf_E212_mcc = -1; static int hf_E212_mnc = -1; static int hf_E212_msin = -1; +/* + * 8 7 6 5 4 3 2 1 + * MCC digit 2 MCC digit 1 octet x + * MNC digit 3 MCC digit 3 octet x+1 + * MNC digit 2 MNC digit 1 octet x+2 + */ int @@ -296,11 +302,11 @@ dissect_e212_mcc_mnc(tvbuff_t *tvb, proto_tree *tree, int offset){ octet = tvb_get_guint8(tvb,offset); mcc3 = octet & 0x0f; /* MNC, Mobile network code (octet 3 bits 5 to 8, octet 4) */ - mnc1 = octet >> 4; + mnc3 = octet >> 4; offset++; octet = tvb_get_guint8(tvb,offset); - mnc2 = octet & 0x0f; - mnc3 = octet >> 4; + mnc1 = octet & 0x0f; + mnc2 = octet >> 4; mcc = 100 * mcc1 + 10 * mcc2 + mcc3; mnc = 10 * mnc1 + mnc2; |