diff options
| author | JC Wren <jcwren@jcwren.com> | 2014-12-17 15:19:20 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-21 16:57:52 +0000 |
| commit | e2bcee6ac442e6eb66dd3b09186070de4acb0010 (patch) | |
| tree | e38e70de1a7160c6833601584774f12936559568 /epan/dfilter | |
| parent | 13531d36fb91f3abbd6e62add83faf863e62d974 (diff) | |
Make FT_{U}INT64 behave more like FT_{U}INT32, add support for FT_{U}INT{40,48,56}
Change-Id: I57354c309ecf3a0c8f0c7cff485638027f30bb19
Reviewed-on: https://code.wireshark.org/review/5813
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/semcheck.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index 2abd5a7e88..9da8e9ba2f 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -70,6 +70,12 @@ compatible_ftypes(ftenum_t a, ftenum_t b) case FT_IPv4: case FT_IPv6: case FT_IPXNET: + case FT_INT40: /* XXX - should be able to compare with INT */ + case FT_UINT40: /* XXX - should be able to compare with INT */ + case FT_INT48: /* XXX - should be able to compare with INT */ + case FT_UINT48: /* XXX - should be able to compare with INT */ + case FT_INT56: /* XXX - should be able to compare with INT */ + case FT_UINT56: /* XXX - should be able to compare with INT */ case FT_INT64: /* XXX - should be able to compare with INT */ case FT_UINT64: /* XXX - should be able to compare with INT */ case FT_EUI64: /* XXX - should be able to compare with INT */ @@ -175,7 +181,7 @@ mk_uint64_fvalue(guint64 val) fvalue_t *fv; fv = fvalue_new(FT_UINT64); - fvalue_set_integer64(fv, val); + fvalue_set_uinteger64(fv, val); return fv; } @@ -224,11 +230,17 @@ mk_fvalue_from_val_string(dfwork_t *dfw, header_field_info *hfinfo, char *s) case FT_UINT16: case FT_UINT24: case FT_UINT32: + case FT_UINT40: + case FT_UINT48: + case FT_UINT56: case FT_UINT64: case FT_INT8: case FT_INT16: case FT_INT24: case FT_INT32: + case FT_INT40: + case FT_INT48: + case FT_INT56: case FT_INT64: break; @@ -352,11 +364,17 @@ is_bytes_type(enum ftenum type) case FT_UINT16: case FT_UINT24: case FT_UINT32: + case FT_UINT40: + case FT_UINT48: + case FT_UINT56: case FT_UINT64: case FT_INT8: case FT_INT16: case FT_INT24: case FT_INT32: + case FT_INT40: + case FT_INT48: + case FT_INT56: case FT_INT64: case FT_PCRE: case FT_EUI64: |