From 23a308d583eba757bf9bcae134170b2428a32307 Mon Sep 17 00:00:00 2001 From: sshkurov Date: Sun, 6 Feb 2022 13:21:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D1=8B?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B8=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packmate/service/PcapService.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/ru/serega6531/packmate/service/PcapService.java b/src/main/java/ru/serega6531/packmate/service/PcapService.java index c8f665f..b633055 100644 --- a/src/main/java/ru/serega6531/packmate/service/PcapService.java +++ b/src/main/java/ru/serega6531/packmate/service/PcapService.java @@ -41,13 +41,19 @@ public class PcapService { } public void updateFilter(Collection services) { - final String ports = services.stream() - .map(CtfService::getPort) - .map(p -> "port " + p) - .collect(Collectors.joining(" or ")); + String filter; - final String format = "(tcp or udp) and (%s)"; - String filter = String.format(format, ports); + if (services.isEmpty()) { + filter = "tcp or udp"; + } else { + final String ports = services.stream() + .map(CtfService::getPort) + .map(p -> "port " + p) + .collect(Collectors.joining(" or ")); + + final String format = "(tcp or udp) and (%s)"; + filter = String.format(format, ports); + } log.debug("New filter: " + filter);