diff --git a/12345.sh b/12345.sh index 92dd8337..75f48a29 100755 --- a/12345.sh +++ b/12345.sh @@ -14,7 +14,7 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized . "${MY_PATH}/tools/my.sh" PORT=12345 -[[ ${isLAN} && $(which yunohost) ]] && PORT=45780 +[[ ${isLAN} && ${zIP} ]] && PORT=45780 YOU=$(myIpfsApi); ## API of $USER running ipfs echo "YOU=$YOU" @@ -67,7 +67,6 @@ while true; do ## RANDOM PORT = RESPONSE SOCKET & IPNS SESSION TOKEN [ ${PORT} -le 12345 ] && PORT=$((PORT+${RANDOM:0:2})) || PORT=$((PORT-${RANDOM:0:2})) ## RANDOM PORT SWAPPINESS AVOIDING COLLISION - # ZIP [[ ${zIP} ]] && PORT=$((PORT+1)) && [ ${PORT} -ge 45782 ] && PORT=45780 ## yunohost : OPEN FIREWALL 1234 12345 45780 45781 diff --git a/tools/my.sh b/tools/my.sh index 3887ae39..4165e3ba 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -16,6 +16,8 @@ isLan() { local isLan=$(ip route | awk '$1 == "default" {print $3}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/" \ || route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/" \ || true) + local myZip=$(zIp) + [ -n "$myZip" ] && echo "$myZip" && exit 0 [ -n "$isLan" ] && echo "$isLan" || true } 2>/dev/null