diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-08-18 23:14:09 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-01 21:42:51 +0000 |
| commit | ad1b785fe80df6ecffee396a617960e1af390274 (patch) | |
| tree | 0243a68966024410257dc7004688bb3f3ef3869d /epan/dissectors/packet-udp.c | |
| parent | 69e61db3aea6fa70e8ff38c9184b0206ce85ebd3 (diff) | |
udp_dissect_pdus follow-up
Add heuristic support
Better documentation
Change-Id: I236c1f4d3613aa58d608aee0e5edc40c3b158d25
Reviewed-on: https://code.wireshark.org/review/10120
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-udp.c')
| -rw-r--r-- | epan/dissectors/packet-udp.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index dd323118e1..197131c15c 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -549,9 +549,10 @@ decode_udp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, call_dissector(data_handle,next_tvb, pinfo, tree); } -void +int udp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - guint fixed_len, guint (*get_pdu_len)(packet_info *, tvbuff_t *, int, void*), + guint fixed_len, gboolean (*heuristic_check)(packet_info *, tvbuff_t *, int, void*), + guint (*get_pdu_len)(packet_info *, tvbuff_t *, int, void*), new_dissector_t dissect_pdu, void* dissector_data) { volatile int offset = 0; @@ -580,9 +581,25 @@ udp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, captured_length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); /* + * If there is a heuristic function, check it + */ + if ((heuristic_check != NULL) && + ((*heuristic_check)(pinfo, tvb, offset, dissector_data) == FALSE)) { + return offset; + } + + /* * Get the length of the PDU. */ plen = (*get_pdu_len)(pinfo, tvb, offset, dissector_data); + if (plen == 0) { + /* + * Either protocol has variable length (which isn't supposed by UDP) + * or packet doesn't belong to protocol + */ + return offset; + } + if (plen < fixed_len) { /* * Either: @@ -600,7 +617,7 @@ udp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * Report this as a bounds error. */ show_reported_bounds_error(tvb, pinfo, tree); - return; + return offset; } curr_layer_num = pinfo->curr_layer_num-1; @@ -668,6 +685,8 @@ udp_dissect_pdus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (offset <= offset_before) break; } + + return offset; } static void |