twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-02-24 13:30:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace netcat with socat

Browse Source 
Replace netcat with socat
This commit is contained in:
Kroese 2023-05-09 00:58:40 +02:00 committed by GitHub
commit b0840002ff
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -20,15 +20,15 @@ RUN apt-get update && apt-get -y upgrade && \
fdisk \ fdisk \
unzip \ unzip \
procps \ procps \
dnsmasq \
xz-utils \ xz-utils \
iptables \ iptables \
iproute2 \ iproute2 \
dnsmasq \
net-tools \ net-tools \
btrfs-progs \ btrfs-progs \
netcat-openbsd \
ca-certificates \ ca-certificates \
qemu-system-x86 \ qemu-system-x86 \
netcat-traditional \
&& apt-get clean && apt-get clean
COPY run/*.sh /run/ COPY run/*.sh /run/

2
run/network.sh
View File

@ -238,7 +238,7 @@ if [[ "${DHCP}" == [Yy1]* ]]; then
echo "setTimeout(function(){ window.location.assign('http://\${IP}:\${PORT}'); }, 3000);</script>\"" echo "setTimeout(function(){ window.location.assign('http://\${IP}:\${PORT}'); }, 3000);</script>\""
echo "HTML=\"<!DOCTYPE html><HTML><HEAD><TITLE>VirtualDSM</TITLE><STYLE>body { color: white; background-color: #125bdb; font-family: Verdana,\\" echo "HTML=\"<!DOCTYPE html><HTML><HEAD><TITLE>VirtualDSM</TITLE><STYLE>body { color: white; background-color: #125bdb; font-family: Verdana,\\"
echo "Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }</STYLE></HEAD><BODY><BR><BR><H1><CENTER>\$BODY</CENTER></H1></BODY></HTML>\"" echo "Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }</STYLE></HEAD><BODY><BR><BR><H1><CENTER>\$BODY</CENTER></H1></BODY></HTML>\""
echo "LENGTH=\"\${#HTML}\"; RESPONSE=\"HTTP/1.1 200 OK\\nContent-Length: \${LENGTH}\\nConnection: close\\n\\n\$HTML\\n\\n\"" echo "LENGTH=\"\${#HTML}\"; RESPONSE=\"HTTP/1.1 200 OK\\nContent-Length: \${LENGTH}\\nConnection: close\\n\\n\$HTML\""
echo "echo -e \"\$RESPONSE\"" echo "echo -e \"\$RESPONSE\""
} > "$SH_SCRIPT" } > "$SH_SCRIPT"

16
run/server.sh
View File

@ -1,18 +1,19 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu set -eu
TMP_FILE=""
stop() { stop() {
trap - SIGINT EXIT trap - SIGINT EXIT
{ pkill -f nc || true; } 2>/dev/null { pkill -f socat || true; } 2>/dev/null
[ -f "$TMP_FILE" ] && rm -f "$TMP_FILE"
} }
trap 'stop' EXIT SIGINT SIGTERM SIGHUP trap 'stop' EXIT SIGINT SIGTERM SIGHUP
if [[ "$2" == "/"* ]]; then if [[ "$2" == "/"* ]]; then
while true ; do socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"$2" 2> /dev/null & wait $!
nc -lp "${1:-5000}" -e "$2" & wait $!
done
else else
@ -20,10 +21,9 @@ else
Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }</STYLE></HEAD><BODY><BR><BR><H1><CENTER>$2</CENTER></H1></BODY></HTML>" Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }</STYLE></HEAD><BODY><BR><BR><H1><CENTER>$2</CENTER></H1></BODY></HTML>"
LENGTH="${#HTML}" LENGTH="${#HTML}"
RESPONSE="HTTP/1.1 200 OK\nContent-Length: ${LENGTH}\nConnection: close\n\n$HTML\n\n" TMP_FILE=$(mktemp -q /tmp/server.XXXXXX)
while true; do echo -en "HTTP/1.1 200 OK\nContent-Length: ${LENGTH}\nConnection: close\n\n$HTML" > "$TMP_FILE"
echo -en "$RESPONSE" | nc -lp "${1:-5000}" & wait $! socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"cat ${TMP_FILE}" 2> /dev/null & wait $!
done
fi fi