aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isis-clv.h
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-12-22 18:18:12 +0000
committerMichael Mann <mmann78@netscape.net>2013-12-22 18:18:12 +0000
commit89786cc8c764737f8681abd406dfaa4ffdb4f561 (patch)
treed050a14fcc847bb01fb03c4a0dacb3e83bcdc3b0 /epan/dissectors/packet-isis-clv.h
parent302a4cf1c053e789e6b3ad0ec0863d9843350f7c (diff)
Overhaul the ISIS dissectors
1. Make real dissectors and call dissector_try_uint_new for each "isis.type" 2. Use make_register script for dissector initialization 3. Replace isis_dissect_unknown() with real expert info 4. Use convert_proto_tree_add_text.pl to make many more filterable items and gets some files off of the checkAPIs.pl naughty list. 5. Remove (now unnecessary) dissector specific header files 6. Do some reordering of functions to eliminate the need for function declarations. Additional whitespace formatting and modelines should probably be applied to all of these dissectors. Used capture files from bug 5354 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5354) and bug 1792 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1792) for fuzztesting. svn path=/trunk/; revision=54367
Diffstat (limited to 'epan/dissectors/packet-isis-clv.h')
-rw-r--r--epan/dissectors/packet-isis-clv.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-isis-clv.h b/epan/dissectors/packet-isis-clv.h
index 255424fae7..a757ddcef8 100644
--- a/epan/dissectors/packet-isis-clv.h
+++ b/epan/dissectors/packet-isis-clv.h
@@ -85,7 +85,7 @@ typedef struct {
int optcode; /* code for option */
const char *tree_text; /* text for fold out */
gint *tree_id; /* id for add_item */
- void (*dissect)(tvbuff_t *tvb, proto_tree *tree,
+ void (*dissect)(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree,
int offset, int id_length, int length);
} isis_clv_handle_t;
@@ -93,28 +93,28 @@ typedef struct {
* Published API functions. NOTE, this are "local" API functions and
* are only valid from with isis decodes.
*/
-extern void isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset,
- const isis_clv_handle_t *opts, int len, int id_length,
+extern void isis_dissect_clvs(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset,
+ const isis_clv_handle_t *opts, expert_field* expert_short_len, int len, int id_length,
int unknown_tree_id);
extern void isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree,
int offset, int length);
-extern void isis_dissect_te_router_id_clv(tvbuff_t *tvb, proto_tree *tree,
+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);
-extern void isis_dissect_ipv6_int_clv(tvbuff_t *tvb, proto_tree *tree,
+extern void isis_dissect_ipv6_int_clv(proto_tree *tree, packet_info* pinfo, tvbuff_t *tvb, expert_field* expert,
int offset, int length, int tree_id);
-extern void isis_dissect_ip_int_clv(tvbuff_t *tvb, proto_tree *tree,
+extern void isis_dissect_ip_int_clv(proto_tree *tree, packet_info* pinfo, tvbuff_t *tvb, expert_field* expert,
int offset, int length, int tree_id);
extern void isis_dissect_mt_clv(tvbuff_t *tvb, proto_tree *tree,
int offset, int length, int tree_id);
extern void isis_dissect_hostname_clv(tvbuff_t *tvb, proto_tree *tree,
int offset, int length, int tree_id);
-extern void isis_dissect_authentication_clv(tvbuff_t *tvb, proto_tree *tree,
- int offset, int length);
+extern void isis_dissect_authentication_clv(proto_tree *tree, packet_info* pinfo, tvbuff_t *tvb,
+ expert_field* auth_expert, int offset, int length);
extern void isis_dissect_ip_authentication_clv(tvbuff_t *tvb, proto_tree *tree,
int offset, int length);
-extern void isis_dissect_area_address_clv(tvbuff_t *tvb, proto_tree *tree,
- int offset, int length);
+extern void isis_dissect_area_address_clv(proto_tree *tree, packet_info* pinfo, tvbuff_t *tvb,
+ expert_field* expert, int offset, int length);
extern void isis_dissect_metric(tvbuff_t *tvb, proto_tree *tree, int offset,
guint8 value, char *pstr, int force_supported);