mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2024-12-19 13:07:55 +00:00
1c5897895b
* add note about forceTcpRelay
* Create a sample systemd unit for tcp proxy
* set gitattributes for rust & cargo so hashes dont conflict on Windows
* Revert "set gitattributes for rust & cargo so hashes dont conflict on Windows"
This reverts commit 032dc5c108
.
* Turn off autocrlf for rust source
Doesn't appear to play nice well when it comes to git and vendored cargo package hashes
* Fix #1883 (#1886)
Still unknown as to why, but the call to `nc->GetProperties()` can fail
when setting a friendly name on the Windows virtual ethernet adapter.
Ensure that `ncp` is not null before continuing and accessing the device
GUID.
* Don't vendor packages for zeroidc (#1885)
* Added docker environment way to join networks (#1871)
* add StringUtils
* fix headers
use recommended headers and remove unused headers
* move extern "C"
only JNI functions need to be exported
* cleanup
* fix ANDROID-50: RESULT_ERROR_BAD_PARAMETER typo
* fix typo in log message
* fix typos in JNI method signatures
* fix typo
* fix ANDROID-51: fieldName is uninitialized
* fix ANDROID-35: memory leak
* fix missing DeleteLocalRef in loops
* update to use unique error codes
* add GETENV macro
* add LOG_TAG defines
* ANDROID-48: add ZT_jnicache.cpp
* ANDROID-48: use ZT_jnicache.cpp and remove ZT_jnilookup.cpp and ZT_jniarray.cpp
* add Event.fromInt
* add PeerRole.fromInt
* add ResultCode.fromInt
* fix ANDROID-36: issues with ResultCode
* add VirtualNetworkConfigOperation.fromInt
* fix ANDROID-40: VirtualNetworkConfigOperation out-of-sync with ZT_VirtualNetworkConfigOperation enum
* add VirtualNetworkStatus.fromInt
* fix ANDROID-37: VirtualNetworkStatus out-of-sync with ZT_VirtualNetworkStatus enum
* add VirtualNetworkType.fromInt
* make NodeStatus a plain data class
* fix ANDROID-52: synchronization bug with nodeMap
* Node init work: separate Node construction and init
* add Node.toString
* make PeerPhysicalPath a plain data class
* remove unused PeerPhysicalPath.fixed
* add array functions
* make Peer a plain data class
* make Version a plain data class
* fix ANDROID-42: copy/paste error
* fix ANDROID-49: VirtualNetworkConfig.equals is wrong
* reimplement VirtualNetworkConfig.equals
* reimplement VirtualNetworkConfig.compareTo
* add VirtualNetworkConfig.hashCode
* make VirtualNetworkConfig a plain data class
* remove unused VirtualNetworkConfig.enabled
* reimplement VirtualNetworkDNS.equals
* add VirtualNetworkDNS.hashCode
* make VirtualNetworkDNS a plain data class
* reimplement VirtualNetworkRoute.equals
* reimplement VirtualNetworkRoute.compareTo
* reimplement VirtualNetworkRoute.toString
* add VirtualNetworkRoute.hashCode
* make VirtualNetworkRoute a plain data class
* add isSocketAddressEmpty
* add addressPort
* add fromSocketAddressObject
* invert logic in a couple of places and return early
* newInetAddress and newInetSocketAddress work
allow newInetSocketAddress to return NULL if given empty address
* fix ANDROID-38: stack corruption in onSendPacketRequested
* use GETENV macro
* JniRef work
JniRef does not use callbacks struct, so remove
fix NewGlobalRef / DeleteGlobalRef mismatch
* use PRId64 macros
* switch statement work
* comments and logging
* Modifier 'public' is redundant for interface members
* NodeException can be made a checked Exception
* 'NodeException' does not define a 'serialVersionUID' field
* 'finalize()' should not be overridden
this is fine to do because ZeroTierOneService calls close() when it is done
* error handling, error reporting, asserts, logging
* simplify loadLibrary
* rename Node.networks -> Node.networkConfigs
* Windows file permissions fix (#1887)
* Allow macOS interfaces to use multiple IP addresses (#1879)
Co-authored-by: Sean OMeara <someara@users.noreply.github.com>
Co-authored-by: Grant Limberg <glimberg@users.noreply.github.com>
* Fix condition where full HELLOs might not be sent when necessary (#1877)
Co-authored-by: Grant Limberg <glimberg@users.noreply.github.com>
* 1.10.4 version bumps
* Add security policy to repo (#1889)
* [+] add e2k64 arch (#1890)
* temp fix for ANDROID-56: crash inside newNetworkConfig from too many args
* 1.10.4 release notes
---------
Co-authored-by: travis laduke <travisladuke@gmail.com>
Co-authored-by: Grant Limberg <grant.limberg@zerotier.com>
Co-authored-by: Grant Limberg <glimberg@users.noreply.github.com>
Co-authored-by: Leonardo Amaral <leleobhz@users.noreply.github.com>
Co-authored-by: Brenton Bostick <bostick@gmail.com>
Co-authored-by: Sean OMeara <someara@users.noreply.github.com>
Co-authored-by: Joseph Henry <joseph-henry@users.noreply.github.com>
Co-authored-by: Roman Peshkichev <roman.peshkichev@gmail.com>
125 lines
2.2 KiB
Bash
125 lines
2.2 KiB
Bash
#!/bin/sh
|
|
|
|
grepzt() {
|
|
[ -f /var/lib/zerotier-one/zerotier-one.pid -a -n "$(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)" -a -d "/proc/$(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)" ]
|
|
return $?
|
|
}
|
|
|
|
mkztfile() {
|
|
file=$1
|
|
mode=$2
|
|
content=$3
|
|
|
|
mkdir -p /var/lib/zerotier-one
|
|
echo "$content" > "/var/lib/zerotier-one/$file"
|
|
chmod "$mode" "/var/lib/zerotier-one/$file"
|
|
}
|
|
|
|
if [ "x$ZEROTIER_API_SECRET" != "x" ]
|
|
then
|
|
mkztfile authtoken.secret 0600 "$ZEROTIER_API_SECRET"
|
|
fi
|
|
|
|
if [ "x$ZEROTIER_IDENTITY_PUBLIC" != "x" ]
|
|
then
|
|
mkztfile identity.public 0644 "$ZEROTIER_IDENTITY_PUBLIC"
|
|
fi
|
|
|
|
if [ "x$ZEROTIER_IDENTITY_SECRET" != "x" ]
|
|
then
|
|
mkztfile identity.secret 0600 "$ZEROTIER_IDENTITY_SECRET"
|
|
fi
|
|
|
|
mkztfile zerotier-one.port 0600 "9993"
|
|
|
|
killzerotier() {
|
|
log "Killing zerotier"
|
|
kill $(cat /var/lib/zerotier-one/zerotier-one.pid 2>/dev/null)
|
|
exit 0
|
|
}
|
|
|
|
log_header() {
|
|
echo -n "\r=>"
|
|
}
|
|
|
|
log_detail_header() {
|
|
echo -n "\r===>"
|
|
}
|
|
|
|
log() {
|
|
echo "$(log_header)" "$@"
|
|
}
|
|
|
|
log_params() {
|
|
title=$1
|
|
shift
|
|
log "$title" "[$@]"
|
|
}
|
|
|
|
log_detail() {
|
|
echo "$(log_detail_header)" "$@"
|
|
}
|
|
|
|
log_detail_params() {
|
|
title=$1
|
|
shift
|
|
log_detail "$title" "[$@]"
|
|
}
|
|
|
|
trap killzerotier INT TERM
|
|
|
|
log "Configuring networks to join"
|
|
mkdir -p /var/lib/zerotier-one/networks.d
|
|
|
|
log_params "Joining networks from command line:" $@
|
|
for i in "$@"
|
|
do
|
|
log_detail_params "Configuring join:" "$i"
|
|
touch "/var/lib/zerotier-one/networks.d/${i}.conf"
|
|
done
|
|
|
|
if [ "x$ZEROTIER_JOIN_NETWORKS" != "x" ]
|
|
then
|
|
log_params "Joining networks from environment:" $ZEROTIER_JOIN_NETWORKS
|
|
for i in "$ZEROTIER_JOIN_NETWORKS"
|
|
do
|
|
log_detail_params "Configuring join:" "$i"
|
|
touch "/var/lib/zerotier-one/networks.d/${i}.conf"
|
|
done
|
|
fi
|
|
|
|
log "Starting ZeroTier"
|
|
nohup /usr/sbin/zerotier-one &
|
|
|
|
while ! grepzt
|
|
do
|
|
log_detail "ZeroTier hasn't started, waiting a second"
|
|
|
|
if [ -f nohup.out ]
|
|
then
|
|
tail -n 10 nohup.out
|
|
fi
|
|
|
|
sleep 1
|
|
done
|
|
|
|
log_params "Writing healthcheck for networks:" $@
|
|
|
|
cat >/healthcheck.sh <<EOF
|
|
#!/bin/bash
|
|
for i in $@
|
|
do
|
|
[ "\$(zerotier-cli get \$i status)" = "OK" ] || exit 1
|
|
done
|
|
EOF
|
|
|
|
chmod +x /healthcheck.sh
|
|
|
|
log_params "zerotier-cli info:" "$(zerotier-cli info)"
|
|
|
|
log "Sleeping infinitely"
|
|
while true
|
|
do
|
|
sleep 1
|
|
done
|