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

feat: Fall back to slirp when passt fails (#1064)

Browse Source
This commit is contained in:
Kroese 2025-10-15 10:31:42 +02:00 committed by GitHub
parent ea49cb144b
commit c2fa58ef27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/network.sh
View File

@ -185,14 +185,12 @@ configureDNS() {
getHostPorts() { getHostPorts() {
local list="${HOST_PORTS:-}" local list=""
list=$(echo "${list// /}" | sed 's/,*$//g') list+="$MON_PORT,"
list="${list//,,/,}" list+="${HOST_PORTS// /},"
[ -z "$list" ] && list="$MON_PORT" || list+=",$MON_PORT"
# Remove duplicates # Remove duplicates
list=$(echo "$list," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g') list=$(echo "${list//,,/,}," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g')
echo "$list" echo "$list"
return 0 return 0
@ -200,33 +198,25 @@ getHostPorts() {
getUserPorts() { getUserPorts() {
local list="${USER_PORTS:-}"
list=$(echo "${list// /}" | sed 's/,*$//g')
local ssh="22" local ssh="22"
local dsm="5000,5001" local dsm="5000,5001"
[ -z "$list" ] && list="$ssh,$dsm" || list+=",$ssh,$dsm"
list="${list//,,/,}" local list="$ssh,$dsm,"
list="${list//,/ }" list+="${USER_PORTS// /},"
list="${list## }"
list="${list%% }"
local exclude local exclude
exclude=$(getHostPorts) exclude=$(getHostPorts)
exclude="${exclude//,/ }"
exclude="${exclude## }"
exclude="${exclude%% }"
local ports="" local ports=""
local userport=""
local hostport=""
for userport in $list; do for userport in ${list//,/ }; do
local num="${userport///tcp}" local num="${userport///tcp}"
num="${num///udp}" num="${num///udp}"
[ -z "$num" ] && continue
for hostport in $exclude; do for hostport in ${exclude//,/ }; do
local val="${hostport///tcp}" local val="${hostport///tcp}"
@ -237,14 +227,12 @@ getUserPorts() {
done done
if [ -n "$num" ]; then [ -n "$num" ] && ports+="$userport,"
[ -z "$ports" ] && ports="$userport" || ports+=",$userport"
fi
done done
# Remove duplicates # Remove duplicates
ports=$(echo "$ports," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g') ports=$(echo "${ports//,,/,}," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g')
echo "$ports" echo "$ports"
return 0 return 0
@ -256,14 +244,12 @@ getSlirp() {
local list="" local list=""
list=$(getUserPorts) list=$(getUserPorts)
list="${list//,/ }"
list="${list## }"
list="${list%% }"
for port in $list; do for port in ${list//,/ }; do
local proto="tcp" local proto="tcp"
local num="${port%/tcp}" local num="${port%/tcp}"
[ -z "$num" ] && continue
if [[ "$port" == *"/udp" ]]; then if [[ "$port" == *"/udp" ]]; then
proto="udp" proto="udp"
@ -305,7 +291,7 @@ configureSlirp() {
if [[ "${DNSMASQ_DISABLE:-}" == [Yy1]* ]]; then if [[ "${DNSMASQ_DISABLE:-}" == [Yy1]* ]]; then
echo "$gateway" > /run/shm/qemu.gw echo "$gateway" > /run/shm/qemu.gw
else else
cp /etc/resolv.conf /etc/resolv.dnsmasq [ ! -f /etc/resolv.dnsmasq ] && cp /etc/resolv.conf /etc/resolv.dnsmasq
configureDNS "lo" "$ip" "$VM_NET_MAC" "$VM_NET_HOST" "$VM_NET_MASK" "$gateway" || return 1 configureDNS "lo" "$ip" "$VM_NET_MAC" "$VM_NET_HOST" "$VM_NET_MASK" "$gateway" || return 1
echo -e "nameserver 127.0.0.1\nsearch .\noptions ndots:0" >/etc/resolv.conf echo -e "nameserver 127.0.0.1\nsearch .\noptions ndots:0" >/etc/resolv.conf
fi fi
@ -360,7 +346,7 @@ configurePasst() {
PASST_OPTS+=" -q" PASST_OPTS+=" -q"
if [[ "${DNSMASQ_DISABLE:-}" != [Yy1]* ]]; then if [[ "${DNSMASQ_DISABLE:-}" != [Yy1]* ]]; then
cp /etc/resolv.conf /etc/resolv.dnsmasq [ ! -f /etc/resolv.dnsmasq ] && cp /etc/resolv.conf /etc/resolv.dnsmasq
echo -e "nameserver 127.0.0.1\nsearch .\noptions ndots:0" >/etc/resolv.conf echo -e "nameserver 127.0.0.1\nsearch .\noptions ndots:0" >/etc/resolv.conf
fi fi
@ -375,8 +361,8 @@ configurePasst() {
if (( rc != 0 )); then if (( rc != 0 )); then
[ -f "$log" ] && cat "$log" [ -f "$log" ] && cat "$log"
error "Failed to start passt, reason: $rc" warn "failed to start passt ($rc), falling back to slirp networking!"
return 1 configureSlirp && return 0 || return 1
fi fi
fi fi