aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_a_gm.c
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2012-02-13 22:46:12 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2012-02-13 22:46:12 +0000
commit77307392c68463c749d2b516d3d4fdb772f64972 (patch)
tree2932942fc879edbb47ba13a6876689cb14114801 /epan/dissectors/packet-gsm_a_gm.c
parenta77b007741f4ed9bdd012319ed25169142dee993 (diff)
From Pascal Quantin:
fixes for dissection of Traffic Flow Template IE. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6840 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41020 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-gsm_a_gm.c')
-rw-r--r--epan/dissectors/packet-gsm_a_gm.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index d1e7604b4d..48c20b4723 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -75,6 +75,7 @@
#include "packet-gsm_a_common.h"
#include "packet-e212.h"
#include "packet-ppp.h"
+#include "ipproto.h"
/* PROTOTYPES/FORWARDS */
@@ -241,6 +242,7 @@ static int hf_gsm_a_tft_port = -1;
static int hf_gsm_a_tft_port_low = -1;
static int hf_gsm_a_tft_port_high = -1;
static int hf_gsm_a_tft_security = -1;
+static int hf_gsm_a_tft_traffic_class = -1;
static int hf_gsm_a_tft_traffic_mask = -1;
static int hf_gsm_a_tft_flow_label_type = -1;
static int hf_gsm_a_tft_param_id = -1;
@@ -4775,7 +4777,7 @@ de_sm_tflow_temp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 of
case 0x70:
str="Type of service/Traffic class type";
- proto_tree_add_item(comp_tree,hf_gsm_a_qos_traffic_cls,tvb,curr_offset,1,ENC_BIG_ENDIAN);
+ proto_tree_add_item(comp_tree,hf_gsm_a_tft_traffic_class,tvb,curr_offset,1,ENC_BIG_ENDIAN);
curr_offset++;
proto_tree_add_item(comp_tree,hf_gsm_a_tft_traffic_mask,tvb,curr_offset,1,ENC_BIG_ENDIAN);
curr_offset++;
@@ -6736,7 +6738,7 @@ proto_register_gsm_a_gm(void)
},
{ &hf_gsm_a_tft_protocol_header,
{ "Protocol/header", "gsm_a.tft.protocol_header",
- FT_UINT8, BASE_HEX, NULL, 0x0,
+ FT_UINT8, BASE_HEX|BASE_EXT_STRING, (&ipproto_val_ext), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_tft_port,
@@ -6759,6 +6761,11 @@ proto_register_gsm_a_gm(void)
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
+ { &hf_gsm_a_tft_traffic_class,
+ { "Type of service/Traffic class field", "gsm_a.tft.traffic_class",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ NULL, HFILL }
+ },
{ &hf_gsm_a_tft_traffic_mask,
{ "Mask field", "gsm_a.tft.traffic_mask",
FT_UINT8, BASE_HEX, NULL, 0x0,