diff options
| author | Gerald Combs <gerald@wireshark.org> | 2022-06-21 14:31:17 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2022-06-21 14:33:45 -0700 |
| commit | 3b0d9194bc07f73210b4a89defd11c000f54fa57 (patch) | |
| tree | 841920890ea7081ae9339b88668cadbd62777139 | |
| parent | 9c19f473949dd48b941ee8bce4d9ddbd2b409a50 (diff) | |
Docs: Update the ftype description list in wireshark-filter(4).
Update a couple of ftype descriptions and update the list in the
wireshark-filter man page.
| -rw-r--r-- | doc/wireshark-filter.adoc | 15 | ||||
| -rw-r--r-- | epan/ftypes/ftype-bytes.c | 4 | ||||
| -rw-r--r-- | epan/ftypes/ftype-ieee-11073-float.c | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/doc/wireshark-filter.adoc b/doc/wireshark-filter.adoc index c832ad443f..2777f78ad4 100644 --- a/doc/wireshark-filter.adoc +++ b/doc/wireshark-filter.adoc @@ -163,27 +163,32 @@ the largest/smallest. The arguments must all have the same type. === Protocol field types Each protocol field is typed. The types are: +// `tshark -G ftypes | sed -e 's/.*\t/ /' | sort -f -u`, then fix up by hand - ASN.1 object identifier + ASN.1 object identifier, plain or relative + AX.25 address Boolean + Byte sequence Character string + Character, 1 byte Date and time Ethernet or other MAC address EUI64 address - Floating point (double-precision) - Floating point (single-precision) + Fibre Channel WWN + Floating point, single or double precision Frame number Globally Unique Identifier + IEEE-11073 floating point, 16 or 32 bits IPv4 address IPv6 address IPX network number Label + OSI System-ID Protocol - Sequence of bytes Signed integer, 1, 2, 3, 4, or 8 bytes Time offset Unsigned integer, 1, 2, 3, 4, or 8 bytes - 1-byte ASCII character + VINES address An integer may be expressed in decimal, octal, hexadecimal or binary notation, or as a C-style character constant. The following seven display filters diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index e2f23425a6..1a83da8335 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -618,7 +618,7 @@ ftype_register_bytes(void) static ftype_t bytes_type = { FT_BYTES, /* ftype */ "FT_BYTES", /* name */ - "Sequence of bytes", /* pretty_name */ + "Byte sequence", /* pretty_name */ 0, /* wire_size */ bytes_fvalue_new, /* new_value */ bytes_fvalue_copy, /* copy_value */ @@ -651,7 +651,7 @@ ftype_register_bytes(void) static ftype_t uint_bytes_type = { FT_UINT_BYTES, /* ftype */ "FT_UINT_BYTES", /* name */ - "Sequence of bytes", /* pretty_name */ + "Byte sequence", /* pretty_name */ 0, /* wire_size */ bytes_fvalue_new, /* new_value */ bytes_fvalue_copy, /* copy_value */ diff --git a/epan/ftypes/ftype-ieee-11073-float.c b/epan/ftypes/ftype-ieee-11073-float.c index 245fcf69ee..5488f9a76b 100644 --- a/epan/ftypes/ftype-ieee-11073-float.c +++ b/epan/ftypes/ftype-ieee-11073-float.c @@ -900,7 +900,7 @@ Example: 114 is 0x0072 static ftype_t sfloat_type = { FT_IEEE_11073_SFLOAT, /* ftype */ "FT_IEEE_11073_SFLOAT", /* name */ - "IEEE-11073 Floating point (16-bit)", /* pretty_name */ + "IEEE-11073 floating point (16-bit)", /* pretty_name */ 2, /* wire_size */ sfloat_ieee_11073_fvalue_new, /* new_value */ |