diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
commit | 207df6fc406e81bfeebdff7f404bd242ff3f099f (patch) | |
tree | a1a796b056909dd0a04ffec163db9363a8757808 /src/formats/pcap_log.json | |
parent | Releasing progress-linux version 0.11.2-1~progress7.99u1. (diff) | |
download | lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.tar.xz lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.zip |
Merging upstream version 0.12.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | src/formats/pcap_log.json | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/formats/pcap_log.json b/src/formats/pcap_log.json index 8ae73e2..a9e86ef 100644 --- a/src/formats/pcap_log.json +++ b/src/formats/pcap_log.json @@ -4,11 +4,17 @@ "json": true, "title": "Packet Capture", "description": "Internal format for pcap files", - "mime-types": [ - "application/vnd.tcpdump.pcap" - ], - "multiline": false, "convert-to-local-time": true, + "converter": { + "header": { + "expr": { + "pcapng": ":header REGEXP '^0a0d0d0a.{8}(?:1a2b3c4d|4d3c2b1a).*'", + "pcap": ":header REGEXP '^(?:a1b2c3d4|d4c3b2a1|a1b23c4d|4d3cb2a1).*'" + }, + "size": 24 + }, + "command": "pcap_log-converter.sh" + }, "line-format": [ { "field": "time" |