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-ieee8021cb.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-ieee8021cb.c')
| -rw-r--r-- | epan/dissectors/packet-ieee8021cb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ieee8021cb.c b/epan/dissectors/packet-ieee8021cb.c index c0cdd303..d2b19c9a 100644 --- a/epan/dissectors/packet-ieee8021cb.c +++ b/epan/dissectors/packet-ieee8021cb.c @@ -35,26 +35,26 @@ static capture_dissector_handle_t llc_cap_handle; /* GLOBALS ************************************************************/ -static int proto_ieee8021cb = -1; +static int proto_ieee8021cb; /* dot1cb R-tag fields */ -static int hf_ieee8021cb_res = -1; -static int hf_ieee8021cb_seq = -1; +static int hf_ieee8021cb_res; +static int hf_ieee8021cb_seq; /* Encapsulated protocol */ -static int hf_ieee8021cb_etype = -1; +static int hf_ieee8021cb_etype; -static gint ett_ieee8021cb = -1; +static int ett_ieee8021cb; #define IEEE8021CB_LEN 6 -static gboolean -capture_ieee8021cb(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header) +static bool +capture_ieee8021cb(const unsigned char *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header) { - guint16 encap_proto; + uint16_t encap_proto; if (!BYTES_ARE_IN_FRAME(offset, len, IEEE8021CB_LEN + 1)) - return FALSE; + return false; encap_proto = pntoh16( &pd[offset + IEEE8021CB_LEN - 2] ); if (encap_proto <= IEEE_802_3_MAX_LEN) { @@ -76,7 +76,7 @@ int dissect_ieee8021cb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *ptree = NULL; - guint16 seq, pro; + uint16_t seq, pro; ethertype_data_t ethertype_data; proto_tree *ieee8021cb_tree; @@ -126,7 +126,7 @@ proto_register_ieee8021cb(void) VALS(etype_vals), 0x0, "Ethertype", HFILL }} }; - static gint *ett[] = { + static int *ett[] = { &ett_ieee8021cb }; |