github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 05:43:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Pick a new random secondary port if we are offline for more than path-timeout seconds (COMA problem workaround).

Browse source
This commit is contained in:
Adam Ierymenko 2021-08-31 16:47:00 -04:00
commit 11b352458e
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 54 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

42
ext/installfiles/mac/postinst.sh
View file

@ -2,31 +2,8 @@
export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
OSX_RELEASE=`sw_vers -productVersion | cut -d . -f 1,2`
DARWIN_MAJOR=`uname -r | cut -d . -f 1`
launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1
sleep 0.5
cd "/Library/Application Support/ZeroTier/One"
if [ "$OSX_RELEASE" = "10.7" -o "$OSX_RELEASE" = "10.8" -o "$OSX_RELEASE" = "10.9" -o "$OSX_RELEASE" = "10.10" -o "$OSX_RELEASE" = "10.11" -o "$OSX_RELEASE" = "10.12" ]; then
rm -f tap.kext.10_7.tar.gz
curl -s https://download.zerotier.com/tap.kext.10_7.tar.gz >tap.kext.10_7.tar.gz
if [ -s tap.kext.10_7.tar.gz -a "`shasum -a 256 tap.kext.10_7.tar.gz | cut -d ' ' -f 1`" = "e133d4832cef571621d3618f417381b44f51a76ed625089fb4e545e65d3ef2a9" ]; then
rm -rf tap.kext
tar -xzf tap.kext.10_7.tar.gz
chown -R 0 tap.kext
chgrp -R 0 tap.kext
fi
rm -f tap.kext.10_7.tar.gz
fi
rm -rf node.log node.log.old root-topology shutdownIfUnreadable autoupdate.log updates.d ui peers.save
chown -R 0 tap.kext
chgrp -R 0 tap.kext
if [ ! -f authtoken.secret ]; then
head -c 1024 /dev/urandom | md5 | head -c 24 >authtoken.secret
chown 0 authtoken.secret
@ -37,25 +14,24 @@ fi
rm -f zerotier-cli zerotier-idtool
ln -sf zerotier-one zerotier-cli
ln -sf zerotier-one zerotier-idtool
mkdir -p /usr/local/bin
if [ ! -d /usr/local/bin ]; then
mkdir -p /usr/local/bin
fi
cd /usr/local/bin
rm -f zerotier-cli zerotier-idtool
ln -sf "/Library/Application Support/ZeroTier/One/zerotier-one" zerotier-cli
ln -sf "/Library/Application Support/ZeroTier/One/zerotier-one" zerotier-idtool
if [ $DARWIN_MAJOR -le 16 ]; then
cd "/Library/Application Support/ZeroTier/One"
kextload -r . tap.kext >>/dev/null 2>&1 &
disown %1
fi
launchctl load /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1
sleep 1
sleep 2
if [ -f /tmp/zt1-gui-restart.tmp ]; then
for u in `cat /tmp/zt1-gui-restart.tmp`; do
su $u -c '/Applications/ZeroTier\ One.app/Contents/MacOS/ZeroTier\ One &' >>/dev/null 2>&1 &
if [ -f '/Applications/ZeroTier One.app/Contents/MacOS/ZeroTier One' ]; then
su $u -c '/Applications/ZeroTier\ One.app/Contents/MacOS/ZeroTier\ One &' >>/dev/null 2>&1 &
else
su $u -c '/Applications/ZeroTier.app/Contents/MacOS/ZeroTier &' >>/dev/null 2>&1 &
fi
done
fi
rm -f /tmp/zt1-gui-restart.tmp

29
ext/installfiles/mac/preinst.sh
View file

@ -8,7 +8,17 @@ for i in `ps axuwww | tr -s ' ' ',' | grep -F '/Applications/ZeroTier,One.app' |
p=`echo $i | cut -d , -f 2`
if [ ! -z "$u" -a "0$p" -gt 0 ]; then
kill $p >>/dev/null 2>&1
sleep 0.2
sleep 0.5
kill -9 $p >>/dev/null 2>&1
echo "$u" >>/tmp/zt1-gui-restart.tmp
fi
done
for i in `ps axuwww | tr -s ' ' ',' | grep -F '/Applications/ZeroTier.app' | grep -F -v grep | cut -d , -f 1,2 | xargs`; do
u=`echo $i | cut -d , -f 1`
p=`echo $i | cut -d , -f 2`
if [ ! -z "$u" -a "0$p" -gt 0 ]; then
kill $p >>/dev/null 2>&1
sleep 0.5
kill -9 $p >>/dev/null 2>&1
echo "$u" >>/tmp/zt1-gui-restart.tmp
fi
@ -17,23 +27,14 @@ chmod 0600 /tmp/zt1-gui-restart.tmp
if [ -f /Library/LaunchDaemons/com.zerotier.one.plist ]; then
launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1
sleep 5
fi
sleep 1
if [ -d "/Library/Application Support/ZeroTier/One" ]; then
cd "/Library/Application Support/ZeroTier/One"
if [ -f "zerotier-one.pid" ]; then
ztpid=`cat zerotier-one.pid`
if [ "$ztpid" -gt "0" ]; then
kill `cat zerotier-one.pid`
fi
fi
if [ -f '/Library/Application Support/ZeroTier/One/zerotier-one.pid' ]; then
kill -9 `cat /Library/Application Support/ZeroTier/One/zerotier-one.pid`
fi
sleep 1
cd "/Applications"
rm -rf "ZeroTier One.app"
rm -rf "ZeroTier.app"
exit 0