From 90538a89dd2283d37112dc1303d82c885eb32d00 Mon Sep 17 00:00:00 2001
From: DomySh <me@domysh.com>
Date: Thu, 11 Aug 2022 15:53:33 +0000
Subject: [PATCH] port-hijacking backend tested and fixed

---
 backend/modules/porthijack/firewall.py | 11 ++++++-----
 backend/modules/porthijack/models.py   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/modules/porthijack/firewall.py b/backend/modules/porthijack/firewall.py
index bafa096..f71f560 100644
--- a/backend/modules/porthijack/firewall.py
+++ b/backend/modules/porthijack/firewall.py
@@ -51,16 +51,17 @@ class ServiceManager:
         self.active = False
         self.lock = asyncio.Lock()
 
-    async def enable(self,to):
-        if (self.status != to):
+    async def enable(self):
+        if not self.active:
             async with self.lock:
                 await self.restart()
+                self._set_status(True)
                 
-    async def disable(self,to):
-        if (self.status != to):
+    async def disable(self):
+        if self.active:
             async with self.lock:
                 await self.stop()
-                self._set_status(to)
+                self._set_status(False)
 
     def _set_status(self,active):
         self.active = active
diff --git a/backend/modules/porthijack/models.py b/backend/modules/porthijack/models.py
index 4e2a1d3..ff39882 100644
--- a/backend/modules/porthijack/models.py
+++ b/backend/modules/porthijack/models.py
@@ -10,4 +10,4 @@ class Service:
     
     @classmethod
     def from_dict(cls, var: dict):
-        return cls(id=var["service_id"], active=var["active"], public_port=var["public_port"], proxy_port=var["proxy_port"], name=var["name"], proto=var["proto"], ip_int=var["ip_int"])
+        return cls(service_id=var["service_id"], active=var["active"], public_port=var["public_port"], proxy_port=var["proxy_port"], name=var["name"], proto=var["proto"], ip_int=var["ip_int"])