From aa63a47bc190dfebd7c4fa82183d92c280ac2f2d Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Thu, 5 Apr 2018 16:37:51 +0200
Subject: [PATCH] misc: small fix or general refactoring i did not bother
 commenting

---
 Makefile                           | 4 ++--
 daemon/conman/connection.go        | 2 +-
 daemon/rule/rule.go                | 2 +-
 daemon/ui/client.go                | 2 +-
 {ui.proto => proto}/.gitignore     | 0
 {ui.proto => proto}/Makefile       | 0
 {ui.proto => proto}/ui.pb.go       | 0
 {ui.proto => proto}/ui.proto       | 0
 {ui.proto => proto}/ui_pb2.py      | 0
 {ui.proto => proto}/ui_pb2_grpc.py | 0
 ui/main.py                         | 2 +-
 ui/requirements.txt                | 6 ++++++
 12 files changed, 12 insertions(+), 6 deletions(-)
 rename {ui.proto => proto}/.gitignore (100%)
 rename {ui.proto => proto}/Makefile (100%)
 rename {ui.proto => proto}/ui.pb.go (100%)
 rename {ui.proto => proto}/ui.proto (100%)
 rename {ui.proto => proto}/ui_pb2.py (100%)
 rename {ui.proto => proto}/ui_pb2_grpc.py (100%)
 create mode 100644 ui/requirements.txt

diff --git a/Makefile b/Makefile
index afdb7c9a..84554290 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: protocol daemon/daemon
 
 protocol:
-	@cd ui.proto && make
+	@cd proto && make
 
 daemon/daemon:
 	@cd daemon && make
@@ -9,7 +9,7 @@ daemon/daemon:
 clean:
 	@rm -rf rules
 	@cd daemon && make clean
-	@cd ui.proto && make clean
+	@cd proto && make clean
 
 test:
 	clear 
diff --git a/daemon/conman/connection.go b/daemon/conman/connection.go
index 778d3e5c..2859feee 100644
--- a/daemon/conman/connection.go
+++ b/daemon/conman/connection.go
@@ -8,7 +8,7 @@ import (
 	"github.com/evilsocket/opensnitch/daemon/log"
 	"github.com/evilsocket/opensnitch/daemon/netstat"
 	"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"
 
diff --git a/daemon/rule/rule.go b/daemon/rule/rule.go
index b64487d4..ae583f9d 100644
--- a/daemon/rule/rule.go
+++ b/daemon/rule/rule.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/evilsocket/opensnitch/daemon/conman"
-	protocol "github.com/evilsocket/opensnitch/ui.proto"
+	protocol "github.com/evilsocket/opensnitch/proto"
 )
 
 type OperandType string
diff --git a/daemon/ui/client.go b/daemon/ui/client.go
index b5068a92..ac964ce6 100644
--- a/daemon/ui/client.go
+++ b/daemon/ui/client.go
@@ -10,7 +10,7 @@ import (
 	"github.com/evilsocket/opensnitch/daemon/log"
 	"github.com/evilsocket/opensnitch/daemon/rule"
 
-	protocol "github.com/evilsocket/opensnitch/ui.proto"
+	protocol "github.com/evilsocket/opensnitch/proto"
 
 	"golang.org/x/net/context"
 
diff --git a/ui.proto/.gitignore b/proto/.gitignore
similarity index 100%
rename from ui.proto/.gitignore
rename to proto/.gitignore
diff --git a/ui.proto/Makefile b/proto/Makefile
similarity index 100%
rename from ui.proto/Makefile
rename to proto/Makefile
diff --git a/ui.proto/ui.pb.go b/proto/ui.pb.go
similarity index 100%
rename from ui.proto/ui.pb.go
rename to proto/ui.pb.go
diff --git a/ui.proto/ui.proto b/proto/ui.proto
similarity index 100%
rename from ui.proto/ui.proto
rename to proto/ui.proto
diff --git a/ui.proto/ui_pb2.py b/proto/ui_pb2.py
similarity index 100%
rename from ui.proto/ui_pb2.py
rename to proto/ui_pb2.py
diff --git a/ui.proto/ui_pb2_grpc.py b/proto/ui_pb2_grpc.py
similarity index 100%
rename from ui.proto/ui_pb2_grpc.py
rename to proto/ui_pb2_grpc.py
diff --git a/ui/main.py b/ui/main.py
index bf1822e6..b4b42fbd 100644
--- a/ui/main.py
+++ b/ui/main.py
@@ -7,7 +7,7 @@ import argparse
 
 path = os.path.abspath(os.path.dirname(__file__))
 sys.path.append(path)
-sys.path.append(path + "/../ui.proto/")
+sys.path.append(path + "/../proto/")
 
 import grpc
 from concurrent import futures
diff --git a/ui/requirements.txt b/ui/requirements.txt
new file mode 100644
index 00000000..135d76ac
--- /dev/null
+++ b/ui/requirements.txt
@@ -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