diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-08-05 12:35:36 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-08-05 19:07:01 +0000 |
| commit | 9dc332454aa50e62e68d854cb03eee615b8999f1 (patch) | |
| tree | 94d14571de018f02b010b9cb298a7465b0e57625 /epan/dissectors/packet-logcat.c | |
| parent | 79c55a34cb9869a846ed4e58a760c50e409eeeb5 (diff) | |
Various minor dissector fixes/changes
- Fix a few minor bugs;
- Remove unneeded #includes;
- Do some whitespace/long_lines formatting changes.
Change-Id: I97239fa20727498604682239cda0e1b87b10f4bc
Reviewed-on: https://code.wireshark.org/review/3434
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-logcat.c')
| -rw-r--r-- | epan/dissectors/packet-logcat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c index e72c48862e..4a5141a907 100644 --- a/epan/dissectors/packet-logcat.c +++ b/epan/dissectors/packet-logcat.c @@ -77,7 +77,7 @@ static gint detect_version(tvbuff_t *tvb, gint offset) { guint16 payload_length; guint16 try_header_size; - payload_length = tvb_get_letohs(tvb, offset); + payload_length = tvb_get_letohs(tvb, offset); try_header_size = tvb_get_letohs(tvb, offset + 2); if (try_header_size == 0 || try_header_size != 24) @@ -106,6 +106,7 @@ dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Logcat"); + col_clear(pinfo->cinfo, COL_INFO); mainitem = proto_tree_add_item(tree, proto_logcat, tvb, offset, -1, ENC_NA); maintree = proto_item_add_subtree(mainitem, ett_logcat); @@ -175,13 +176,12 @@ dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ next_tvb = tvb_new_subset_length(tvb, offset, string_length - 1); call_dissector(data_text_lines_handle, next_tvb, pinfo, subtree); - col_clear(pinfo->cinfo, COL_INFO); col_add_str(pinfo->cinfo, COL_INFO, log); offset += string_length; check_length += string_length; if (length != check_length) - proto_tree_add_expert(maintree, pinfo, &ei_invalid_payload_length, tvb, offset, tvb_length_remaining(tvb, offset)); + proto_tree_add_expert(maintree, pinfo, &ei_invalid_payload_length, tvb, offset, tvb_reported_length_remaining(tvb, offset)); if (have_tap_listener(exported_pdu_tap)) { exp_pdu_data_t *exp_pdu_data; |