diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-24 00:06:35 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-28 20:05:29 +0000 |
| commit | 71c02b20eb798569393da09fc6557c314244e3e8 (patch) | |
| tree | 8b5108b3b9892fedf2ee345be60a1657f270fa34 /epan/dfilter | |
| parent | 8965e90a25a79eaa5569e9de6589f7fc5b3ccb3c (diff) | |
Create FT_FCWWN field type.
Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type.
Change-Id: I4ca77870499fd8239584a70874998b5d194a7167
Reviewed-on: https://code.wireshark.org/review/6036
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/semcheck.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index 39174e4e7c..bda8f49c4b 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -82,10 +82,11 @@ compatible_ftypes(ftenum_t a, ftenum_t b) case FT_OID: case FT_AX25: case FT_VINES: + case FT_FCWWN: case FT_REL_OID: case FT_SYSTEM_ID: - return (b == FT_ETHER || b == FT_BYTES || b == FT_UINT_BYTES || b == FT_GUID || b == FT_OID || b == FT_AX25 || b == FT_VINES || b == FT_REL_OID || b == FT_SYSTEM_ID); + return (b == FT_ETHER || b == FT_BYTES || b == FT_UINT_BYTES || b == FT_GUID || b == FT_OID || b == FT_AX25 || b == FT_VINES || b == FT_FCWWN || b == FT_REL_OID || b == FT_SYSTEM_ID); case FT_BOOLEAN: case FT_FRAMENUM: @@ -182,6 +183,7 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s) case FT_IPXNET: case FT_AX25: case FT_VINES: + case FT_FCWWN: case FT_ETHER: case FT_BYTES: case FT_UINT_BYTES: @@ -296,6 +298,7 @@ is_bytes_type(enum ftenum type) switch(type) { case FT_AX25: case FT_VINES: + case FT_FCWWN: case FT_ETHER: case FT_BYTES: case FT_UINT_BYTES: |