From 0e86ea6c57c56b26f4a526884fef035e150b4c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Alvarez?= Date: Wed, 3 Feb 2021 17:40:16 -0300 Subject: [PATCH] Update documentation for ENC_TIME_* constants ENC_TIME_MIP6 and ENC_TIME_CLASSIC_MAC_OS_SECS were added recently by factoring them out of specific dissectors, but they weren't documented. I added documentation, based on comments in the dissector code they came from. --- doc/README.dissector | 7 +++++++ epan/proto.h | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/doc/README.dissector b/doc/README.dissector index 648ba3293a..9160c1de53 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -1830,6 +1830,13 @@ encodings that are currently supported are: ENC_TIME_MSEC_NTP - 4-8 bytes, representing a count of milliseconds since the NTP epoch. (I.e., milliseconds since the NTP epoch.) + ENC_MIP6 - 8 bytes; the first 48 bits are seconds since the UN*X epoch + and the remaining 16 bits indicate the number of 1/65536's of a second + since that second. + + ENC_TIME_CLASSIC_MAC_OS_SECS - 4-8 bytes, representing a count of seconds + since January 1, 1904, 00:00:00 UTC. + For FT_RELATIVE_TIME fields, the encoding specifies the form in which the time stamp is specified, as well as its byte order. The time stamp encodings that are currently supported are: diff --git a/epan/proto.h b/epan/proto.h index 5f1f045d38..327c3304c0 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -577,6 +577,13 @@ void proto_report_dissector_bug(const char *format, ...) * ENC_TIME_MSEC_NTP - 4-8 bytes, representing a count of milliseconds since * the NTP epoch. (I.e., milliseconds since the NTP epoch.) * + * ENC_MIP6 - 8 bytes; the first 48 bits are seconds since the UN*X epoch + * and the remaining 16 bits indicate the number of 1/65536's of a second + * since that second. + * + * ENC_TIME_CLASSIC_MAC_OS_SECS - 4-8 bytes, representing a count of seconds + * since January 1, 1904, 00:00:00 UTC. + * * The backwards-compatibility names are defined as hex numbers so that * the script to generate init.lua will add them as global variables, * along with the new names.