diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-cisco-metadata.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-cisco-metadata.c')
| -rw-r--r-- | epan/dissectors/packet-cisco-metadata.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-cisco-metadata.c b/epan/dissectors/packet-cisco-metadata.c index e9b96e8d..9b25c8bb 100644 --- a/epan/dissectors/packet-cisco-metadata.c +++ b/epan/dissectors/packet-cisco-metadata.c @@ -28,26 +28,26 @@ static dissector_handle_t ethertype_handle; static dissector_table_t gre_dissector_table; -static int proto_cmd = -1; +static int proto_cmd; -static int hf_cmd_version = -1; -static int hf_cmd_length = -1; -static int hf_cmd_options = -1; -static int hf_cmd_sgt = -1; +static int hf_cmd_version; +static int hf_cmd_length; +static int hf_cmd_options; +static int hf_cmd_sgt; -static int hf_eth_type = -1; -static int hf_cmd_trailer = -1; +static int hf_eth_type; +static int hf_cmd_trailer; -static gint ett_cmd = -1; +static int ett_cmd; static int dissect_cmd_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint16 encap_proto; + uint16_t encap_proto; ethertype_data_t ethertype_data; proto_tree *cmd_tree = NULL; - gint offset = 0; + int offset = 0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMD"); col_clear(pinfo->cinfo, COL_INFO); @@ -73,12 +73,12 @@ dissect_cmd_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data */ #if 0 if (encap_proto <= IEEE_802_3_MAX_LEN) { - gboolean is_802_2 = TRUE; + bool is_802_2 = true; /* Don't throw an exception for this check (even a BoundsError) */ if (tvb_captured_length_remaining(tvb, 4) >= 2) { if (tvb_get_ntohs(tvb, 4) == 0xffff) - is_802_2 = FALSE; + is_802_2 = false; } dissect_802_3(encap_proto, is_802_2, tvb, 4, pinfo, tree, cmd_tree, hf_eth_type, hf_cmd_trailer, 0); @@ -102,9 +102,9 @@ dissect_cmd_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data { proto_item *ti = NULL; proto_tree *cmd_tree = NULL; - guint16 encap_proto; + uint16_t encap_proto; tvbuff_t *next_tvb; - gint offset = 0; + int offset = 0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMD"); col_clear(pinfo->cinfo, COL_INFO); @@ -156,7 +156,7 @@ proto_register_cmd(void) }, }; - static gint *ett[] = { + static int *ett[] = { &ett_cmd }; |