summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2009-07-09 16:02:34 +0000
committerBill Meier <wmeier@newsguy.com>2009-07-09 16:02:34 +0000
commit59cc6f3e61dc8ff3ae82807cc0bdb84fab980726 (patch)
tree2a5c9ea8263b019ffb5d22e4d5dcd3c91893c858
parent52160fd4297f091e97470f7e0155561066d8883b (diff)
downloadwireshark-59cc6f3e61dc8ff3ae82807cc0bdb84fab980726.tar.gz
packet-gtp: 3GPP AVP custom VSA dissection no longer required for 3GPP-RAT-Type attribute.
3GPP-RAT-Type values are now defined in the Radius dictionary.3gpp file. svn path=/trunk/; revision=29039
-rw-r--r--epan/dissectors/packet-gtp.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 153d7721ec..560b8f8c8e 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -1301,18 +1301,6 @@ static const value_string gtp_cipher_algorithm[] = {
{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
#define MM_PROTO_PDSS1 0x02
@@ -5003,14 +4991,6 @@ static int decode_gtp_apn_res(tvbuff_t * tvb, int offset, packet_info * pinfo _U
* Type = 151 (Decimal)
*/
-static const gchar *dissect_radius_rat_type(proto_tree * tree, tvbuff_t * tvb)
-{
- guint8 octet;
- octet = tvb_get_guint8(tvb, 0);
- proto_tree_add_item(tree, hf_gtp_ext_rat_type, tvb, 0, 1, FALSE);
- return val_to_str(octet, gtp_ext_rat_type_vals, "Unknown");
-}
-
static int decode_gtp_rat_type(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
{
@@ -6843,11 +6823,6 @@ 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,
@@ -7076,7 +7051,6 @@ void proto_reg_handoff_gtp(void)
radius_register_avp_dissector(VENDOR_THE3GPP, 5, dissect_radius_qos_umts);
radius_register_avp_dissector(VENDOR_THE3GPP, 12, dissect_radius_selection_mode);
- radius_register_avp_dissector(VENDOR_THE3GPP, 21, dissect_radius_rat_type);
radius_register_avp_dissector(VENDOR_THE3GPP, 22, dissect_radius_user_loc);
ip_handle = find_dissector("ip");