diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-26 17:44:25 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-26 17:44:25 +0000 |
| commit | f59ea5f7690c9a01ef6f7f6508084a66c40b1dae (patch) | |
| tree | 482ee255d71f113be6c62e9ff3543fd6ebb9f12a /test/lua/acme_file.lua | |
| parent | Releasing progress-linux version 4.2.2-1.1~progress7.99u1. (diff) | |
| download | wireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.tar.xz wireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.zip | |
Merging upstream version 4.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'test/lua/acme_file.lua')
| -rw-r--r-- | test/lua/acme_file.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/lua/acme_file.lua b/test/lua/acme_file.lua index f159ba2..59c48dc 100644 --- a/test/lua/acme_file.lua +++ b/test/lua/acme_file.lua @@ -438,7 +438,9 @@ function State:get_timestamp(line, file_position, seeking) self.nstime = NSTime(timet, milli * 1000000) self.packets[file_position][TTIME] = self.nstime - timet = timet + (milli/1000) + -- For Lua 5.3 and later, make sure we have an integer via a method + -- that also works on Lua 5.1. (os.date doesn't handle fractional seconds.) + timet = timet + math.floor(milli/1000) dprint2("found time of ", os.date("%c",timet), " with value=",timet) return self.nstime, line_pos |