From 66214087d5df22a050c16cf719815d181ab6d511 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Thu, 29 Aug 2024 10:39:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20stream=5Fid=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=20zeek=20=E8=A7=A3=E6=9E=90=E8=8E=B7=E5=8F=96=20stream=5Fid=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=B9=8B=E5=90=8E=E6=8C=89=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E8=A1=A5=E5=85=85=20tcp=5Fstream,udp=5Fstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/geedge/asw/module/runner/util/PcapParserThread.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/net/geedge/asw/module/runner/util/PcapParserThread.java b/src/main/java/net/geedge/asw/module/runner/util/PcapParserThread.java index 262856f..a3329b7 100644 --- a/src/main/java/net/geedge/asw/module/runner/util/PcapParserThread.java +++ b/src/main/java/net/geedge/asw/module/runner/util/PcapParserThread.java @@ -127,7 +127,6 @@ public class PcapParserThread implements Runnable { // add custom field String pcapId = pcapEntity.getId(); String pcapName = pcapEntity.getName(); - Long tcpStream = 0L, udpStream = 0L; String sharkdApiHostAddr = properties.getProperty("sharkdApiHostAddr", "127.0.0.1"); for (Object obj : jsonArray) { @@ -136,13 +135,12 @@ public class PcapParserThread implements Runnable { pojo.put("pcap.name", pcapName); String proto = T.MapUtil.getStr(pojo, "proto", ""); + Long streamId = T.MapUtil.getLong(pojo, "stream_id"); if (T.StrUtil.equalsIgnoreCase("tcp", proto)) { - Long streamId = tcpStream++; pojo.put("pcap.tcp_stream", streamId); pojo.put("pcap.stream_url", String.format("http://%s/navi/pcap/%s/tcp/%s", sharkdApiHostAddr, pcapId, streamId)); } if (T.StrUtil.equalsIgnoreCase("udp", proto)) { - Long streamId = udpStream++; pojo.put("pcap.udp_stream", streamId); pojo.put("pcap.stream_url", String.format("http://%s/navi/pcap/%s/udp/%s", sharkdApiHostAddr, pcapId, streamId)); }