From 34ded91c1281beda2917f3ca9389c3ab3b92d069 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 11 May 2023 20:22:27 +0200
Subject: [PATCH 1/4] Always listen on port 80

---
 run/server.sh | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/run/server.sh b/run/server.sh
index 045d3d5..c592914 100644
--- a/run/server.sh
+++ b/run/server.sh
@@ -33,33 +33,36 @@ if [[ "$2" != "/"* ]]; then
   HTML=$(html "$BODY")
   printf '%b' "HTTP/1.1 200 OK\nContent-Length: ${#HTML}\nConnection: close\n\n$HTML" > "$TMP_FILE"
 
+  socat TCP4-LISTEN:80,reuseaddr,fork,crlf SYSTEM:"cat ${TMP_FILE}" 2> /dev/null &
   socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"cat ${TMP_FILE}" 2> /dev/null & wait $!
+  
+  exit
+  
+fi
+
+if [[ "$2" != "/run/ip.sh" ]]; then
+
+  cp "$2" "$TMP_FILE"
 
 else
 
-  if [[ "$2" != "/run/ip.sh" ]]; then
+  BODY="The location of DSM is <a href='http://\${IP}:\${PORT}'>http://\${IP}:\${PORT}</a><script>"
+  BODY="${BODY}setTimeout(function(){ window.location.assign('http://\${IP}:\${PORT}'); }, 3000);</script>"
+  WAIT="Please wait while discovering IP...<script>setTimeout(() => { document.location.reload(); }, 4999);</script>"
 
-    cp "$2" "$TMP_FILE"
+  HTML=$(html "xxx")
 
-  else
-
-     BODY="The location of DSM is <a href='http://\${IP}:\${PORT}'>http://\${IP}:\${PORT}</a><script>"
-     BODY="${BODY}setTimeout(function(){ window.location.assign('http://\${IP}:\${PORT}'); }, 3000);</script>"
-     WAIT="Please wait while discovering IP...<script>setTimeout(() => { document.location.reload(); }, 4999);</script>"
-
-     HTML=$(html "xxx")
-
-    { echo "#!/bin/bash"
-      echo "INFO=\$(curl -s -m 2 -S http://127.0.0.1:2210/read?command=10 2>/dev/null)"
-      echo "rest=\${INFO#*http_port}; rest=\${rest#*:}; rest=\${rest%%,*}; PORT=\${rest%%\\\"*}"
-      echo "rest=\${INFO#*eth0}; rest=\${rest#*ip}; rest=\${rest#*:}; rest=\${rest#*\\\"}; IP=\${rest%%\\\"*}"
-      echo "HTML=\"$HTML\"; [ -z \"\${IP}\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
-      echo "printf '%b' \"HTTP/1.1 200 OK\\nContent-Length: \${#HTML}\\nConnection: close\\n\\n\$HTML\""
-    } > "$TMP_FILE"
-
-  fi
-
-  chmod +x "$TMP_FILE"
-  socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null & wait $!
+  { echo "#!/bin/bash"
+    echo "INFO=\$(curl -s -m 2 -S http://127.0.0.1:2210/read?command=10 2>/dev/null)"
+    echo "rest=\${INFO#*http_port}; rest=\${rest#*:}; rest=\${rest%%,*}; PORT=\${rest%%\\\"*}"
+    echo "rest=\${INFO#*eth0}; rest=\${rest#*ip}; rest=\${rest#*:}; rest=\${rest#*\\\"}; IP=\${rest%%\\\"*}"
+    echo "HTML=\"$HTML\"; [ -z \"\${IP}\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
+    echo "printf '%b' \"HTTP/1.1 200 OK\\nContent-Length: \${#HTML}\\nConnection: close\\n\\n\$HTML\""
+  } > "$TMP_FILE"
 
 fi
+
+chmod +x "$TMP_FILE"
+  
+socat TCP4-LISTEN:80,reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null &
+socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null & wait $!

From 64b71b328b88d328981f5769392905a8a1e0e27a Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 11 May 2023 20:23:24 +0200
Subject: [PATCH 2/4] Socat listener

---
 run/install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/run/install.sh b/run/install.sh
index bff57ec..df9eaa6 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -2,7 +2,6 @@
 set -Eeuo pipefail
 
 # Display wait message
-/run/server.sh 80 install &
 /run/server.sh 5000 install &
 
 # Download the required files from the Synology website

From edc25e63e58200f421a94559878dd686580c52d2 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 11 May 2023 20:23:56 +0200
Subject: [PATCH 3/4] Socat listener

---
 run/network.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/run/network.sh b/run/network.sh
index 8056dbf..193bec4 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -200,8 +200,6 @@ if [[ "${DHCP}" == [Yy1]* ]]; then
   configureDHCP
 
   { pkill -f server.sh || true; } 2>/dev/null
-
-  /run/server.sh 80 /run/ip.sh &
   /run/server.sh 5000 /run/ip.sh &
 
 else

From 570cac495bd0a6aea055ba4ea93fb0064b1aea30 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 11 May 2023 20:25:01 +0200
Subject: [PATCH 4/4] Socat listener

---
 run/network.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/run/network.sh b/run/network.sh
index 193bec4..8e26348 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -199,6 +199,7 @@ if [[ "${DHCP}" == [Yy1]* ]]; then
   # Configuration for DHCP IP
   configureDHCP
 
+  # Display IP on port 80 and 5000
   { pkill -f server.sh || true; } 2>/dev/null
   /run/server.sh 5000 /run/ip.sh &