From f9fec3ed68ec9981ca9e21f923d2169065bd15da Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 9 May 2023 18:32:26 +0100 Subject: [PATCH] Trying to get callinthread correct --- hotspot_proxy_v2.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hotspot_proxy_v2.py b/hotspot_proxy_v2.py index 4d60645..be865e9 100644 --- a/hotspot_proxy_v2.py +++ b/hotspot_proxy_v2.py @@ -55,17 +55,17 @@ class privHelper(): self._netfilterURI = 'PYRO:netfilterControl@./u:/run/priv_control/priv_control.unixsocket' self._conntrackURI = 'PYRO:conntrackControl@./u:/run/priv_control/priv_control.unixsocket' - def addBL(self,ip): + def addBL(self,ip,dport): try: with Pyro5.api.Proxy(self._netfilterURI) as nf: - nf.blocklistAdd(False,ip) + nf.blocklistAdd(dport,ip) except Exception as e: print('(PrivError) {}'.format(e)) - def delBL(self,ip): + def delBL(self,ip,dport): try: with Pyro5.api.Proxy(self._netfilterURI) as nf: - nf.blocklistDel(False,ip) + nf.blocklistDel(dport,ip) except Exception as e: print('(PrivError) {}'.format(e)) @@ -83,6 +83,7 @@ class Proxy(DatagramProtocol): def __init__(self,Master,ListenPort,connTrack,peerTrack,blackList,IPBlackList,Timeout,Debug,ClientInfo,DestportStart,DestPortEnd,privHelper): self.master = Master + self.ListenPort = ListenPort self.connTrack = connTrack self.peerTrack = peerTrack self.timeout = Timeout @@ -165,7 +166,7 @@ class Proxy(DatagramProtocol): print('Add to blacklist: host {}. Expire time {}'.format(self.peerTrack[_peer_id]['shost'],_bltime)) if self.privHelper: print('Ask priv_helper to add to iptables: host {}.'.format(self.peerTrack[_peer_id]['shost'])) - reactor.callInThread(self.privHelper.addBL(self.peerTrack[_peer_id]['shost'])) + reactor.callInThread(self.privHelper.addBL,self.privHelper,self.ListenPort,self.peerTrack[_peer_id]['shost']) return if _command == DMRD: