diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-19 08:08:38 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-02 00:00:57 +0000 |
| commit | 07c9492b8d40ed766074679f86c49780277af002 (patch) | |
| tree | 5a0c6f5d078872b58a7eac1469ce6d2401bf2792 /epan/dissectors/file-file.c | |
| parent | f384fa07f945fd73e3f0088c19d640a8c534a791 (diff) | |
Remove pkt_comment member from packet_info structure.
Change-Id: Ifd3d201a09944e3fc36188f891ea8a584886101d
Reviewed-on: https://code.wireshark.org/review/5884
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/file-file.c')
| -rw-r--r-- | epan/dissectors/file-file.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index 16e234654d..3956bc4131 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -85,8 +85,9 @@ call_file_record_end_routine(gpointer routine, gpointer dummy _U_) (*func)(); } -static void -dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +/* XXX - "packet comment" is passed into dissector as data, but currently doesn't have a use */ +static int +dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_) { proto_item *volatile ti = NULL; guint cap_len = 0, frame_len = 0; @@ -184,7 +185,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* Ignored package, stop handling here */ col_set_str(pinfo->cinfo, COL_INFO, "<Ignored>"); proto_tree_add_text (tree, tvb, 0, -1, "This record is marked as ignored"); - return; + return tvb_captured_length(tvb); } /* Portable Exception Handling to trap Wireshark specific exceptions like BoundsError exceptions */ @@ -311,6 +312,8 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) g_slist_free(pinfo->frame_end_routines); pinfo->frame_end_routines = NULL; } + + return tvb_captured_length(tvb); } void @@ -382,7 +385,7 @@ proto_register_file(void) proto_file = proto_register_protocol("File", "File", "file"); proto_register_field_array(proto_file, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("file",dissect_file_record,proto_file); + new_register_dissector("file",dissect_file_record,proto_file); /* You can't disable dissection of "Frame", as that would be tantamount to not doing any dissection whatsoever. */ |