mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-04 00:19:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Network address fixes

Browse Source
This commit is contained in:
bergware
2023-12-01 02:38:36 +01:00
parent 0434cf2700
commit b4be186dda
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
etc/rc.d/rc.library.source
View File

@@ -52,11 +52,11 @@ scan(){
good(){
DATA=
for i in ${BIND[@]}; do
[[ $i == $1 || ${1:0:4} == fe80 ]] && DATA=1
[[ $i == $1 || $1 == 0 || ${1:0:4} == fe80 ]] && DATA=1
done
if [[ -n $2 ]]; then
for i in ${NETS[@]}; do
[[ $i == $2 || ${2:0:4} == fe80 ]] && DATA=2
[[ $i == $2 || $2 == 0 || ${2:0:4} == fe80 ]] && DATA=2
done
fi
echo $DATA
@@ -199,10 +199,10 @@ check(){
[[ ${NET:0:2} == wg && $(grep -Pom1 '^TYPE:1="\K[^"]+' $WIREGUARD/$NET.cfg) == 8 ]] && continue
NET1=$(sub ${NET[1]})
if [[ "avahi show" =~ "$CALLER" ]]; then
[[ -n $NET && -n $NET1 && $NET != '0' && $NET1 != '0' && -z $(good $NET $NET1) ]] && BIND+=($NET)
[[ -n $NET1 && $NET1 != '0' ]] && IPV4=yes NETS+=($NET1)
[[ -n $NET && -n $NET1 && -z $(good $NET $NET1) ]] && BIND+=($NET)
[[ -n $NET1 && $NET1 != 0 ]] && IPV4=yes NETS+=($NET1)
else
[[ -n $NET1 && $NET1 != '0' && -z $(good $NET1) ]] && IPV4=yes BIND+=($NET1)
[[ -n $NET1 && -z $(good $NET1) ]] && IPV4=yes BIND+=($NET1)
fi
done <<< $(ip -br -4 addr show scope global | awk '/^(br|bond|eth|wg)[0-9]+(\.[0-9]+)?/ {print $1,$3}' | sort)
# active IPV6 interfaces (including wireguard)
@@ -215,10 +215,10 @@ check(){
[[ ${NET:0:2} == wg && $(grep -Pom1 '^TYPE:1="\K[^"]+' $WIREGUARD/$NET.cfg) == 8 ]] && continue
NET1=$(sub $(main ${NET[@]}))
if [[ "avahi show" =~ "$CALLER" ]]; then
[[ -n $NET && -n $NET1 && $NET != '0' && $NET1 != '0' && -z $(good $NET $NET1) ]] && BIND+=($NET)
[[ -n $NET1 && $NET1 != '0' ]] && IPV6=yes NETS+=($NET1)
[[ -n $NET && -n $NET1 && -z $(good $NET $NET1) ]] && BIND+=($NET)
[[ -n $NET1 && $NET1 != 0 ]] && IPV6=yes NETS+=($NET1)
else
[[ -z $DENY6 && -n $NET1 && $NET1 != '0' && -z $(good $NET1) ]] && IPV6=yes BIND+=($NET1)
[[ -z $DENY6 && -n $NET1 && -z $(good $NET1) ]] && IPV6=yes BIND+=($NET1)
fi
done <<< $(ip -br -6 addr show scope global | sed -r 's/metric [0-9]+//g' | awk '/^(br|bond|eth|wg)[0-9]+(\.[0-9]+)?/{$2="";print}' | sort)
# add loopback interface