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-isis-clv.h | |
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-isis-clv.h')
-rw-r--r-- | epan/dissectors/packet-isis-clv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-isis-clv.h b/epan/dissectors/packet-isis-clv.h index 457c3643..0e66700c 100644 --- a/epan/dissectors/packet-isis-clv.h +++ b/epan/dissectors/packet-isis-clv.h @@ -82,7 +82,7 @@ typedef struct { int optcode; /* code for option */ const char *tree_text; /* text for fold out */ - gint *tree_id; /* id for add_item */ + int *tree_id; /* id for add_item */ void (*dissect)(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset, isis_data_t *isis, int length); } isis_clv_handle_t; @@ -95,7 +95,7 @@ extern void isis_dissect_clvs(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tre const isis_clv_handle_t *opts, expert_field *expert_short_len, isis_data_t *isis, int unknown_tree_id, int tree_type, int tree_length, expert_field *ei_unknown); -extern void isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, gint ett_nlpid, +extern void isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int ett_nlpid, int hf_nlpid, int offset, int length); extern void isis_dissect_te_router_id_clv(proto_tree *tree, packet_info* pinfo, tvbuff_t *tvb, expert_field* expert, int offset, int length, int tree_id); @@ -115,7 +115,7 @@ extern void isis_dissect_instance_identifier_clv(proto_tree *tree, packet_info* expert_field* expert, int hf_iid, int hf_supported_itid, int offset, int length); extern void isis_dissect_metric(tvbuff_t *tvb, proto_tree *tree, int offset, - guint8 value, char *pstr, int force_supported); + uint8_t value, char *pstr, int force_supported); #endif /* _PACKET_ISIS_CLV_H */ |