misc: small fix or general refactoring i did not bother commenting

This commit is contained in:
evilsocket 2018-04-05 16:37:51 +02:00
parent 50e8be10f3
commit aa63a47bc1
Failed to generate hash of commit
12 changed files with 12 additions and 6 deletions

View file

@ -1,7 +1,7 @@
all: protocol daemon/daemon all: protocol daemon/daemon
protocol: protocol:
@cd ui.proto && make @cd proto && make
daemon/daemon: daemon/daemon:
@cd daemon && make @cd daemon && make
@ -9,7 +9,7 @@ daemon/daemon:
clean: clean:
@rm -rf rules @rm -rf rules
@cd daemon && make clean @cd daemon && make clean
@cd ui.proto && make clean @cd proto && make clean
test: test:
clear clear

View file

@ -8,7 +8,7 @@ import (
"github.com/evilsocket/opensnitch/daemon/log" "github.com/evilsocket/opensnitch/daemon/log"
"github.com/evilsocket/opensnitch/daemon/netstat" "github.com/evilsocket/opensnitch/daemon/netstat"
"github.com/evilsocket/opensnitch/daemon/procmon" "github.com/evilsocket/opensnitch/daemon/procmon"
protocol "github.com/evilsocket/opensnitch/ui.proto" protocol "github.com/evilsocket/opensnitch/proto"
"github.com/evilsocket/go-netfilter-queue" "github.com/evilsocket/go-netfilter-queue"

View file

@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/evilsocket/opensnitch/daemon/conman" "github.com/evilsocket/opensnitch/daemon/conman"
protocol "github.com/evilsocket/opensnitch/ui.proto" protocol "github.com/evilsocket/opensnitch/proto"
) )
type OperandType string type OperandType string

View file

@ -10,7 +10,7 @@ import (
"github.com/evilsocket/opensnitch/daemon/log" "github.com/evilsocket/opensnitch/daemon/log"
"github.com/evilsocket/opensnitch/daemon/rule" "github.com/evilsocket/opensnitch/daemon/rule"
protocol "github.com/evilsocket/opensnitch/ui.proto" protocol "github.com/evilsocket/opensnitch/proto"
"golang.org/x/net/context" "golang.org/x/net/context"

View file

@ -7,7 +7,7 @@ import argparse
path = os.path.abspath(os.path.dirname(__file__)) path = os.path.abspath(os.path.dirname(__file__))
sys.path.append(path) sys.path.append(path)
sys.path.append(path + "/../ui.proto/") sys.path.append(path + "/../proto/")
import grpc import grpc
from concurrent import futures from concurrent import futures

6
ui/requirements.txt Normal file
View file

@ -0,0 +1,6 @@
grpcio==1.10.0
pyinotify==0.9.6
PyQt5==5.10.1
futures==3.2.0
grpc==0.3-19
unicode_slugify==0.1.3