will.anderson/infrastructure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tx34 portforward-helper NATPMP: use single-line Python

Browse Source 
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.
This commit is contained in:
Will Anderson
2026-04-15 02:28:39 -05:00
parent c88f7022c6
commit de94ca216a
1 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/legion/k8s/media/fornax-workers.yaml
+8 -30
View File
@@ -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)