diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-07-10 12:26:39 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-07-10 12:26:39 +0000 |
| commit | 7b8cdbe44ff1297a934f2036c26f434fa793b2fa (patch) | |
| tree | c42abaf5294eacf1b7ef5dcba796374e1c83ba66 /epan/dissectors/packet-gtp.c | |
| parent | 75a6ad54bef401ce9e67b22d59e9f22b98abb7f8 (diff) | |
Restore hf_gtp_ext_rat_type as it's used in decode_gtp_rat_type().
Fix IMEI(SV) While we're at it.
svn path=/trunk/; revision=29053
Diffstat (limited to 'epan/dissectors/packet-gtp.c')
| -rw-r--r-- | epan/dissectors/packet-gtp.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 560b8f8c8e..4cbea00c19 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -1300,6 +1300,15 @@ static const value_string gtp_cipher_algorithm[] = { {7, "GEA/7"}, {0, NULL} }; +static const value_string gtp_ext_rat_type_vals[] = { + {0, "Reserved"}, + {1, "UTRAN"}, + {2, "GERAN"}, + {3, "WLAN"}, + {4, "GAN"}, + {5, "HSPA Evolution"}, + {0, NULL} +}; #define MM_PROTO_GROUP_CALL_CONTROL 0x00 #define MM_PROTO_BROADCAST_CALL_CONTROL 0x01 @@ -5167,7 +5176,8 @@ static int decode_gtp_imeisv(tvbuff_t * tvb, int offset, packet_info * pinfo _U_ */ next_tvb = tvb_new_subset(tvb, offset, length, length); digit_str = unpack_digits(next_tvb, 0); - proto_tree_add_string(tree, hf_gtp_ext_imeisv, next_tvb, 0, -1, digit_str); + proto_tree_add_string(ext_imeisv, hf_gtp_ext_imeisv, next_tvb, 0, -1, digit_str); + proto_item_append_text(te, ": %s", digit_str); return 3 + length; } @@ -6823,6 +6833,11 @@ void proto_register_gtp(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} }, + {&hf_gtp_ext_rat_type, + {"RAT Type", "gtp.ext_rat_type", + FT_UINT8, BASE_DEC, VALS(gtp_ext_rat_type_vals), 0x0, + NULL, HFILL} + }, {&hf_gtp_ext_geo_loc_type, {"Geographic Location Type", "gtp.ext_geo_loc_type", FT_UINT8, BASE_DEC, NULL, 0x0, |