aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2011-05-08 10:23:53 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2011-05-08 10:23:53 +0000
commit7d317e553b95cf302d3acf3a9966c92c92f44c80 (patch)
tree064056433d1b4da25ce28966c34f0e2a1668feb3 /epan/dfilter
parent8428b08b1a11bfebd6a6039362eaa528727ac904 (diff)
Add FT_EUI64 Field Type
* Remove proto_tree_add_eui64 function from 802.15.4 Dissector * Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name * Update Documentation (README.dev) * Add new function in libwireshark.def * Support of encoding for tvb_eui64_to_str * Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector svn path=/trunk/; revision=37015
Diffstat (limited to 'epan/dfilter')
-rw-r--r--epan/dfilter/semcheck.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 680026279d..e3904f0bf7 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -75,6 +75,7 @@ compatible_ftypes(ftenum_t a, ftenum_t b)
case FT_IPXNET:
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 */
return a == b;
case FT_ETHER:
@@ -82,6 +83,7 @@ compatible_ftypes(ftenum_t a, ftenum_t b)
case FT_UINT_BYTES:
case FT_GUID:
case FT_OID:
+
return (b == FT_ETHER || b == FT_BYTES || b == FT_UINT_BYTES || b == FT_GUID || b == FT_OID);
case FT_BOOLEAN:
@@ -173,6 +175,7 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s)
case FT_UINT_STRING:
case FT_UINT64:
case FT_INT64:
+ case FT_EUI64:
case FT_PCRE:
case FT_GUID:
case FT_OID:
@@ -295,6 +298,7 @@ is_bytes_type(enum ftenum type)
case FT_INT32:
case FT_INT64:
case FT_PCRE:
+ case FT_EUI64:
return FALSE;
case FT_NUM_TYPES: