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-redback.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-redback.c')
| -rw-r--r-- | epan/dissectors/packet-redback.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index e387f1b0..619fdd0a 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -20,7 +20,7 @@ void proto_reg_handoff_redback(void); static dissector_handle_t redback_handle; -static gint ett_redback = -1; +static int ett_redback; static dissector_table_t osinl_incl_subdissector_table; static dissector_table_t osinl_excl_subdissector_table; @@ -33,24 +33,24 @@ static dissector_handle_t arp_handle; static dissector_handle_t ppp_handle; static dissector_handle_t ppphdlc_handle; -static int proto_redback = -1; +static int proto_redback; -static int hf_redback_circuit = -1; -static int hf_redback_context = -1; -static int hf_redback_dataoffset = -1; -static int hf_redback_flags = -1; -static int hf_redback_l3offset = -1; -static int hf_redback_length = -1; -static int hf_redback_padding = -1; -static int hf_redback_protocol = -1; -static int hf_redback_unknown = -1; +static int hf_redback_circuit; +static int hf_redback_context; +static int hf_redback_dataoffset; +static int hf_redback_flags; +static int hf_redback_l3offset; +static int hf_redback_length; +static int hf_redback_padding; +static int hf_redback_protocol; +static int hf_redback_unknown; -static expert_field ei_redback_protocol = EI_INIT; +static expert_field ei_redback_protocol; static int dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint16 l3off, dataoff, proto; + uint16_t l3off, dataoff, proto; proto_item *ti, *protocol_item; proto_tree *rbtree = NULL; tvbuff_t *next_tvb; @@ -104,7 +104,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (l3off > dataoff) { call_dissector(ethnofcs_handle, next_tvb, pinfo, tree); } else { - guint8 nlpid = tvb_get_guint8(tvb, dataoff); + uint8_t nlpid = tvb_get_uint8(tvb, dataoff); if(dissector_try_uint(osinl_incl_subdissector_table, nlpid, next_tvb, pinfo, tree)) break; next_tvb = tvb_new_subset_remaining(tvb, dataoff+1); @@ -119,7 +119,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data * PPP Messages e.g. LCP, IPCP etc - possibly on ethernet in case of PPPoE. * PPPoE messages are Protocol 8 ... */ - guint32 flags; + uint32_t flags; flags = tvb_get_ntohl(tvb, 4); if (flags & 0x04000000) { @@ -208,7 +208,7 @@ proto_register_redback(void) }, }; - static gint *ett[] = { + static int *ett[] = { &ett_redback }; |