use the correct time units for the enhanced packet blocks

compscidr · Sep 23, 2024 · 050bc58 · 050bc58
1 parent 55f185d
commit 050bc58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...etdumper/src/main/kotlin/com/jasonernst/packetdumper/filedumper/PcapNgFilePacketDumper.kt b/...etdumper/src/main/kotlin/com/jasonernst/packetdumper/filedumper/PcapNgFilePacketDumper.kt
@@ -65,7 +65,9 @@ class PcapNgFilePacketDumper(
             outputStreamWriter.write(packetBlock.toBytes())
             outputStreamWriter.flush()
         } else {
-            val timestamp = System.currentTimeMillis()
+            // convert the nano time to microseconds since that is the default if we don't set
+            // the if_tsresol in the interface description block
+            val timestamp = System.nanoTime() / 1000
             val packetBlock = PcapNgEnhancedPacketBlock(conversionBuffer.array(), timestamp = timestamp)
             outputStreamWriter.write(packetBlock.toBytes())
             outputStreamWriter.flush()

diff --git a/...r/src/main/kotlin/com/jasonernst/packetdumper/serverdumper/PcapNgTcpServerPacketDumper.kt b/...r/src/main/kotlin/com/jasonernst/packetdumper/serverdumper/PcapNgTcpServerPacketDumper.kt
@@ -146,7 +146,9 @@ class PcapNgTcpServerPacketDumper(
             if (isSimple) {
                 PcapNgSimplePacketBlock(conversionBuffer.array())
             } else {
-                val timestamp = System.currentTimeMillis()
+                // convert the nano time to microseconds since that is the default if we don't set
+                // the if_tsresol in the interface description block
+                val timestamp = System.nanoTime() / 1000
                 PcapNgEnhancedPacketBlock(conversionBuffer.array(), timestamp = timestamp)
             }
         buffer.position(startingPosition)