From a33950da621e3a46e8ca377e7372bd20b45693fb Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 27 May 2023 23:26:57 +0000
Subject: [PATCH] sane-scripts: UPnP retrieves LAN IP from the gateway

---
 .../lib/__pycache__/sane_ssdp.cpython-310.pyc | Bin 4317 -> 4065 bytes
 .../sane-scripts/src/lib/sane_ssdp.py         |  40 +++++++++---------
 .../sane-scripts/src/sane-ip-check-upnp       |   2 +-
 .../sane-scripts/src/sane-ip-port-forward     |   4 +-
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/pkgs/additional/sane-scripts/src/lib/__pycache__/sane_ssdp.cpython-310.pyc b/pkgs/additional/sane-scripts/src/lib/__pycache__/sane_ssdp.cpython-310.pyc
index fd3b52ceb3a0321bc94133994c21ddb7f2d278c3..c23950ab281431727442b91e416cdd71c535cccb 100644
GIT binary patch
delta 1033
zcmY+D-D(p-6vt;~H~ZDiCfYVeZR;wc4YnYnBH~AC>sOIdtsn+%8Zw(0On1}SNef|?
ziqQusdl?GJg}0(_AovywUicE;X+5)+f&=F_|2Z>f_RN{tA7_7_$p+c1g`oL+jDFe6
zPUH7`m)1)K>Ub8-f#tm{JqG=8uyHTju;~Py{E(?Q6tAJuiLc)}hGRm!4z>su{)+FI
z8@pztQZvd>n`S>Cp$tuGjPMfbgT1~PY1D~ynu`pf4K1OMFnc95J|^@&rshX-5)JJU
ziZWaosx&V$14NGrG(h|62xFASz;0|ijWPa<QPY^?=Y;xy(AF)XicEt*&f`61xvm=@
zn9oj2;WCeRnIF2d?V3O5?$rEJI{(xf$CcQ#K25C2a}mG<>Xn)vueLg2JTrFVdf`b>
zueIGL3oCA`<JKr;UKqMJdsZ{x?hEkVc6*xJV8N#Q&nH*jj<?4)7ELw{8zxG9lO_s;
zC0fX9yc;G8WRWP41)GEg6&qAF^nBj(y>`Wh$)iz>?a5t8r7AyAZ9^)&75ED>*;#<C
zJJ`ZStYVwwu}aibtKgf!g+r2e24-bgTn9U93MdsUz0WHkIO-#~xbX;aEZ`DfkqAdb
zU{<&$2rCFAupkYEAdJ?~mXbaV(px>OEEM)Ix4E=bk5}W*c6qW48<&){4D1eQb{7!;
zv8SfiL4-EIA~rU#gULJfH<Jfr#rV5(z9_5E>LeQTYGL3f2JN!+?D2tfYUMesqnHwb
zs3KIV3WXy<`uHD(>@$7b9E&uLhlFN?HX!>%zAX86gf_y%3<X9y%xm#h?((kA&dHBo
zl$e*e3aHriH(vd1HR$qAm$NzPmvt{0OcstUN!*usAn{P*5g<`(tQoQ!a;zOe{y&M`
z2-r@I(P}4P+yhTo1dw<pU%a>sszjJ{uzOPH61^QXn=QY|E=Xrd;%fXdKc6p4DeILe
gEuXXHc#ywvssLky7*J3HTSQeHVicSiV|rHq3-m?ru>b%7

delta 1309
zcmZ8g-ESL35Z~GR@cHaJJH-i3)rO-AB_~LfAQe(RN-G-r0g8Zt1Qyga-iv#RbLZ}@
z0a<57!r_4zM09UdmFx!|`bZ!7GkD`99{4X%D?Vl}4M^;2e!DlbH#0l)+uxu0?O7*w
z9Gl_z_B$ya964v<`=b|by;2SAT`nBq9_lSeG(|nI#T?41z!gv7+Q4-l&s4>Nc>2(2
z)dcJ?fAOb>1IsO;H<GtdlAp8n^6gGlIEO6Nre$Hx;3}J-e0FZE3wLa!`qWO18OT<u
zt4eB2K$O4Xi)>n*v9YPNsV-`%d5?*D%I>lI`V4@jCTGBQ*xgN0#;|jvoovJYpyB1l
za1af;kNE0v#8;CKeaN$i_K%Hi%7h~{*vRh%s{Lgr%JwRoUb7b~Z|f@+$f(o5@!l07
zWRN7@8{WwDc4fSu{aU$wP?Bfy*IeuFi(Er{ZYHXuhKZa<b<0YENQF_*Z}D&-O;jBN
zRUn^#60A+m+WolOQDGciK~u7XP}N<qp$R%vc^#Tu$FBw~fCc<d{V(|@9_g}A5Kji(
zK|?7@yMi0VCJbxoj+ufK>pF%M<Xp;9*yT@Zq!q2<qwAgw)KEs=%1IvCmUFpIL400Z
zv87R6esInle1yuRiePh#vIG7%=5rYplE~6U`F8;Bbd(~e>$p*D3IYW0@fl3H&=9p5
z!#-l~#!MK(L@r>~m@QKVWi3j3Jn?R#b^>4HJr0Dmi0$>u+qrcoPE^#{53r%3d=A||
z0<TLkPX^V*K-ob_mJxdB2P=Y=m@>g;khsMTkYhZBBYu~oYd+F8*4IYX#>JP`HeTLb
z^Fh9f|6(N^#tv8x;s1ImYiPbjF(}|N8!b_9`<<vA4%S|$lJ=8JxCs;0jrRwa<QyK8
zl&EjY3%KOf?wz2!*N%s3FjVqIGE<4=DT3D!d}wLmAdzNaE2vbk$o?<Vr+6%}5SGA2
zs#qYmvR|C#rVKhs9Oaf6%7S9Kd7N41x~D&;tW#s46IsRvwI*dkOEsaV2GWL4;22X{
z^$GMU`0)5t69zs!ejnQiOzBhn!d99Baa=-sDf_}*f8UZ@=w6;9c%ERDfG#Yr5)^kK
zs`{3^Mhc>cyg_i2;2nZ@5pumFdx^Z5J$AiopQ9o<jbH=EXF=1%$x-w_>XkaUT+*w?
ze!Y#$wqMUn{kYc)qn<pE3h5JE$V6>*o)~`2UCK1q!br*OY*sseritGcGMuK(b<O40
Mg1clj+|r8q4<yMLqyPW_

diff --git a/pkgs/additional/sane-scripts/src/lib/sane_ssdp.py b/pkgs/additional/sane-scripts/src/lib/sane_ssdp.py
index 6633cc03..e076e3b3 100644
--- a/pkgs/additional/sane-scripts/src/lib/sane_ssdp.py
+++ b/pkgs/additional/sane-scripts/src/lib/sane_ssdp.py
@@ -62,8 +62,11 @@ def get_root_devices():
                     logger.info(f"root desc: {root_desc}")
                     yield root_desc
 
-def get_wan_from_location(location: str):
-    """ location = URI from the Location header, e.g. http://10.78.79.1:2189/rootDesc.xml """
+def get_ips_from_location(location: str):
+    """
+    location = URI from the Location header, e.g. http://10.78.79.1:2189/rootDesc.xml
+    returns (lan, wan)
+    """
 
     # get connection [s]tatus
     cmd = ["upnpc", "-u", location, "-s"]
@@ -75,28 +78,27 @@ def get_wan_from_location(location: str):
     status = res.stdout.decode("utf-8")
     logger.debug(f"got status: {status}")
 
+    lan = None
+    wan = None
     for line in [l.strip() for l in status.split("\n")]:
-        sentinel = "ExternalIPAddress ="
-        if line.startswith(sentinel):
-            ip = line[len(sentinel):].strip()
-            logger.info(f"got ExternalIPAddress = {ip} from {location}")
-            return ip
+        wan_sentinel = "ExternalIPAddress ="
+        lan_sentinel = "Local LAN ip address :"
+        if line.startswith(wan_sentinel):
+            wan = line[len(wan_sentinel):].strip()
+            logger.info(f"got WAN = {wan} from {location}")
+        if line.startswith(lan_sentinel):
+            lan = line[len(lan_sentinel):].strip()
+            logger.info(f"got LAN = {lan} from {location}")
+    return lan, wan
 
 def get_any_wan():
-    """ return (location, WAN IP) for the first device seen which has a WAN IP """
+    """ return (location, LAN IP, WAN IP) for the first device seen which has a WAN IP """
     for location in get_root_devices():
-        wan = get_wan_from_location(location)
-        if wan:
-            return location, wan
+        lan, wan = get_ips_from_location(location)
+        if lan and wan:
+            return location, lan, wan
 
-def get_lan_ip() -> str:
-    ips = subprocess.check_output(["hostname", "-i"]).decode("utf-8").strip().split(" ")
-    ips = [i for i in ips if i.startswith("10.") or i.startswith("192.168.")]
-    assert len(ips) == 1, ips
-    return ips[0]
-
-def forward_port(root_device: str, proto: str, port: int, reason: str, duration: int = 86400, lan_ip: str = None):
-    lan_ip = lan_ip or get_lan_ip()
+def forward_port(root_device: str, proto: str, port: int, lan_ip: str, reason: str = "", duration: int = 86400):
     args = [
         "upnpc",
         "-u", root_device,
diff --git a/pkgs/additional/sane-scripts/src/sane-ip-check-upnp b/pkgs/additional/sane-scripts/src/sane-ip-check-upnp
index 5056ee9c..1a25ec4b 100755
--- a/pkgs/additional/sane-scripts/src/sane-ip-check-upnp
+++ b/pkgs/additional/sane-scripts/src/sane-ip-check-upnp
@@ -23,5 +23,5 @@ if __name__ == '__main__':
             logging.getLogger().setLevel(logging.DEBUG)
         else:
             raise RuntimeError(f"invalid CLI argument {arg!r}")
-    _rootdev, wan_ip = get_any_wan()
+    _rootdev, _lan_ip, wan_ip = get_any_wan()
     print(wan_ip)
diff --git a/pkgs/additional/sane-scripts/src/sane-ip-port-forward b/pkgs/additional/sane-scripts/src/sane-ip-port-forward
index b2bc2cf7..66eb5348 100755
--- a/pkgs/additional/sane-scripts/src/sane-ip-port-forward
+++ b/pkgs/additional/sane-scripts/src/sane-ip-port-forward
@@ -86,7 +86,7 @@ if __name__ == '__main__':
         print(e)
         sys.exit(1)
 
-    root_device, _wan = get_any_wan()
+    root_device, lan, _wan = get_any_wan()
     hostname = subprocess.check_output(["hostname"]).decode("utf-8").strip()
     for (proto, port) in forwards:
-        forward_port(root_device, proto, port, f"colin-{hostname}", duration=duration)
+        forward_port(root_device, proto, port, lan_ip=lan, reason=f"colin-{hostname}", duration=duration)