From b5a276d9615feaed58d6edf83f929b781fff85ef Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Mon, 13 Apr 2020 00:56:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B4=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B5=D0=B9=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20libpcap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/serega6531/packmate/pcap/AbstractPcapWorker.java   | 2 +-
 .../ru/serega6531/packmate/service/ServicesService.java   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/serega6531/packmate/pcap/AbstractPcapWorker.java b/src/main/java/ru/serega6531/packmate/pcap/AbstractPcapWorker.java
index 7763205..d6a6536 100644
--- a/src/main/java/ru/serega6531/packmate/pcap/AbstractPcapWorker.java
+++ b/src/main/java/ru/serega6531/packmate/pcap/AbstractPcapWorker.java
@@ -37,7 +37,7 @@ public abstract class AbstractPcapWorker implements PcapWorker, PacketListener {
     protected PcapHandle pcap = null;
     protected final ExecutorService loopExecutorService;
 
-    protected String filter = null;
+    protected String filter = "tcp or udp";
 
     // во время работы должен быть != null
     protected ExecutorService processorExecutorService;
diff --git a/src/main/java/ru/serega6531/packmate/service/ServicesService.java b/src/main/java/ru/serega6531/packmate/service/ServicesService.java
index b348162..2d53ea0 100644
--- a/src/main/java/ru/serega6531/packmate/service/ServicesService.java
+++ b/src/main/java/ru/serega6531/packmate/service/ServicesService.java
@@ -3,6 +3,7 @@ package ru.serega6531.packmate.service;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import ru.serega6531.packmate.model.CtfService;
 import ru.serega6531.packmate.model.enums.SubscriptionMessageType;
@@ -32,7 +33,7 @@ public class ServicesService {
     @Autowired
     public ServicesService(ServiceRepository repository,
                            SubscriptionService subscriptionService,
-                           PcapService pcapService,
+                           @Lazy PcapService pcapService,
                            @Value("${local-ip}") String localIpString) throws UnknownHostException {
         this.repository = repository;
         this.subscriptionService = subscriptionService;
@@ -63,9 +64,13 @@ public class ServicesService {
 
     public void deleteByPort(int port) {
         log.info("Removed service at port {}", port);
+
         services.remove(port);
         repository.deleteById(port);
+
         subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.DELETE_SERVICE, port));
+
+        pcapService.updateFilter(findAll());
     }
 
     public CtfService save(CtfService service) {
@@ -73,6 +78,7 @@ public class ServicesService {
 
         final CtfService saved = repository.save(service);
         services.put(saved.getPort(), saved);
+
         subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_SERVICE, saved));
 
         pcapService.updateFilter(findAll());