diff --git a/run/install.sh b/run/install.sh index bff57ec6..df9eaa6d 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 diff --git a/run/network.sh b/run/network.sh index 8056dbf5..8e263483 100644 --- a/run/network.sh +++ b/run/network.sh @@ -199,9 +199,8 @@ 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 80 /run/ip.sh & /run/server.sh 5000 /run/ip.sh & else diff --git a/run/server.sh b/run/server.sh index 045d3d50..c5929147 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 -else - - if [[ "$2" != "/run/ip.sh" ]]; then - - cp "$2" "$TMP_FILE" - - else +if [[ "$2" != "/run/ip.sh" ]]; then - BODY="The location of DSM is http://\${IP}:\${PORT}" - WAIT="Please wait while discovering IP..." + cp "$2" "$TMP_FILE" - HTML=$(html "xxx") +else - { 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" + BODY="The location of DSM is http://\${IP}:\${PORT}" + WAIT="Please wait while discovering IP..." - fi + HTML=$(html "xxx") - 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 $!