From de94ca216a8a105da7fcd76cf4787753c73ed27f Mon Sep 17 00:00:00 2001 From: Will Anderson Date: Wed, 15 Apr 2026 02:28:39 -0500 Subject: [PATCH] Fix tx34 portforward-helper NATPMP: use single-line Python Multiline NATPMP variable in tx34 had column-0 lines that broke Go's YAML parser (same bug that was fixed in tx253). Replace with identical single-line python3 -c approach. --- servers/legion/k8s/media/fornax-workers.yaml | 38 +++++--------------- 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/servers/legion/k8s/media/fornax-workers.yaml b/servers/legion/k8s/media/fornax-workers.yaml index d5efb7c..4174023 100644 --- a/servers/legion/k8s/media/fornax-workers.yaml +++ b/servers/legion/k8s/media/fornax-workers.yaml @@ -149,22 +149,10 @@ spec: # Install curl and python3 for NAT-PMP port forwarding until apk add -q curl python3 2>/dev/null; do sleep 5; done - # NAT-PMP: request TCP port mapping from ProtonVPN gateway 10.2.0.1 UDP:5351 - # opcode=2 (TCP map), internal=0, external=0 (any), lifetime=7776000s - NATPMP='import socket,struct -s=socket.socket(socket.AF_INET,socket.SOCK_DGRAM) -s.settimeout(5) -try: - s.sendto(struct.pack("!BBHHHI",0,2,0,0,0,7776000),("10.2.0.1",5351)) - d,_=s.recvfrom(256) - r=struct.unpack("!BBHIHHH",d[:16]) if len(d)>=16 else None - print(r[5] if r and r[2]==0 else 0) -except: - print(0) -finally: - s.close()' - - get_natpmp_port() { python3 -c "$NATPMP"; } + # NAT-PMP: single-line Python to request TCP port mapping from ProtonVPN gateway + get_natpmp_port() { + python3 -c "import socket,struct;s=socket.socket(2,2);s.settimeout(5);s.sendto(struct.pack('!BBHHHI',0,2,0,0,0,7776000),('10.2.0.1',5351));d=s.recvfrom(256)[0];r=struct.unpack('!BBHIHHH',d[:16]) if len(d)>=16 else None;print(r[5] if r and r[2]==0 else 0)" 2>/dev/null || echo 0 + } echo "Requesting port via NAT-PMP..." PORT=$(get_natpmp_port) @@ -403,20 +391,10 @@ spec: until apk add -q curl python3 2>/dev/null; do sleep 5; done - NATPMP='import socket,struct -s=socket.socket(socket.AF_INET,socket.SOCK_DGRAM) -s.settimeout(5) -try: - s.sendto(struct.pack("!BBHHHI",0,2,0,0,0,7776000),("10.2.0.1",5351)) - d,_=s.recvfrom(256) - r=struct.unpack("!BBHIHHH",d[:16]) if len(d)>=16 else None - print(r[5] if r and r[2]==0 else 0) -except: - print(0) -finally: - s.close()' - - get_natpmp_port() { python3 -c "$NATPMP"; } + # NAT-PMP: single-line Python to request TCP port mapping from ProtonVPN gateway + get_natpmp_port() { + python3 -c "import socket,struct;s=socket.socket(2,2);s.settimeout(5);s.sendto(struct.pack('!BBHHHI',0,2,0,0,0,7776000),('10.2.0.1',5351));d=s.recvfrom(256)[0];r=struct.unpack('!BBHIHHH',d[:16]) if len(d)>=16 else None;print(r[5] if r and r[2]==0 else 0)" 2>/dev/null || echo 0 + } echo "Requesting port via NAT-PMP..." PORT=$(get_natpmp_port)