Version 2.3.8

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>

builder/data/etc/systemd/system/bettercap.service

@@ -5,7 +5,6 @@ Wants=network.target
 
 [Service]
 Type=simple
-PermissionsStartOnly=true
 ExecStart=/usr/bin/bettercap-launcher
 Restart=always
 RestartSec=30

builder/data/etc/systemd/system/pwnagotchi.service

@@ -7,7 +7,6 @@ After=pwngrid-peer.service
 [Service]
 Type=simple
 WorkingDirectory=/tmp
-PermissionsStartOnly=true
 ExecStart=/usr/bin/pwnagotchi-launcher
 Restart=always
 RestartSec=30

builder/data/etc/systemd/system/pwngrid-peer.service

@@ -6,7 +6,6 @@ After=bettercap.service
 
 [Service]
 Type=simple
-PermissionsStartOnly=true
 ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /var/log/pwngrid-peer.log -iface wlan0mon
 Restart=always
 RestartSec=30

pwnagotchi/bettercap.py

@@ -40,12 +40,9 @@ class Client(object):
 
     async def start_websocket(self, consumer):
         s = "%s/events" % self.websocket
-        async with websockets.connect(s, ping_interval=60, ping_timeout=90) as ws:
-            # After the websocket connection is opened, loop waiting for messages
-            # Moved the websocket connection before the loop to avoid runaway websocket
-            # connections that were exhausting all possible TCP ports (ephemeral port exhaustion)
         while True:
             try:
+                async with websockets.connect(s, ping_interval=60, ping_timeout=90) as ws:
                     async for msg in ws:
                         try:
                             await consumer(msg)