0xb00b5/firegex-traffic-viewer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User-Space thread balancing + refactoring

Browse Source
This commit is contained in:
Domingo Dirutigliano
2025-02-16 16:33:34 +01:00
parent 63e7f73139
commit 7f7e3353ec
22 changed files with 805 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/modules/nfproxy/firegex.py
View File

@@ -57,9 +57,9 @@ class FiregexInterceptor:
self.process.kill()
raise Exception("Invalid binary output")
line = line_fut.decode()
if line.startswith("QUEUES "):
if line.startswith("QUEUE "):
params = line.split()
return (int(params[1]), int(params[2]))
return (int(params[1]), int(params[1]))
else:
self.process.kill()
raise Exception("Invalid binary output")

2
backend/modules/nfproxy/nftables.py
View File

@@ -62,6 +62,7 @@ class FiregexTables(NFTableManager):
"expr": [
{'match': {'left': {'payload': {'protocol': ip_family(srv.ip_int), 'field': 'saddr'}}, 'op': '==', 'right': nftables_int_to_json(srv.ip_int)}},
{'match': {"left": { "payload": {"protocol": str(srv.proto), "field": "sport"}}, "op": "==", "right": int(srv.port)}},
{"mangle": {"key": {"meta": {"key": "mark"}},"value": 0x1338}},
{"queue": {"num": str(init) if init == end else {"range":[init, end] }, "flags": ["bypass"]}}
]
}}},
@@ -72,6 +73,7 @@ class FiregexTables(NFTableManager):
"expr": [
{'match': {'left': {'payload': {'protocol': ip_family(srv.ip_int), 'field': 'daddr'}}, 'op': '==', 'right': nftables_int_to_json(srv.ip_int)}},
{'match': {"left": { "payload": {"protocol": str(srv.proto), "field": "dport"}}, "op": "==", "right": int(srv.port)}},
{"mangle": {"key": {"meta": {"key": "mark"}},"value": 0x1337}},
{"queue": {"num": str(init) if init == end else {"range":[init, end] }, "flags": ["bypass"]}}
]
}}}

6
backend/modules/nfregex/firegex.py
View File

@@ -84,7 +84,7 @@ class FiregexInterceptor:
return self
async def _start_binary(self):
proxy_binary_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),"../cppqueue")
proxy_binary_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),"../cppregex")
self.process = await asyncio.create_subprocess_exec(
proxy_binary_path,
stdout=asyncio.subprocess.PIPE, stdin=asyncio.subprocess.PIPE,
@@ -97,9 +97,9 @@ class FiregexInterceptor:
self.process.kill()
raise Exception("Invalid binary output")
line = line_fut.decode()
if line.startswith("QUEUES "):
if line.startswith("QUEUE "):
params = line.split()
return (int(params[1]), int(params[2]))
return (int(params[1]), int(params[1]))
else:
self.process.kill()
raise Exception("Invalid binary output")

6
backend/modules/nfregex/nftables.py
View File

@@ -48,10 +48,12 @@ class FiregexTables(NFTableManager):
def add(self, srv:Service, queue_range):
for ele in self.get():
if ele.__eq__(srv): return
if ele.__eq__(srv):
return
init, end = queue_range
if init > end: init, end = end, init
if init > end:
init, end = end, init
self.cmd(
{ "insert":{ "rule": {
"family": "inet",