aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tzsp.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-tzsp.c')
-rw-r--r--epan/dissectors/packet-tzsp.c136
1 files changed, 98 insertions, 38 deletions
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c
index 091164c4e7..96fe9f312f 100644
--- a/epan/dissectors/packet-tzsp.c
+++ b/epan/dissectors/packet-tzsp.c
@@ -30,10 +30,10 @@
void proto_register_tzsp(void);
void proto_reg_handoff_tzsp(void);
-static int proto_tzsp = -1;
-static int hf_tzsp_version = -1;
-static int hf_tzsp_type = -1;
-static int hf_tzsp_encap = -1;
+static int proto_tzsp;
+static int hf_tzsp_version;
+static int hf_tzsp_type;
+static int hf_tzsp_encap;
static dissector_handle_t tzsp_handle;
@@ -88,8 +88,8 @@ static const value_string tzsp_encapsulation[] = {
{0, NULL}
};
-static gint ett_tzsp = -1;
-static gint ett_tag = -1;
+static gint ett_tzsp;
+static gint ett_tag;
static dissector_handle_t eth_maybefcs_handle;
static dissector_handle_t tr_handle;
@@ -105,30 +105,30 @@ static dissector_handle_t ieee_802_11_radiotap_handle;
/* WLAN radio header fields */
/* ************************************************************************* */
-static int hf_option_tag = -1;
-static int hf_option_length = -1;
-/* static int hf_status_field = -1; */
-static int hf_status_msg_type = -1;
-static int hf_status_pcf = -1;
-/* static int hf_status_mac_port = -1; */
-static int hf_status_undecrypted = -1;
-static int hf_status_fcs_error = -1;
-
-static int hf_time = -1;
-static int hf_silence = -1;
-static int hf_signal = -1;
-static int hf_rate = -1;
-static int hf_channel = -1;
-static int hf_unknown = -1;
-static int hf_original_length = -1;
-static int hf_sensormac = -1;
-
-static int hf_device_name = -1;
-static int hf_capture_location = -1;
-static int hf_capture_info = -1;
-static int hf_capture_id = -1;
-static int hf_time_stamp = -1;
-static int hf_packet_id = -1;
+static int hf_option_tag;
+static int hf_option_length;
+/* static int hf_status_field; */
+static int hf_status_msg_type;
+static int hf_status_pcf;
+/* static int hf_status_mac_port; */
+static int hf_status_undecrypted;
+static int hf_status_fcs_error;
+
+static int hf_time;
+static int hf_silence;
+static int hf_signal;
+static int hf_rate;
+static int hf_channel;
+static int hf_unknown;
+static int hf_original_length;
+static int hf_sensormac;
+
+static int hf_device_name;
+static int hf_capture_location;
+static int hf_capture_info;
+static int hf_capture_id;
+static int hf_time_stamp;
+static int hf_packet_id;
@@ -242,15 +242,15 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti)
break;
case TZSP_DEVICE_NAME:
- proto_tree_add_item(tag_tree, hf_device_name, tvb, pos, length, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tag_tree, hf_device_name, tvb, pos, length, ENC_ASCII);
break;
case TZSP_CAPTURE_LOCATION:
- proto_tree_add_item(tag_tree, hf_capture_location, tvb, pos, length, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tag_tree, hf_capture_location, tvb, pos, length, ENC_ASCII);
break;
case TZSP_INFO:
- proto_tree_add_item(tag_tree, hf_capture_info, tvb, pos, length, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(tag_tree, hf_capture_info, tvb, pos, length, ENC_ASCII);
break;
case TZSP_CAPTURE_ID:
@@ -298,7 +298,7 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti)
break;
case WLAN_RADIO_HDR_CHANNEL:
- proto_tree_add_item(tag_tree, hf_channel, tvb, pos, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tag_tree, hf_channel, tvb, pos, length, ENC_BIG_ENDIAN);
break;
case TZSP_HDR_SENSOR:
@@ -488,6 +488,66 @@ proto_register_tzsp(void)
{153, "153 (5.765 GHz)"},
{157, "157 (5.785 GHz)"},
{161, "161 (5.805 GHz)"},
+ /* 802.11ax */
+ {191, "191 (5.955 GHz)"},
+ {195, "195 (5.975 GHz)"},
+ {199, "199 (5.995 GHz)"},
+ {203, "203 (6.015 GHz)"},
+ {207, "207 (6.035 GHz)"},
+ {211, "211 (6.055 GHz)"},
+ {215, "215 (6.075 GHz)"},
+ {219, "219 (6.095 GHz)"},
+ {223, "223 (6.115 GHz)"},
+ {227, "227 (6.135 GHz)"},
+ {231, "231 (6.155 GHz)"},
+ {235, "235 (6.175 GHz)"},
+ {239, "239 (6.195 GHz)"},
+ {243, "243 (6.215 GHz)"},
+ {247, "247 (6.235 GHz)"},
+ {251, "251 (6.255 GHz)"},
+ {255, "255 (6.275 GHz)"},
+ {259, "259 (6.295 GHz)"},
+ {263, "263 (6.315 GHz)"},
+ {267, "267 (6.335 GHz)"},
+ {271, "271 (6.355 GHz)"},
+ {275, "275 (6.375 GHz)"},
+ {279, "279 (6.395 GHz)"},
+ {283, "283 (6.415 GHz)"},
+ {287, "287 (6.435 GHz)"},
+ {291, "291 (6.455 GHz)"},
+ {295, "295 (6.475 GHz)"},
+ {299, "299 (6.495 GHz)"},
+ {303, "303 (6.515 GHz)"},
+ {307, "307 (6.535 GHz)"},
+ {311, "311 (6.555 GHz)"},
+ {315, "315 (6.575 GHz)"},
+ {319, "319 (6.595 GHz)"},
+ {323, "323 (6.615 GHz)"},
+ {327, "327 (6.635 GHz)"},
+ {331, "331 (6.655 GHz)"},
+ {335, "335 (6.675 GHz)"},
+ {339, "339 (6.695 GHz)"},
+ {343, "343 (6.715 GHz)"},
+ {347, "347 (6.735 GHz)"},
+ {351, "351 (6.755 GHz)"},
+ {355, "355 (6.775 GHz)"},
+ {359, "359 (6.795 GHz)"},
+ {363, "363 (6.815 GHz)"},
+ {367, "367 (6.835 GHz)"},
+ {371, "371 (6.855 GHz)"},
+ {375, "375 (6.875 GHz)"},
+ {379, "379 (6.895 GHz)"},
+ {383, "383 (6.915 GHz)"},
+ {387, "387 (6.935 GHz)"},
+ {391, "391 (6.955 GHz)"},
+ {395, "395 (6.975 GHz)"},
+ {399, "399 (6.995 GHz)"},
+ {403, "403 (7.015 GHz)"},
+ {407, "407 (7.035 GHz)"},
+ {411, "411 (7.055 GHz)"},
+ {415, "415 (7.075 GHz)"},
+ {419, "419 (7.095 GHz)"},
+ {423, "423 (7.115 GHz)"},
{0, NULL}
};
@@ -568,7 +628,7 @@ proto_register_tzsp(void)
"Rate", "tzsp.wlan.rate", FT_UINT8, BASE_DEC,
VALS(rates), 0, NULL, HFILL }},
{ &hf_channel, {
- "Channel", "tzsp.wlan.channel", FT_UINT8, BASE_DEC,
+ "Channel", "tzsp.wlan.channel", FT_UINT16, BASE_DEC,
VALS(channels), 0, NULL, HFILL }},
{ &hf_unknown, {
"Unknown tag", "tzsp.unknown", FT_BYTES, BASE_NONE,
@@ -578,15 +638,15 @@ proto_register_tzsp(void)
NULL, 0, "Sensor MAC", HFILL }},
{ &hf_device_name, {
- "Device Name", "tzsp.device_name", FT_STRING, STR_ASCII,
+ "Device Name", "tzsp.device_name", FT_STRING, BASE_NONE,
NULL, 0, "DeviceName", HFILL }},
{ &hf_capture_location, {
- "Capture Location", "tzsp.capture_location", FT_STRING, STR_ASCII,
+ "Capture Location", "tzsp.capture_location", FT_STRING, BASE_NONE,
NULL, 0, "CaptureLocation", HFILL }},
{ &hf_capture_info, {
- "Capture Information", "tzsp.device_info", FT_STRING, STR_ASCII,
+ "Capture Information", "tzsp.device_info", FT_STRING, BASE_NONE,
NULL, 0, "CaptureInformation", HFILL }},
{ &hf_capture_id, {