diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-05-09 15:07:26 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-05-09 22:08:02 +0000 |
| commit | 8bab958e195a071bc5e5c016c631d6485e23fc2e (patch) | |
| tree | 32bd77ea4e8fe7d226093d7b86184af9b999e14e | |
| parent | 9d6083efd16d7fffdeb52d6d9a91cc1bebe24598 (diff) | |
You can't have a field be both integer and string.
For an inter-frame gap that couldn't be determined, just add it with
proto_tree_add_uint_format_value() and "Cannot be determined" as the way
the value is displayed.
(But why add it *at all* if it couldn't be determined?)
Change-Id: I491f9a6fe430141a15568e9a7dec3253a1c78cf5
Reviewed-on: https://code.wireshark.org/review/21582
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dissectors/packet-ixveriwave.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 7b7ad8bef8..57206f0348 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -139,7 +139,6 @@ static int hf_ixveriwave_vw_startt = -1; static int hf_ixveriwave_vw_endt = -1; static int hf_ixveriwave_vw_pktdur = -1; static int hf_ixveriwave_vw_ifg = -1; -static int hf_ixveriwave_vw_ifg_neg = -1; // RF LOGGING static int hf_radiotap_rf_info = -1; @@ -1053,7 +1052,7 @@ dissect_ixveriwave(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da if ((gint32) p_ifg_info->ifg >= 0) ti = proto_tree_add_uint(common_tree, hf_ixveriwave_vw_ifg, tvb, 18, 0, p_ifg_info->ifg); else - ti = proto_tree_add_string(common_tree, hf_ixveriwave_vw_ifg_neg, tvb, 18, 0, "Cannot be determined"); + ti = proto_tree_add_uint_format_value(common_tree, hf_ixveriwave_vw_ifg, tvb, 18, 0, p_ifg_info->ifg, "Cannot be determined"); } PROTO_ITEM_SET_GENERATED(ti); @@ -3106,10 +3105,6 @@ void proto_register_ixveriwave(void) { "Inter-frame gap (usecs)", "ixveriwave.ifg", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, - { &hf_ixveriwave_vw_ifg_neg, - { "Inter-frame gap (usecs)", "ixveriwave.ifg", - FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, - // RF LOGGING { &hf_radiotap_rf_info, { "RF Header", "ixveriwave.RFInfo", |