diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-23 17:56:14 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-03-05 16:45:04 +0000 |
| commit | f2b35a180f12575bcd4198add4a6478b4ce41802 (patch) | |
| tree | a14fcab1ca616169b1649f8192250bf0f9925130 /epan/proto.c | |
| parent | a065fefe689a1c839fc74e5b253212f0efddfced (diff) | |
Qt: Add extra related packet indicator types.
Add the ability to set frame number types: none, request, or response.
Use the types to draw different related packet indicators in the packet
list.
Track the conversation in PacketListRecord. Use it to draw dashed lines
for unrelated frames.
Set frame number types for DNS and ICMP.
Instead of drawing a transparent QImage, alpha blend our foreground
color and draw directly in our painter. Blend more toward the foreground
color.
Add FRAMENUM_TYPE to checkAPIs.
Change-Id: I2495945bb436413e05d6ec697184a0b4fd5ad214
Reviewed-on: https://code.wireshark.org/review/7436
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/proto.c b/epan/proto.c index 4c07a5e2c9..d22e41539a 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5636,8 +5636,9 @@ tmp_fld_check_assert(header_field_info *hfinfo) (hfinfo->type == FT_INT56) || (hfinfo->type == FT_INT64) || (hfinfo->type == FT_BOOLEAN) || - (hfinfo->type == FT_PROTOCOL) )) - g_error("Field '%s' (%s) has a 'strings' value but is of type %s" + (hfinfo->type == FT_PROTOCOL) || + (hfinfo->type == FT_FRAMENUM) )) + g_error("Field '%s' (%s) has a 'strings' value but is of type %s" " (which is not allowed to have strings)\n", hfinfo->name, hfinfo->abbrev, ftype_name(hfinfo->type)); @@ -6637,7 +6638,7 @@ fill_label_number(field_info *fi, gchar *label_str, gboolean is_signed) fmtfunc(tmp, value); label_fill(label_str, 0, hfinfo, tmp); } - else if (hfinfo->strings) { + else if (hfinfo->strings && hfinfo->type != FT_FRAMENUM) { /* Add fill_label_framenum? */ const char *val_str = hf_try_val_to_str_const(value, hfinfo, "Unknown"); out = hfinfo_number_vals_format(hfinfo, buf, value); |