Adam Ierymenko
4ecf692f46
Remove -j1
2022-02-04 14:51:13 -05:00
Adam Ierymenko
2a461a9aac
Merge dev
2022-02-04 13:32:06 -05:00
Grant Limberg
211b1fc23c
enable on x32
2022-02-03 12:52:35 -08:00
Grant Limberg
df6bbb0b0c
more fun with makefiles
2022-02-03 11:47:03 -08:00
Grant Limberg
cfae20e0df
LDFLAGS fix on non-supported platforms
2022-02-03 11:30:39 -08:00
Grant Limberg
3c0adde0c7
don't build on unsupported platforms
2022-02-03 11:26:10 -08:00
Grant Limberg
f511c9c938
fix compile errors on non-sso platforms
2022-02-03 10:07:25 -08:00
Sean OMeara
20f88b37ef
adding drone config
2022-02-03 14:19:06 +01:00
Adam Ierymenko
330e1de3d1
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
2022-02-01 16:04:06 -05:00
Adam Ierymenko
25e14e2164
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
2022-02-01 16:03:04 -05:00
Grant Limberg
aa97aabb4e
for now, only enable sso on certain platforms
...
mac, windows, linux x86/x86_64/aarch64
2022-02-01 11:07:37 -08:00
Grant Limberg
b7952d7f39
no longer need direct import of serde here either
2022-01-31 12:13:30 -08:00
Grant Limberg
c380a4e4bd
cleanup
2022-01-31 12:02:14 -08:00
Grant Limberg
9c487cbfb8
Remove jsonwebtoken package dependency
...
Replaced with rust-jwt. `jsonwebtoken` relies on the ring package which explodes on non-x86/x64 architectures
2022-01-31 11:58:51 -08:00
Adam Ierymenko
6fc636535f
Merge branch 'dev-enlarge-netconf-limits' into dev
2022-01-31 10:52:34 -05:00
Joseph Henry
4190318c85
Fix typo in constant name
2022-01-28 10:41:21 -08:00
Joseph Henry
2f554fd6f8
Merge pull request #1552 from Shawn8410/master
...
FIX: fix wrong flag usage of rateGateCredentialsReceived
2022-01-28 10:12:16 -08:00
Shawn
ae93cccde6
FIX: fix wrong flag usage of rateGateCredentialsReceived
2022-01-27 11:59:21 +08:00
Joseph Henry
46e955e3a1
Split bond logs into two categories to reduce logging size
2022-01-26 15:14:02 -08:00
Joseph Henry
60057d7072
Fix SSL-related linker errors on Linux
2022-01-26 14:02:42 -08:00
Joseph Henry
2850f131e2
Fix code style
2022-01-25 18:03:36 -08:00
Adam Ierymenko
440568a516
Enlarge maximum routes and maximum assigned addresses.
2022-01-24 14:26:15 -08:00
Adam Ierymenko
e31088aaf9
Debian build tweaks, and deparallelize Rust for higher order build parallelization.
2022-01-21 17:27:07 -05:00
Grant Limberg
63b36e8569
.
2022-01-20 15:36:29 -08:00
Grant Limberg
726d359335
part 2
2022-01-20 15:35:18 -08:00
Grant Limberg
fc0858a4a3
fix the fix cargo build on mac
...
--debug isn't a cargo option at all
2022-01-20 15:32:58 -08:00
Grant Limberg
f80103778a
Merge branch 'dev' into central-controller
2022-01-20 15:15:59 -08:00
Grant Limberg
c09010c25a
handle nonce rotation in controller better
...
Won't generate new nonces until there are no active ones.
2022-01-20 15:14:29 -08:00
Grant Limberg
9cd1466e6b
Merge branch 'dev' into central-controller
2022-01-20 11:12:21 -08:00
Grant Limberg
801be64ed3
Merge branch 'zeroidc' into dev
2022-01-20 09:46:22 -08:00
Grant Limberg
d719137565
temp workaround for oidc auth dropping issue
...
Add a method to "kick" the refresh thread and re-post the tokens in the case where the thread is somehow still running & controller pushes out an AUTH_REQUIRED. This situation happens in a corner case still under investigation where the controller pushes out many copies of the network config repeatedly
2022-01-20 09:44:56 -08:00
Adam Ierymenko
58aba96494
Mac Rust build fix.
2022-01-20 11:16:26 -05:00
Adam Ierymenko
f8d7796099
Merge branch 'zeroidc' into dev
2022-01-20 10:43:37 -05:00
Adam Ierymenko
241c41267b
Merge branch 'master' into dev
2022-01-20 08:23:12 -05:00
Adam Ierymenko
2ac1ff9be2
Merge pull request #1451 from channelbeta/update-pgp-url
...
Update PGP keyserver URL
2022-01-20 08:22:52 -05:00
Adam Ierymenko
cb31b3987f
Merge pull request #1539 from khng300/getdefaultgateway-rtm-fix
...
ext/libnatpmp: Set sa_len properly in getdefaultgateway()
2022-01-20 08:21:24 -05:00
Adam Ierymenko
c256398095
Merge pull request #1541 from khng300/fbsd-osdep-PortMapper
...
Build osdep/PortMapper on FreeBSD
2022-01-20 08:21:08 -05:00
Ka Ho Ng
7bb8703bf9
Build osdep/PortMapper on FreeBSD
...
This enables NAT-PMP and UPnP supports on FreeBSD.
2022-01-12 13:52:46 -05:00
Sean OMeara
0da00bf546
Merge pull request #1535 from zerotier/linux-route-metric
...
Set a high metric on linux routes that have a via.
2022-01-12 18:41:54 +01:00
Sean OMeara
4866490cdf
Merge pull request #1533 from zerotier/tl-linux-route-if
...
Prevent adding routes to non-zerotier interfaces in rare cases.
2022-01-12 18:41:45 +01:00
Grant Limberg
1547b1a581
Merge branch 'zeroidc' into central-controller
...
# Conflicts:
# node/NetworkConfig.cpp
# node/NetworkConfig.hpp
2022-01-11 12:09:57 -08:00
Ka Ho Ng
511c77aa99
ext/libnatpmp: Set sa_len properly in getdefaultgateway()
...
In USE_SOCKET_ROUTE's implementation, sa_len of the sockaddrs need to be
set as well.
Sponsored by: The FreeBSD Foundation
2022-01-10 20:42:34 -05:00
Travis LaDuke
692a0e7ac2
Set a high metric on linux routes that have a via.
...
See issue #750 .
zerotier doesn't currently set a metric on routes. Linux
takes this to mean "0", the highest priority.
Every comment in the issue is about routing between zerotier
and lan and how they conflict.
This quick change could fix this problem for most people.
The subnet route for the zerotier network, the one with no
via, is still 0 in this patch. Just the "via" routes get
higher metrics.
If for some reason, you needed your via routes to have
higher priority, you could use a prefix work-around:
192.168.1.0/25 via 10.147.17.1
192.168.1.128/25 via 10.147.17.1
2022-01-07 13:10:36 -08:00
Travis LaDuke
fa25b45198
Keep interface name on via routes on linux
...
See issue #1498
2022-01-07 11:58:42 -08:00
Grant Limberg
cdd25c389e
Merge branch 'dev' into zeroidc
2022-01-06 14:55:40 -08:00
Grant Limberg
133a6ff7b3
fix env var
2022-01-06 14:55:20 -08:00
Grant Limberg
96add0ba65
Merge branch 'dev' into zeroidc
2022-01-06 14:54:09 -08:00
Grant Limberg
f5096a1f26
add wait for docker in controller startup script
2022-01-06 14:51:56 -08:00
Grant Limberg
3d4d087f07
make some impl functions pub
2022-01-05 15:43:45 -08:00
Grant Limberg
953e62f103
Clean up some extraneous output in release mode
2022-01-05 11:55:47 -08:00
