Исправлены фильтры для пустого списка сервисов

This commit is contained in:
sshkurov
2022-02-06 13:21:50 +03:00
parent ae19082418
commit 23a308d583

View File

@@ -41,13 +41,19 @@ public class PcapService {
}
public void updateFilter(Collection<CtfService> 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);