diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/packet-cisco-wids.c | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-cisco-wids.c')
| -rw-r--r-- | epan/dissectors/packet-cisco-wids.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 25c8823f..b500c22b 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -40,19 +40,19 @@ #include <epan/expert.h> #include <epan/show_exception.h> -static int proto_cwids = -1; -static int hf_cwids_version = -1; -static int hf_cwids_timestamp = -1; -static int hf_cwids_unknown1 = -1; -static int hf_cwids_channel = -1; -static int hf_cwids_unknown2 = -1; -static int hf_cwids_reallength = -1; -static int hf_cwids_capturelen = -1; -static int hf_cwids_unknown3 = -1; +static int proto_cwids; +static int hf_cwids_version; +static int hf_cwids_timestamp; +static int hf_cwids_unknown1; +static int hf_cwids_channel; +static int hf_cwids_unknown2; +static int hf_cwids_reallength; +static int hf_cwids_capturelen; +static int hf_cwids_unknown3; -static gint ett_cwids = -1; +static int ett_cwids; -static expert_field ie_ieee80211_subpacket = EI_INIT; +static expert_field ei_ieee80211_subpacket; static dissector_handle_t cwids_handle; @@ -64,7 +64,7 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U tvbuff_t *wlan_tvb; proto_tree *ti, *cwids_tree; volatile int offset = 0; - guint16 capturelen; + uint16_t capturelen; col_set_str(pinfo->cinfo, COL_PROTOCOL, "CWIDS"); col_set_str(pinfo->cinfo, COL_INFO, "Cwids: "); @@ -80,8 +80,8 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U memset(&phdr, 0, sizeof(phdr)); phdr.fcs_len = 0; /* no FCS */ - phdr.decrypted = FALSE; - phdr.datapad = FALSE; + phdr.decrypted = false; + phdr.datapad = false; phdr.phy = PHDR_802_11_PHY_UNKNOWN; proto_tree_add_item(cwids_tree, hf_cwids_version, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -89,8 +89,8 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U offset += 6; proto_tree_add_item(cwids_tree, hf_cwids_unknown1, tvb, offset, 1, ENC_NA); offset += 1; - phdr.has_channel = TRUE; - phdr.channel = tvb_get_guint8(tvb, offset); + phdr.has_channel = true; + phdr.channel = tvb_get_uint8(tvb, offset); proto_tree_add_item(cwids_tree, hf_cwids_channel, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; proto_tree_add_item(cwids_tree, hf_cwids_unknown2, tvb, offset, 6, ENC_NA); @@ -110,7 +110,7 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U } CATCH_BOUNDS_ERRORS { show_exception(wlan_tvb, pinfo, tree, EXCEPT_CODE, GET_MESSAGE); - expert_add_info(pinfo, ti, &ie_ieee80211_subpacket); + expert_add_info(pinfo, ti, &ei_ieee80211_subpacket); } ENDTRY; offset += capturelen; @@ -158,12 +158,12 @@ proto_register_cwids(void) 0x0, "3rd Unknown block", HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_cwids, }; static ei_register_info ei[] = { - { &ie_ieee80211_subpacket, { "cwids.ieee80211_malformed", PI_MALFORMED, PI_ERROR, "Malformed or short IEEE80211 subpacket", EXPFILL }}, + { &ei_ieee80211_subpacket, { "cwids.ieee80211_malformed", PI_MALFORMED, PI_ERROR, "Malformed or short IEEE80211 subpacket", EXPFILL }}, }; expert_module_t* expert_cwids; |