diff options
| author | zhongweisitu <zsitu@extremenetworks.com> | 2019-01-15 18:06:31 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-01-23 14:15:27 +0000 |
| commit | 57fd0a3be207fee7bc1d1d0e725fb1fa2e440064 (patch) | |
| tree | 02be8794a79de6f8a74edf5f3b32049b313a0b32 /epan/dissectors/packet-tzsp.c | |
| parent | f3e27b8a3e369f2fb974c59062bdd32bee39aa9f (diff) | |
Add support for two more metadata fields in the tzsp header
Change-Id: I7a186a5763c74fb79a14eb5c0a5ca9a91a7934bd
Reviewed-on: https://code.wireshark.org/review/31562
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tzsp.c')
| -rw-r--r-- | epan/dissectors/packet-tzsp.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 4adda76ba6..ddd0ce9dae 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -125,6 +125,8 @@ 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; @@ -145,6 +147,10 @@ static int hf_packet_id = -1; #define TZSP_DEVICE_NAME 80 #define TZSP_CAPTURE_LOCATION 81 #define TZSP_TIME_STAMP 82 +#define TZSP_INFO 83 /* Addition TZSP Information; String type*/ +#define TZSP_CAPTURE_ID 84 /* Capture Instance ID; 32 bits unsigned integer */ + + /* ************************************************************************* */ @@ -169,6 +175,8 @@ static const value_string option_tag_vals[] = { {TZSP_DEVICE_NAME, "Device Name"}, {TZSP_CAPTURE_LOCATION, "Capture Location"}, {TZSP_TIME_STAMP, "Time Stamp"}, + {TZSP_INFO, "Information"}, + {TZSP_CAPTURE_ID, "Capture ID"}, {WLAN_RADIO_HDR_SIGNAL, "Signal"}, {WLAN_RADIO_HDR_NOISE, "Silence"}, {WLAN_RADIO_HDR_RATE, "Rate"}, @@ -241,6 +249,13 @@ add_option_info(tvbuff_t *tvb, int pos, proto_tree *tree, proto_item *ti) proto_tree_add_item(tag_tree, hf_capture_location, tvb, pos, length, ENC_ASCII|ENC_NA); break; + case TZSP_INFO: + proto_tree_add_item(tag_tree, hf_capture_info, tvb, pos, length, ENC_ASCII|ENC_NA); + break; + + case TZSP_CAPTURE_ID: + proto_tree_add_item(tag_tree, hf_capture_id, tvb, pos, 4, ENC_BIG_ENDIAN); + break; case TZSP_TIME_STAMP: proto_tree_add_item(tag_tree, hf_time_stamp, tvb, pos, length, ENC_TIME_SECS_NSECS|ENC_BIG_ENDIAN); @@ -570,6 +585,14 @@ proto_register_tzsp(void) "Capture Location", "tzsp.device_name", FT_STRING, STR_ASCII, NULL, 0, "CaptureLocation", HFILL }}, + { &hf_capture_info, { + "Capture Information", "tzsp.device_info", FT_STRING, STR_ASCII, + NULL, 0, "CaptureInformation", HFILL }}, + + { &hf_capture_id, { + "Capture Id", "tzsp.device_id", FT_UINT32, BASE_DEC, + NULL, 0, "CaptureID", HFILL }}, + {&hf_time_stamp, { "Time Stamp", "tzsp.time_stamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, |