diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2002-05-09 23:50:34 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2002-05-09 23:50:34 +0000 |
| commit | 41cc7f0707c5c62ae5651fcd70a9e9b12a4ce387 (patch) | |
| tree | 46737517f86dbb9ec37210737dd521c9c3920608 /epan/ftypes/ftype-bytes.c | |
| parent | 9625720a39eddda6ef4c34725fe8017160cf05d9 (diff) | |
Merge the work in Novell_NCP_branch into the mainline code.
A little work still needs to be done on the new NCP dissector -- make
some of the COL_INFO texts more useful, handle a Unicode issue, and
modify some of the cases that use "request conditions".
But the NCP dissector as it stands is very usable now.
Note: I didn't merge in the PROTO_LENGTH_UNTIL_END macro... I wanted
to think about the various possible macros and review an email conversation
I had with Guy on the subject.
svn path=/trunk/; revision=5432
Diffstat (limited to 'epan/ftypes/ftype-bytes.c')
| -rw-r--r-- | epan/ftypes/ftype-bytes.c | 52 |
1 files changed, 40 insertions, 12 deletions
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index 4a6e59db9d..0a2c4b3432 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -1,5 +1,5 @@ /* - * $Id: ftype-bytes.c,v 1.10 2002/02/05 22:50:17 guy Exp $ + * $Id: ftype-bytes.c,v 1.11 2002/05/09 23:50:32 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -551,19 +551,46 @@ ftype_register_bytes(void) { static ftype_t bytes_type = { - "FT_BYTES", - "sequence of bytes", - 0, - bytes_fvalue_new, - bytes_fvalue_free, - val_from_string, - - bytes_fvalue_set, - NULL, + "FT_BYTES", /* name */ + "sequence of bytes", /* pretty_name */ + 0, /* wire_size */ + bytes_fvalue_new, /* new_value */ + bytes_fvalue_free, /* free_value */ + val_from_string, /* val_from_string */ + + bytes_fvalue_set, /* set_value */ + NULL, /* set_value_integer */ + NULL, /* set_value_floating */ + + value_get, /* get_value */ + NULL, /* get_value_integer */ NULL, - value_get, - NULL, + cmp_eq, + cmp_ne, + cmp_gt, + cmp_ge, + cmp_lt, + cmp_le, + + len, + slice, + }; + + static ftype_t uint_bytes_type = { + "FT_UINT_BYTES", /* name */ + "sequence of bytes", /* pretty_name */ + 0, /* wire_size */ + bytes_fvalue_new, /* new_value */ + bytes_fvalue_free, /* free_value */ + val_from_string, /* val_from_string */ + + bytes_fvalue_set, /* set_value */ + NULL, /* set_value_integer */ + NULL, /* set_value_floating */ + + value_get, /* get_value */ + NULL, /* get_value_integer */ NULL, cmp_eq, @@ -686,6 +713,7 @@ ftype_register_bytes(void) }; ftype_register(FT_BYTES, &bytes_type); + ftype_register(FT_UINT_BYTES, &bytes_type); ftype_register(FT_ETHER, ðer_type); ftype_register(FT_IPv6, &ipv6_type); ftype_register(FT_UINT64, &u64_type); |